[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 03/11] ppc: BOOK3E: nothing should be done when MSR:PR
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 03/11] ppc: BOOK3E: nothing should be done when MSR:PR is set |
Date: |
Wed, 23 Nov 2016 13:49:35 +1100 |
From: Vladimir Svoboda <address@hidden>
The server architecture (BOOK3S) specifies that any instruction that
sets MSR:PR will also set MSR:EE, IR and DR.
However there is no such behavior specification for the embedded
architecture (BOOK3E).
Signed-off-by: Vladimir Svoboda <address@hidden>
Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
target-ppc/helper_regs.h | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/target-ppc/helper_regs.h b/target-ppc/helper_regs.h
index bb9ce60..6213816 100644
--- a/target-ppc/helper_regs.h
+++ b/target-ppc/helper_regs.h
@@ -131,11 +131,14 @@ static inline int hreg_store_msr(CPUPPCState *env,
target_ulong value,
}
/* If PR=1 then EE, IR and DR must be 1
*
- * Note: We only enforce this on 64-bit processors. It appears that
- * 32-bit implementations supports PR=1 and EE/DR/IR=0 and MacOS
- * exploits it.
+ * Note: We only enforce this on 64-bit server processors.
+ * It appears that:
+ * - 32-bit implementations supports PR=1 and EE/DR/IR=0 and MacOS
+ * exploits it.
+ * - 64-bit embedded implementations do not need any operation to be
+ * performed when PR is set.
*/
- if ((env->insns_flags & PPC_64B) && ((value >> MSR_PR) & 1)) {
+ if ((env->insns_flags & PPC_SEGMENT_64B) && ((value >> MSR_PR) & 1)) {
value |= (1 << MSR_EE) | (1 << MSR_DR) | (1 << MSR_IR);
}
#endif
--
2.7.4
- [Qemu-ppc] [PULL 00/11] ppc-for-2.8 queue 20161123, David Gibson, 2016/11/22
- [Qemu-ppc] [PULL 01/11] tests/postcopy: Use KVM on ppc64 only if it is KVM-HV, David Gibson, 2016/11/22
- [Qemu-ppc] [PULL 03/11] ppc: BOOK3E: nothing should be done when MSR:PR is set,
David Gibson <=
- [Qemu-ppc] [PULL 04/11] hw/char/spapr_vty: Return amount of free buffer entries in vty_can_receive(), David Gibson, 2016/11/22
- [Qemu-ppc] [PULL 02/11] spapr: migration support for CAS-negotiated option vectors, David Gibson, 2016/11/22
- [Qemu-ppc] [PULL 11/11] spapr: Fix 2.7<->2.8 migration of PCI host bridge, David Gibson, 2016/11/22
- [Qemu-ppc] [PULL 07/11] target-ppc: Fix CPU migration from qemu-2.6 <-> later versions, David Gibson, 2016/11/22
- [Qemu-ppc] [PULL 09/11] target-ppc: Allow eventual removal of old migration mistakes, David Gibson, 2016/11/22
- [Qemu-ppc] [PULL 10/11] Revert "spapr: Fix migration of PCI host bridges from qemu-2.7", David Gibson, 2016/11/22
- [Qemu-ppc] [PULL 08/11] migration: Add VMSTATE_UINTTL_TEST(), David Gibson, 2016/11/22
- [Qemu-ppc] [PULL 06/11] ppc: Make uninorth interrupt swizzling identical to Grackle, David Gibson, 2016/11/22