diff mbox series

[v4,05/31] target/ppc: Remove special case for POWERPC_EXCP_TRAP

Message ID 20210512185441.3619828-6-matheus.ferst@eldorado.org.br
State Superseded
Headers show
Series [v4,01/31] target/ppc: Add cia field to DisasContext | expand

Commit Message

Matheus K. Ferst May 12, 2021, 6:54 p.m. UTC
From: Richard Henderson <richard.henderson@linaro.org>


Since POWERPC_EXCP_TRAP is raised by gen_exception_err,
we will have also set DISAS_NORETURN.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>

Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>

---
 target/ppc/translate.c | 1 -
 1 file changed, 1 deletion(-)

-- 
2.25.1

Comments

David Gibson May 13, 2021, 4:07 a.m. UTC | #1
On Wed, May 12, 2021 at 03:54:15PM -0300, matheus.ferst@eldorado.org.br wrote:
> From: Richard Henderson <richard.henderson@linaro.org>

> 

> Since POWERPC_EXCP_TRAP is raised by gen_exception_err,

> we will have also set DISAS_NORETURN.

> 

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>

> Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>


Applied to ppc-for-6.1, thanks.

> ---

>  target/ppc/translate.c | 1 -

>  1 file changed, 1 deletion(-)

> 

> diff --git a/target/ppc/translate.c b/target/ppc/translate.c

> index 2303bf259a..23de04a08e 100644

> --- a/target/ppc/translate.c

> +++ b/target/ppc/translate.c

> @@ -9416,7 +9416,6 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)

>      /* Check trace mode exceptions */

>      if (unlikely(ctx->singlestep_enabled & CPU_SINGLE_STEP &&

>                   (ctx->base.pc_next <= 0x100 || ctx->base.pc_next > 0xF00) &&

> -                 ctx->exception != POWERPC_EXCP_TRAP &&

>                   ctx->exception != POWERPC_EXCP_BRANCH &&

>                   ctx->base.is_jmp != DISAS_NORETURN)) {

>          uint32_t excp = gen_prep_dbgex(ctx);


-- 
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
diff mbox series

Patch

diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 2303bf259a..23de04a08e 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -9416,7 +9416,6 @@  static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
     /* Check trace mode exceptions */
     if (unlikely(ctx->singlestep_enabled & CPU_SINGLE_STEP &&
                  (ctx->base.pc_next <= 0x100 || ctx->base.pc_next > 0xF00) &&
-                 ctx->exception != POWERPC_EXCP_TRAP &&
                  ctx->exception != POWERPC_EXCP_BRANCH &&
                  ctx->base.is_jmp != DISAS_NORETURN)) {
         uint32_t excp = gen_prep_dbgex(ctx);