diff options
| author | Richard Henderson | 2020-08-25 16:45:34 +0200 |
|---|---|---|
| committer | Richard Henderson | 2020-09-01 16:41:38 +0200 |
| commit | 3f203194550108a72e8ee55d1b8bcb2333222b71 (patch) | |
| tree | 1dbce3f6dae4ff79dd29afd88e04742a0ddd4ed5 /target/microblaze | |
| parent | target/microblaze: Cache mem_index in DisasContext (diff) | |
| download | qemu-3f203194550108a72e8ee55d1b8bcb2333222b71.tar.gz qemu-3f203194550108a72e8ee55d1b8bcb2333222b71.tar.xz qemu-3f203194550108a72e8ee55d1b8bcb2333222b71.zip | |
target/microblaze: Fix cpu unwind for stackprot
Restore the correct PC when an exception must be raised.
Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/microblaze')
| -rw-r--r-- | target/microblaze/helper.h | 2 | ||||
| -rw-r--r-- | target/microblaze/op_helper.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/target/microblaze/helper.h b/target/microblaze/helper.h index 64816c89e1..a473c1867b 100644 --- a/target/microblaze/helper.h +++ b/target/microblaze/helper.h @@ -26,7 +26,7 @@ DEF_HELPER_4(mmu_write, void, env, i32, i32, i32) #endif DEF_HELPER_5(memalign, void, env, tl, i32, i32, i32) -DEF_HELPER_2(stackprot, void, env, tl) +DEF_HELPER_FLAGS_2(stackprot, TCG_CALL_NO_WG, void, env, tl) DEF_HELPER_2(get, i32, i32, i32) DEF_HELPER_3(put, void, i32, i32, i32) diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index 2c59d4492d..a99c467364 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -389,12 +389,16 @@ void helper_memalign(CPUMBState *env, target_ulong addr, void helper_stackprot(CPUMBState *env, target_ulong addr) { if (addr < env->slr || addr > env->shr) { + CPUState *cs = env_cpu(env); + qemu_log_mask(CPU_LOG_INT, "Stack protector violation at " TARGET_FMT_lx " %x %x\n", addr, env->slr, env->shr); + env->ear = addr; env->esr = ESR_EC_STACKPROT; - helper_raise_exception(env, EXCP_HW_EXCP); + cs->exception_index = EXCP_HW_EXCP; + cpu_loop_exit_restore(cs, GETPC()); } } |