Commit 34cf5678 authored by Richard Henderson's avatar Richard Henderson Committed by Aurelien Jarno
Browse files

target/sh4: Do not singlestep after exceptions 



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: default avatarRichard Henderson <rth@twiddle.net>
Message-Id: <20170907185057.23421-4-richard.henderson@linaro.org>
Signed-off-by: default avatarAurelien Jarno <aurelien@aurel32.net>
parent 4834871b

target/sh4/translate.c

+16 −16
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ static void gen_jump(DisasContext * ctx) 
        } else {

            tcg_gen_lookup_and_goto_ptr();

        }

        ctx->bstate = DISAS_NORETURN;

    } else {

	gen_goto_tb(ctx, 0, ctx->delayed_pc);

    }
@@ -2341,14 +2342,14 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) 
        ctx.envflags &= ~GUSA_MASK;

    }



    if (cs->singlestep_enabled) {

        gen_save_cpu_state(&ctx, true);

        gen_helper_debug(cpu_env);

    } else {

    switch (ctx.bstate) {

    case DISAS_STOP:

        gen_save_cpu_state(&ctx, true);

        if (cs->singlestep_enabled) {

            gen_helper_debug(cpu_env);

        } else {

            tcg_gen_exit_tb(0);

        }

        break;

    case DISAS_NEXT:

        gen_save_cpu_state(&ctx, false);
@@ -2359,7 +2360,6 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) 
    default:

        g_assert_not_reached();

    }

    }



    gen_tb_end(tb, num_insns);