Commit 68998c5de3b92e7034aa9d8fecf53f0bc3ccc91e
1 parent
6d7e6326
cpu_reset() fix (Paul Brook)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1712 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
2 additions
and
2 deletions
target-arm/translate.c
| @@ -2431,10 +2431,10 @@ int gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb) | @@ -2431,10 +2431,10 @@ int gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb) | ||
| 2431 | void cpu_reset(CPUARMState *env) | 2431 | void cpu_reset(CPUARMState *env) |
| 2432 | { | 2432 | { |
| 2433 | #if defined (CONFIG_USER_ONLY) | 2433 | #if defined (CONFIG_USER_ONLY) |
| 2434 | + env->uncached_cpsr = ARM_CPU_MODE_USR; | ||
| 2435 | +#else | ||
| 2434 | /* SVC mode with interrupts disabled. */ | 2436 | /* SVC mode with interrupts disabled. */ |
| 2435 | env->uncached_cpsr = ARM_CPU_MODE_SVC | CPSR_A | CPSR_F | CPSR_I; | 2437 | env->uncached_cpsr = ARM_CPU_MODE_SVC | CPSR_A | CPSR_F | CPSR_I; |
| 2436 | -#else | ||
| 2437 | - env->uncached_cpsr = ARM_CPU_MODE_USR; | ||
| 2438 | #endif | 2438 | #endif |
| 2439 | env->regs[15] = 0; | 2439 | env->regs[15] = 0; |
| 2440 | } | 2440 | } |