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
This commit is contained in:
Peter Maydell 2018-10-08 11:09:48 -04:00 committed by Lioncash
parent f628cbdfc3
commit d82046cafc
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -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) &&