commit a32ff1ad95c4f09420c4b5e19dfd86ded0d2bc79
author j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Oct 27 17:29:35 2007 +0000
committer j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Oct 27 17:29:35 2007 +0000
tree 18d22c870716e299295c934bf179b95aafba0a4e
parent 8378e71f136a021e795d41ceae64eedadcff291c

PowerPC user-mode fix: MSR is now entirelly set-up in the cpu_reset routine.


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

linux-user/elfload.c

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index fbfa3b0..ab5a74e 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -329,7 +329,6 @@
     abi_ulong entry, toc;
 #endif
 
-    _regs->msr = 1 << MSR_PR; /* Set user mode */
     _regs->gpr[1] = infop->start_stack;
 #if defined(TARGET_PPC64) && !defined(TARGET_ABI32)
     entry = ldq_raw(infop->entry) + infop->load_addr;

linux-user/main.c

diff --git a/linux-user/main.c b/linux-user/main.c
index 7590db8..cac9561 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2168,7 +2168,6 @@
         }
         cpu_ppc_register(env, def);
         cpu_ppc_reset(env);
-        env->msr = regs->msr & ~((1 << 6) | (1 << 12) | (1 << 13));
 #if defined(TARGET_PPC64)
 #if defined(TARGET_ABI32)
         env->msr &= ~((target_ulong)1 << MSR_SF);