[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 23/23] target/xtensa: Drop check for singlestep_enabled
From: |
Richard Henderson |
Subject: |
[PATCH for-6.2 23/23] target/xtensa: Drop check for singlestep_enabled |
Date: |
Tue, 20 Jul 2021 20:41:55 -1000 |
GDB single-stepping is now handled generically.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/xtensa/translate.c | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index 20399d6a04..3fbf76f4dd 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -382,18 +382,14 @@ static void gen_jump_slot(DisasContext *dc, TCGv dest,
int slot)
if (dc->icount) {
tcg_gen_mov_i32(cpu_SR[ICOUNT], dc->next_icount);
}
- if (dc->base.singlestep_enabled) {
- gen_exception(dc, EXCP_DEBUG);
+ if (dc->op_flags & XTENSA_OP_POSTPROCESS) {
+ slot = gen_postprocess(dc, slot);
+ }
+ if (slot >= 0) {
+ tcg_gen_goto_tb(slot);
+ tcg_gen_exit_tb(dc->base.tb, slot);
} else {
- if (dc->op_flags & XTENSA_OP_POSTPROCESS) {
- slot = gen_postprocess(dc, slot);
- }
- if (slot >= 0) {
- tcg_gen_goto_tb(slot);
- tcg_gen_exit_tb(dc->base.tb, slot);
- } else {
- tcg_gen_exit_tb(NULL, 0);
- }
+ tcg_gen_exit_tb(NULL, 0);
}
dc->base.is_jmp = DISAS_NORETURN;
}
@@ -1292,12 +1288,7 @@ static void xtensa_tr_tb_stop(DisasContextBase *dcbase,
CPUState *cpu)
case DISAS_NORETURN:
break;
case DISAS_TOO_MANY:
- if (dc->base.singlestep_enabled) {
- tcg_gen_movi_i32(cpu_pc, dc->pc);
- gen_exception(dc, EXCP_DEBUG);
- } else {
- gen_jumpi(dc, dc->pc, 0);
- }
+ gen_jumpi(dc, dc->pc, 0);
break;
default:
g_assert_not_reached();
--
2.25.1
- [PATCH for-6.2 09/23] target/i386: Drop check for singlestep_enabled, (continued)
- [PATCH for-6.2 09/23] target/i386: Drop check for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 10/23] target/m68k: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 11/23] target/microblaze: Check CF_NO_GOTO_TB for DISAS_JUMP, Richard Henderson, 2021/07/21
- [PATCH for-6.2 12/23] target/microblaze: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 16/23] target/ppc: Drop exit checks for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 20/23] target/s390x: Drop check for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 22/23] target/tricore: Drop check for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 21/23] target/sh4: Drop check for singlestep_enabled, Richard Henderson, 2021/07/21
- [PATCH for-6.2 23/23] target/xtensa: Drop check for singlestep_enabled,
Richard Henderson <=
- [PATCH for-6.2 17/23] target/riscv: Remove dead code after exception, Richard Henderson, 2021/07/21
- [PATCH for-6.2 18/23] target/riscv: Remove exit_tb and lookup_and_goto_ptr, Richard Henderson, 2021/07/21
- [PATCH for-6.2 19/23] target/rx: Drop checks for singlestep_enabled, Richard Henderson, 2021/07/21