mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-07-08 13:20:44 +00:00
target/arm: Use v7m_stack_read() for reading the frame signature
In commit 95695effe8caa552b8f2 we changed the v7M/v8M stack pop code to use a new v7m_stack_read() function that checks whether the read should fail due to an MPU or bus abort. We missed one call though, the one which reads the signature word for the callee-saved register part of the frame. Correct the omission. Backports commit 4818bad98c8212fbbb0525d10761b6b65279ab92 from qemu
This commit is contained in:
parent
bec50934ad
commit
43e7478d3f
|
@ -6153,7 +6153,6 @@ static bool v7m_push_stack(ARMCPU *cpu)
|
||||||
static void do_v7m_exception_exit(ARMCPU *cpu)
|
static void do_v7m_exception_exit(ARMCPU *cpu)
|
||||||
{
|
{
|
||||||
CPUARMState *env = &cpu->env;
|
CPUARMState *env = &cpu->env;
|
||||||
CPUState *cs = CPU(cpu);
|
|
||||||
uint32_t excret;
|
uint32_t excret;
|
||||||
uint32_t xpsr;
|
uint32_t xpsr;
|
||||||
bool ufault = false;
|
bool ufault = false;
|
||||||
|
@ -6350,9 +6349,11 @@ static void do_v7m_exception_exit(ARMCPU *cpu)
|
||||||
((excret & R_V7M_EXCRET_ES_MASK) == 0 ||
|
((excret & R_V7M_EXCRET_ES_MASK) == 0 ||
|
||||||
(excret & R_V7M_EXCRET_DCRS_MASK) == 0)) {
|
(excret & R_V7M_EXCRET_DCRS_MASK) == 0)) {
|
||||||
uint32_t expected_sig = 0xfefa125b;
|
uint32_t expected_sig = 0xfefa125b;
|
||||||
uint32_t actual_sig = ldl_phys(cs->as, frameptr);
|
uint32_t actual_sig;
|
||||||
|
|
||||||
if (expected_sig != actual_sig) {
|
pop_ok = v7m_stack_read(cpu, &actual_sig, frameptr, mmu_idx);
|
||||||
|
|
||||||
|
if (pop_ok && expected_sig != actual_sig) {
|
||||||
/* Take a SecureFault on the current stack */
|
/* Take a SecureFault on the current stack */
|
||||||
env->v7m.sfsr |= R_V7M_SFSR_INVIS_MASK;
|
env->v7m.sfsr |= R_V7M_SFSR_INVIS_MASK;
|
||||||
// Unicorn: commented out
|
// Unicorn: commented out
|
||||||
|
@ -6364,7 +6365,7 @@ static void do_v7m_exception_exit(ARMCPU *cpu)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
pop_ok =
|
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[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[5], frameptr + 0xc, mmu_idx) &&
|
||||||
|
|
Loading…
Reference in a new issue