From: aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 10 Dec 2008 15:02:24 +0000 (+0000)
Subject: target-ppc: initialize MSR appropriately in user-mode
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fe463b7dbc16cc66f3b9a8b7be197fb340378fa3;p=qemu.git

target-ppc: initialize MSR appropriately in user-mode

Mask the initial MSR with the mask from the PowerPC CPU definition.

Noticed by Nathan Froyd.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5964 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index e22f6dd180..689291ccb2 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -2904,12 +2904,12 @@ void cpu_ppc_reset (void *opaque)
 #if defined(CONFIG_USER_ONLY)
     msr |= (target_ulong)1 << MSR_FP; /* Allow floating point usage */
     msr |= (target_ulong)1 << MSR_PR;
+    env->msr = msr & env->msr_mask;
 #else
     env->nip = env->hreset_vector | env->excp_prefix;
     if (env->mmu_model != POWERPC_MMU_REAL)
         ppc_tlb_invalidate_all(env);
 #endif
-    env->msr = msr;
     hreg_compute_hflags(env);
     env->reserve = (target_ulong)-1ULL;
     /* Be sure no exception or interrupt is pending */