aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorj_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>2007-10-27 17:29:35 +0000
committerj_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>2007-10-27 17:29:35 +0000
commita32ff1ad95c4f09420c4b5e19dfd86ded0d2bc79 (patch)
tree18d22c870716e299295c934bf179b95aafba0a4e
parent8378e71f136a021e795d41ceae64eedadcff291c (diff)
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
-rw-r--r--linux-user/elfload.c1
-rw-r--r--linux-user/main.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index fbfa3b0de5..ab5a74e49a 100644
--- 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 7590db80a6..cac9561ba1 100644
--- 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);