From d82046cafca536310f70f3b9b20a50aefc01547e Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 8 Oct 2018 11:09:48 -0400 Subject: [PATCH] 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. Backports commit e5ae4d0c063fbcca4cbbd26bcefbf1760cfac2aa from qemu --- qemu/target/arm/helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index 690102bd..ff874466 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -6488,7 +6488,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) &&