From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 27 Jun 2016 06:55:18 +0000 (+0200)
Subject: ppc: Enforce setting MSR:EE,IR and DR when MSR:PR is set
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b378bb0948277d71c78bc6d0c1ef80a253aafc80;p=qemu.git

ppc: Enforce setting MSR:EE,IR and DR when MSR:PR is set

The architecture specifies that any instruction that sets MSR:PR will also
set MSR:EE, IR and DR.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/target-ppc/helper_regs.h b/target-ppc/helper_regs.h
index 8fc09344db..8fdfa5c7e6 100644
--- a/target-ppc/helper_regs.h
+++ b/target-ppc/helper_regs.h
@@ -136,6 +136,10 @@ static inline int hreg_store_msr(CPUPPCState *env, target_ulong value,
         /* Change the exception prefix on PowerPC 601 */
         env->excp_prefix = ((value >> MSR_EP) & 1) * 0xFFF00000;
     }
+    /* If PR=1 then EE, IR and DR must be 1 */
+    if ((value >> MSR_PR) & 1) {
+        value |= (1 << MSR_EE) | (1 << MSR_DR) | (1 << MSR_IR);
+    }
 #endif
     env->msr = value;
     hreg_compute_hflags(env);