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

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index fbfa3b0de57a37d22d50a0e9880301a04bd9dced..ab5a74e49a7ce9111aaa414676ec0351589cf237 100644 (file)
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -329,7 +329,6 @@ static inline void init_thread(struct target_pt_regs *_regs, struct image_info *
     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;

diff --git a/linux-user/main.c b/linux-user/main.c
index 7590db80a66df8216635d0bc5480a3ffa8370158..cac9561ba1ed7f419649fe7c149e7b3cd3d285ed 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2168,7 +2168,6 @@ int main(int argc, char **argv)
         }
         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);