[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v5 05/23] target/ppc: Move single-step check to ppc_tr_tb_sto
From: |
David Gibson |
Subject: |
Re: [PATCH v5 05/23] target/ppc: Move single-step check to ppc_tr_tb_stop |
Date: |
Tue, 18 May 2021 10:19:07 +1000 |
On Mon, May 17, 2021 at 05:50:07PM -0300, matheus.ferst@eldorado.org.br wrote:
> From: Richard Henderson <richard.henderson@linaro.org>
>
> When single-stepping, force max_insns to 1 in init_disas
> so that we exit the translation loop immediately.
>
> Combine the single-step checks in tb_stop, and give the
> gdb exception priority over the cpu exception, just as
> we already do in gen_lookup_and_goto_ptr.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Applied to ppc-for-6.1, thanks.
> ---
> target/ppc/translate.c | 33 +++++++++++++++++++--------------
> 1 file changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/target/ppc/translate.c b/target/ppc/translate.c
> index 80cd11b3f8..05e3c0417a 100644
> --- a/target/ppc/translate.c
> +++ b/target/ppc/translate.c
> @@ -8992,7 +8992,6 @@ static void ppc_tr_init_disas_context(DisasContextBase
> *dcbase, CPUState *cs)
> DisasContext *ctx = container_of(dcbase, DisasContext, base);
> CPUPPCState *env = cs->env_ptr;
> uint32_t hflags = ctx->base.tb->flags;
> - int bound;
>
> ctx->spr_cb = env->spr_cb;
> ctx->pr = (hflags >> HFLAGS_PR) & 1;
> @@ -9032,8 +9031,12 @@ static void ppc_tr_init_disas_context(DisasContextBase
> *dcbase, CPUState *cs)
> ctx->singlestep_enabled |= GDBSTUB_SINGLE_STEP;
> }
>
> - bound = -(ctx->base.pc_first | TARGET_PAGE_MASK) / 4;
> - ctx->base.max_insns = MIN(ctx->base.max_insns, bound);
> + if (ctx->singlestep_enabled & (CPU_SINGLE_STEP | GDBSTUB_SINGLE_STEP)) {
> + ctx->base.max_insns = 1;
> + } else {
> + int bound = -(ctx->base.pc_first | TARGET_PAGE_MASK) / 4;
> + ctx->base.max_insns = MIN(ctx->base.max_insns, bound);
> + }
> }
>
> static void ppc_tr_tb_start(DisasContextBase *db, CPUState *cs)
> @@ -9087,14 +9090,6 @@ static void ppc_tr_translate_insn(DisasContextBase
> *dcbase, CPUState *cs)
> handler->count++;
> #endif
>
> - /* Check trace mode exceptions */
> - if (unlikely(ctx->singlestep_enabled & CPU_SINGLE_STEP &&
> - (ctx->base.pc_next <= 0x100 || ctx->base.pc_next > 0xF00) &&
> - ctx->base.is_jmp != DISAS_NORETURN)) {
> - uint32_t excp = gen_prep_dbgex(ctx);
> - gen_exception_nip(ctx, excp, ctx->base.pc_next);
> - }
> -
> if (tcg_check_temp_count()) {
> qemu_log("Opcode %02x %02x %02x %02x (%08x) leaked "
> "temporaries\n", opc1(ctx->opcode), opc2(ctx->opcode),
> @@ -9107,6 +9102,7 @@ static void ppc_tr_tb_stop(DisasContextBase *dcbase,
> CPUState *cs)
> DisasContext *ctx = container_of(dcbase, DisasContext, base);
> DisasJumpType is_jmp = ctx->base.is_jmp;
> target_ulong nip = ctx->base.pc_next;
> + int sse;
>
> if (is_jmp == DISAS_NORETURN) {
> /* We have already exited the TB. */
> @@ -9114,7 +9110,8 @@ static void ppc_tr_tb_stop(DisasContextBase *dcbase,
> CPUState *cs)
> }
>
> /* Honor single stepping. */
> - if (unlikely(ctx->base.singlestep_enabled)) {
> + sse = ctx->singlestep_enabled & (CPU_SINGLE_STEP | GDBSTUB_SINGLE_STEP);
> + if (unlikely(sse)) {
> switch (is_jmp) {
> case DISAS_TOO_MANY:
> case DISAS_EXIT_UPDATE:
> @@ -9127,8 +9124,16 @@ static void ppc_tr_tb_stop(DisasContextBase *dcbase,
> CPUState *cs)
> default:
> g_assert_not_reached();
> }
> - gen_debug_exception(ctx);
> - return;
> +
> + if (sse & GDBSTUB_SINGLE_STEP) {
> + gen_debug_exception(ctx);
> + return;
> + }
> + /* else CPU_SINGLE_STEP... */
> + if (nip <= 0x100 || nip > 0xf00) {
> + gen_exception(ctx, gen_prep_dbgex(ctx));
> + return;
> + }
> }
>
> switch (is_jmp) {
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
- [PATCH v5 00/23] Base for adding PowerPC 64-bit instructions, matheus . ferst, 2021/05/17
- [PATCH v5 01/23] target/ppc: Introduce gen_icount_io_start, matheus . ferst, 2021/05/17
- [PATCH v5 02/23] target/ppc: Replace POWERPC_EXCP_STOP with DISAS_EXIT_UPDATE, matheus . ferst, 2021/05/17
- [PATCH v5 03/23] target/ppc: Replace POWERPC_EXCP_BRANCH with DISAS_NORETURN, matheus . ferst, 2021/05/17
- [PATCH v5 04/23] target/ppc: Remove DisasContext.exception, matheus . ferst, 2021/05/17
- [PATCH v5 05/23] target/ppc: Move single-step check to ppc_tr_tb_stop, matheus . ferst, 2021/05/17
- Re: [PATCH v5 05/23] target/ppc: Move single-step check to ppc_tr_tb_stop,
David Gibson <=
- [PATCH v5 06/23] target/ppc: Tidy exception vs exit_tb, matheus . ferst, 2021/05/17
- [PATCH v5 07/23] target/ppc: Mark helper_raise_exception* as noreturn, matheus . ferst, 2021/05/17
- [PATCH v5 08/23] target/ppc: Use translator_loop_temp_check, matheus . ferst, 2021/05/17
- [PATCH v5 09/23] target/ppc: Introduce macros to check isa extensions, matheus . ferst, 2021/05/17
- [PATCH v5 10/23] target/ppc: Move page crossing check to ppc_tr_translate_insn, matheus . ferst, 2021/05/17