From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 18 Dec 2005 16:55:25 +0000 (+0000)
Subject: cpu_reset() fix (Paul Brook)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=68998c5de3b92e7034aa9d8fecf53f0bc3ccc91e;p=qemu.git

cpu_reset() fix (Paul Brook)


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

diff --git a/target-arm/translate.c b/target-arm/translate.c
index a5eb3b4c72..089fbf2fd9 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -2431,10 +2431,10 @@ int gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb)
 void cpu_reset(CPUARMState *env)
 {
 #if defined (CONFIG_USER_ONLY)
+    env->uncached_cpsr = ARM_CPU_MODE_USR;
+#else
     /* SVC mode with interrupts disabled.  */
     env->uncached_cpsr = ARM_CPU_MODE_SVC | CPSR_A | CPSR_F | CPSR_I;
-#else
-    env->uncached_cpsr = ARM_CPU_MODE_USR;
 #endif
     env->regs[15] = 0;
 }