From: Richard Henderson <richard.henderson@linaro.org>
Date: Wed, 12 May 2021 18:54:15 +0000 (-0300)
Subject: target/ppc: Remove special case for POWERPC_EXCP_TRAP
X-Git-Tag: v6.1.0-rc0~114^2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=506fadcfd75ca7a761bfe6025aa9dd11af89626c;p=thirdparty%2Fqemu.git

target/ppc: Remove special case for POWERPC_EXCP_TRAP

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>
Message-Id: <20210512185441.3619828-6-matheus.ferst@eldorado.org.br>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 18f581e4956..9626bea9d51 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -9225,7 +9225,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);