diff options
| author | Peter Maydell | 2018-10-08 15:55:02 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-10-08 15:55:02 +0200 |
| commit | e5ae4d0c063fbcca4cbbd26bcefbf1760cfac2aa (patch) | |
| tree | b37d02a85eda6dcbced28d4b12fe502a0f11d9a9 | |
| parent | target/arm: Correct condition for v8M callee stack push (diff) | |
| download | qemu-e5ae4d0c063fbcca4cbbd26bcefbf1760cfac2aa.tar.gz qemu-e5ae4d0c063fbcca4cbbd26bcefbf1760cfac2aa.tar.xz qemu-e5ae4d0c063fbcca4cbbd26bcefbf1760cfac2aa.zip | |
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
| -rw-r--r-- | target/arm/helper.c | 1 |
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) && |