Commit 8637c67fc56c70a029c8f4c2ca99e2c89e804703
1 parent
d80cfb3f
Fix FIQ bank switching.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1786 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
2 additions
and
2 deletions
target-arm/helper.c
| @@ -138,10 +138,10 @@ void switch_mode(CPUState *env, int mode) | @@ -138,10 +138,10 @@ void switch_mode(CPUState *env, int mode) | ||
| 138 | 138 | ||
| 139 | if (old_mode == ARM_CPU_MODE_FIQ) { | 139 | if (old_mode == ARM_CPU_MODE_FIQ) { |
| 140 | memcpy (env->fiq_regs, env->regs + 8, 5 * sizeof(uint32_t)); | 140 | memcpy (env->fiq_regs, env->regs + 8, 5 * sizeof(uint32_t)); |
| 141 | - memcpy (env->regs, env->usr_regs + 8, 5 * sizeof(uint32_t)); | 141 | + memcpy (env->regs + 8, env->usr_regs, 5 * sizeof(uint32_t)); |
| 142 | } else if (mode == ARM_CPU_MODE_FIQ) { | 142 | } else if (mode == ARM_CPU_MODE_FIQ) { |
| 143 | memcpy (env->usr_regs, env->regs + 8, 5 * sizeof(uint32_t)); | 143 | memcpy (env->usr_regs, env->regs + 8, 5 * sizeof(uint32_t)); |
| 144 | - memcpy (env->regs, env->fiq_regs + 8, 5 * sizeof(uint32_t)); | 144 | + memcpy (env->regs + 8, env->fiq_regs, 5 * sizeof(uint32_t)); |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | i = bank_number(old_mode); | 147 | i = bank_number(old_mode); |