[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/48] target/ppc: Simplify gen_debug_exception
From: |
David Gibson |
Subject: |
[PULL 21/48] target/ppc: Simplify gen_debug_exception |
Date: |
Wed, 19 May 2021 22:51:21 +1000 |
From: Richard Henderson <richard.henderson@linaro.org>
Two of the call sites that use gen_debug_exception have already
updated NIP. Only ppc_tr_breakpoint_check requires the update.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Message-Id: <20210512185441.3619828-7-matheus.ferst@eldorado.org.br>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
target/ppc/translate.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 9626bea9d5..5590a93ad5 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -329,19 +329,7 @@ static uint32_t gen_prep_dbgex(DisasContext *ctx)
static void gen_debug_exception(DisasContext *ctx)
{
- TCGv_i32 t0;
-
- /*
- * These are all synchronous exceptions, we set the PC back to the
- * faulting instruction
- */
- if ((ctx->exception != POWERPC_EXCP_BRANCH) &&
- (ctx->exception != POWERPC_EXCP_SYNC)) {
- gen_update_nip(ctx, ctx->base.pc_next);
- }
- t0 = tcg_const_i32(EXCP_DEBUG);
- gen_helper_raise_exception(cpu_env, t0);
- tcg_temp_free_i32(t0);
+ gen_helper_raise_exception(cpu_env, tcg_constant_i32(EXCP_DEBUG));
ctx->base.is_jmp = DISAS_NORETURN;
}
@@ -9186,6 +9174,7 @@ static bool ppc_tr_breakpoint_check(DisasContextBase
*dcbase, CPUState *cs,
{
DisasContext *ctx = container_of(dcbase, DisasContext, base);
+ gen_update_nip(ctx, ctx->base.pc_next);
gen_debug_exception(ctx);
/*
* The address covered by the breakpoint must be included in
--
2.31.1
- [PULL 20/48] target/ppc: Remove special case for POWERPC_EXCP_TRAP, (continued)
- [PULL 20/48] target/ppc: Remove special case for POWERPC_EXCP_TRAP, David Gibson, 2021/05/19
- [PULL 18/48] target/ppc: Move DISAS_NORETURN setting into gen_exception*, David Gibson, 2021/05/19
- [PULL 22/48] target/ppc: Introduce DISAS_{EXIT,CHAIN}{,_UPDATE}, David Gibson, 2021/05/19
- [PULL 06/48] hw/ppc: moved hcalls that depend on softmmu, David Gibson, 2021/05/19
- [PULL 12/48] target/ppc: created ppc_{store, get}_vscr for generic vscr usage, David Gibson, 2021/05/19
- [PULL 05/48] target/ppc: move SPR R/W callbacks to translate.c, David Gibson, 2021/05/19
- [PULL 28/48] target/ppc: Remove DisasContext.exception, David Gibson, 2021/05/19
- [PULL 13/48] target/ppc: updated vscr manipulation in machine.c, David Gibson, 2021/05/19
- [PULL 15/48] target/ppc: moved ppc_cpu_dump_state to cpu_init.c, David Gibson, 2021/05/19
- [PULL 19/48] target/ppc: Remove special case for POWERPC_SYSCALL, David Gibson, 2021/05/19
- [PULL 21/48] target/ppc: Simplify gen_debug_exception,
David Gibson <=
- [PULL 27/48] target/ppc: Replace POWERPC_EXCP_BRANCH with DISAS_NORETURN, David Gibson, 2021/05/19
- [PULL 24/48] target/ppc: Remove unnecessary gen_io_end calls, David Gibson, 2021/05/19
- [PULL 23/48] target/ppc: Replace POWERPC_EXCP_SYNC with DISAS_EXIT, David Gibson, 2021/05/19
- [PULL 26/48] target/ppc: Replace POWERPC_EXCP_STOP with DISAS_EXIT_UPDATE, David Gibson, 2021/05/19
- [PULL 32/48] target/ppc: Use translator_loop_temp_check, David Gibson, 2021/05/19
- [PULL 30/48] target/ppc: Tidy exception vs exit_tb, David Gibson, 2021/05/19
- [PULL 25/48] target/ppc: Introduce gen_icount_io_start, David Gibson, 2021/05/19
- [PULL 34/48] target/ppc: Introduce prot_for_access_type, David Gibson, 2021/05/19
- [PULL 29/48] target/ppc: Move single-step check to ppc_tr_tb_stop, David Gibson, 2021/05/19
- [PULL 31/48] target/ppc: Mark helper_raise_exception* as noreturn, David Gibson, 2021/05/19