Skip to content

Commit

Permalink
target/arm: Don't read r4 from v8M exception stackframe twice
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pm215 committed Oct 8, 2018
1 parent 7b73a1c commit e5ae4d0
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion target/arm/helper.c
Expand Up @@ -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) &&
Expand Down

0 comments on commit e5ae4d0

Please sign in to comment.