Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-07 23:16:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target/sh4: Do not singlestep after exceptions

Browse Source 
If we've already raised an exception (and set NORETURN),
do not emit unreachable code to raise a debug exception.
Note that gen_goto_tb takes single-stepping into account.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Message-Id: <20170907185057.23421-4-richard.henderson@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Richard Henderson 2017-09-07 11:50:55 -07:00 committed by Aurelien Jarno
parent 4834871bc9
commit 34cf567808
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
target/sh4/translate.c
View File

@ -270,6 +270,7 @@ static void gen_jump(DisasContext * ctx)
} else { } else {
tcg_gen_lookup_and_goto_ptr(); tcg_gen_lookup_and_goto_ptr();
} }
ctx->bstate = DISAS_NORETURN;
} else { } else {
gen_goto_tb(ctx, 0, ctx->delayed_pc); gen_goto_tb(ctx, 0, ctx->delayed_pc);
} }
@ -2341,24 +2342,23 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)
ctx.envflags &= ~GUSA_MASK; ctx.envflags &= ~GUSA_MASK;
} }
if (cs->singlestep_enabled) { switch (ctx.bstate) {
case DISAS_STOP:
gen_save_cpu_state(&ctx, true); gen_save_cpu_state(&ctx, true);
gen_helper_debug(cpu_env); if (cs->singlestep_enabled) {
} else { gen_helper_debug(cpu_env);
switch (ctx.bstate) { } else {
case DISAS_STOP:
gen_save_cpu_state(&ctx, true);
tcg_gen_exit_tb(0); tcg_gen_exit_tb(0);
break; }
case DISAS_NEXT: break;
gen_save_cpu_state(&ctx, false); case DISAS_NEXT:
gen_goto_tb(&ctx, 0, ctx.pc); gen_save_cpu_state(&ctx, false);
break; gen_goto_tb(&ctx, 0, ctx.pc);
case DISAS_NORETURN: break;
break; case DISAS_NORETURN:
default: break;
g_assert_not_reached(); default:
} g_assert_not_reached();
} }
gen_tb_end(tb, num_insns); gen_tb_end(tb, num_insns);