summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-12-10 15:02:24 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-12-10 15:02:24 +0000
commit190f5cb300bdc9c9511a9fc76a564cfeba360227 (patch)
tree0ea6e365ecbd649ebbebe695ab80598b54750314
parent729c6759ff6208668cd58fb136e925004d39d8e3 (diff)
downloadqemu-190f5cb300bdc9c9511a9fc76a564cfeba360227.tar.gz
qemu-190f5cb300bdc9c9511a9fc76a564cfeba360227.tar.bz2
qemu-190f5cb300bdc9c9511a9fc76a564cfeba360227.zip
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
-rw-r--r--target-ppc/helper.c2
1 files changed, 1 insertions, 1 deletions
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 */