gwj / at91sam9263 · Commits

Commit a32ff1ad95c4f09420c4b5e19dfd86ded0d2bc79

Authored by j_mayer
1 parent 8378e71f

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
Inline Side-by-side
Showing 2 changed files with 0 additions and 2 deletions
linux-user/elfload.c
  View file @a32ff1a
@@ -329,7 +329,6 @@ static inline void init_thread(struct target_pt_regs *_regs, struct image_info * @@ -329,7 +329,6 @@ static inline void init_thread(struct target_pt_regs *_regs, struct image_info *
329 abi_ulong entry, toc; 329 abi_ulong entry, toc;
330 #endif 330 #endif
331 331
332 - _regs->msr = 1 << MSR_PR; /* Set user mode */  
333 _regs->gpr[1] = infop->start_stack; 332 _regs->gpr[1] = infop->start_stack;
334 #if defined(TARGET_PPC64) && !defined(TARGET_ABI32) 333 #if defined(TARGET_PPC64) && !defined(TARGET_ABI32)
335 entry = ldq_raw(infop->entry) + infop->load_addr; 334 entry = ldq_raw(infop->entry) + infop->load_addr;
linux-user/main.c
  View file @a32ff1a
@@ -2168,7 +2168,6 @@ int main(int argc, char **argv) @@ -2168,7 +2168,6 @@ int main(int argc, char **argv)
2168 } 2168 }
2169 cpu_ppc_register(env, def); 2169 cpu_ppc_register(env, def);
2170 cpu_ppc_reset(env); 2170 cpu_ppc_reset(env);
2171 - env->msr = regs->msr & ~((1 << 6) | (1 << 12) | (1 << 13));  
2172 #if defined(TARGET_PPC64) 2171 #if defined(TARGET_PPC64)
2173 #if defined(TARGET_ABI32) 2172 #if defined(TARGET_ABI32)
2174 env->msr &= ~((target_ulong)1 << MSR_SF); 2173 env->msr &= ~((target_ulong)1 << MSR_SF);