aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-10-08 14:55:02 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-10-08 14:55:02 +0100
commite5ae4d0c063fbcca4cbbd26bcefbf1760cfac2aa (patch)
treeb37d02a85eda6dcbced28d4b12fe502a0f11d9a9 /target
parent7b73a1ca05b33d42278ce29cea4652e22d408165 (diff)
target/arm: Don't read r4 from v8M exception stackframe twice
A cut-and-paste error meant we were reading r4 from the v8M callee-saves exception stack frame twice. This is harmless since it just meant we did two memory accesses to the same location, but it's unnecessary. Delete it. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20181002150304.2287-1-peter.maydell@linaro.org
Diffstat (limited to 'target')
-rw-r--r--target/arm/helper.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 073fb3c5cb..5e721a6527 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -7304,7 +7304,6 @@ static void do_v7m_exception_exit(ARMCPU *cpu)
pop_ok = pop_ok &&
v7m_stack_read(cpu, &env->regs[4], frameptr + 0x8, mmu_idx) &&
- v7m_stack_read(cpu, &env->regs[4], frameptr + 0x8, mmu_idx) &&
v7m_stack_read(cpu, &env->regs[5], frameptr + 0xc, mmu_idx) &&
v7m_stack_read(cpu, &env->regs[6], frameptr + 0x10, mmu_idx) &&
v7m_stack_read(cpu, &env->regs[7], frameptr + 0x14, mmu_idx) &&