[Qemu-devel] [5964] target-ppc: initialize MSR appropriately in user-mode

[Aurelien Jarno]

Revision: 5964
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5964
Author:   aurel32
Date:     2008-12-10 15:02:24 +0000 (Wed, 10 Dec 2008)

Log Message:
-----------
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 <address@hidden>

Modified Paths:
--------------
    trunk/target-ppc/helper.c

Modified: trunk/target-ppc/helper.c
===================================================================
--- trunk/target-ppc/helper.c   2008-12-10 15:02:16 UTC (rev 5963)
+++ trunk/target-ppc/helper.c   2008-12-10 15:02:24 UTC (rev 5964)
@@ -2904,12 +2904,12 @@
 #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 */