Skip to content

Commit 02bf7fa

Browse files
committed
target/xtensa: Drop check for singlestep_enabled
GDB single-stepping is now handled generically. Signed-off-by: Richard Henderson <[email protected]>
1 parent 1b55c52 commit 02bf7fa

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

target/xtensa/translate.c

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -382,18 +382,14 @@ static void gen_jump_slot(DisasContext *dc, TCGv dest, int slot)
382382
if (dc->icount) {
383383
tcg_gen_mov_i32(cpu_SR[ICOUNT], dc->next_icount);
384384
}
385-
if (dc->base.singlestep_enabled) {
386-
gen_exception(dc, EXCP_DEBUG);
385+
if (dc->op_flags & XTENSA_OP_POSTPROCESS) {
386+
slot = gen_postprocess(dc, slot);
387+
}
388+
if (slot >= 0) {
389+
tcg_gen_goto_tb(slot);
390+
tcg_gen_exit_tb(dc->base.tb, slot);
387391
} else {
388-
if (dc->op_flags & XTENSA_OP_POSTPROCESS) {
389-
slot = gen_postprocess(dc, slot);
390-
}
391-
if (slot >= 0) {
392-
tcg_gen_goto_tb(slot);
393-
tcg_gen_exit_tb(dc->base.tb, slot);
394-
} else {
395-
tcg_gen_exit_tb(NULL, 0);
396-
}
392+
tcg_gen_exit_tb(NULL, 0);
397393
}
398394
dc->base.is_jmp = DISAS_NORETURN;
399395
}
@@ -1293,12 +1289,7 @@ static void xtensa_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
12931289
case DISAS_NORETURN:
12941290
break;
12951291
case DISAS_TOO_MANY:
1296-
if (dc->base.singlestep_enabled) {
1297-
tcg_gen_movi_i32(cpu_pc, dc->pc);
1298-
gen_exception(dc, EXCP_DEBUG);
1299-
} else {
1300-
gen_jumpi(dc, dc->pc, 0);
1301-
}
1292+
gen_jumpi(dc, dc->pc, 0);
13021293
break;
13031294
default:
13041295
g_assert_not_reached();

0 commit comments

Comments
 (0)