From: Peter Maydell Date: Mon, 8 Oct 2018 13:55:02 +0000 (+0100) Subject: target/arm: Don't read r4 from v8M exception stackframe twice X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e5ae4d0c063fbcca4cbbd26bcefbf1760cfac2aa;p=qemu.git 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20181002150304.2287-1-peter.maydell@linaro.org --- 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 @@ -7303,7 +7303,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) &&