OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/microblaze: Fix cpu unwind for stackprot

Browse Source 
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>
This commit is contained in:
Richard Henderson 2020-08-25 07:45:34 -07:00
parent 287b1defeb
commit 3f20319455
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/microblaze/helper.h
View File

@ -26,7 +26,7 @@ DEF_HELPER_4(mmu_write, void, env, i32, i32, i32)
#endif #endif
DEF_HELPER_5(memalign, void, env, tl, i32, i32, i32) 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_2(get, i32, i32, i32)
DEF_HELPER_3(put, void, i32, i32, i32) DEF_HELPER_3(put, void, i32, i32, i32)

6
target/microblaze/op_helper.c
View File

@ -389,12 +389,16 @@ void helper_memalign(CPUMBState *env, target_ulong addr,
void helper_stackprot(CPUMBState *env, target_ulong addr) void helper_stackprot(CPUMBState *env, target_ulong addr)
{ {
if (addr < env->slr || addr > env->shr) { if (addr < env->slr || addr > env->shr) {
CPUState *cs = env_cpu(env);
qemu_log_mask(CPU_LOG_INT, "Stack protector violation at " qemu_log_mask(CPU_LOG_INT, "Stack protector violation at "
TARGET_FMT_lx " %x %x\n", TARGET_FMT_lx " %x %x\n",
addr, env->slr, env->shr); addr, env->slr, env->shr);
env->ear = addr; env->ear = addr;
env->esr = ESR_EC_STACKPROT; env->esr = ESR_EC_STACKPROT;
helper_raise_exception(env, EXCP_HW_EXCP); cs->exception_index = EXCP_HW_EXCP;
cpu_loop_exit_restore(cs, GETPC());
} }
} }