mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/ppc: Replace POWERPC_EXCP_BRANCH with DISAS_NORETURN

Browse Source 
The translation of branch instructions always results in exit from
the TB. Remove the synthetic "exception" after no more uses.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Message-Id: <20210517205025.3777947-4-matheus.ferst@eldorado.org.br>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Richard Henderson 2021-05-17 17:50:05 -03:00 committed by David Gibson
parent d736de8ff6
commit 6086c751c3
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
linux-user/ppc/cpu_loop.c
View File

@ -423,9 +423,6 @@ void cpu_loop(CPUPPCState *env)
cpu_abort(cs, "Maintenance exception while in user mode. " cpu_abort(cs, "Maintenance exception while in user mode. "
"Aborting\n"); "Aborting\n");
break; break;
case POWERPC_EXCP_BRANCH: /* branch instruction: */
/* We just stopped because of a branch. Go on */
break;
case POWERPC_EXCP_SYSCALL_USER: case POWERPC_EXCP_SYSCALL_USER:
/* system call in user-mode emulation */ /* system call in user-mode emulation */
/* WARNING: /* WARNING:

2
target/ppc/cpu.h
View File

@ -131,8 +131,6 @@ enum {
POWERPC_EXCP_SYSCALL_VECTORED = 102, /* scv exception */ POWERPC_EXCP_SYSCALL_VECTORED = 102, /* scv exception */
/* EOL */ /* EOL */
POWERPC_EXCP_NB = 103, POWERPC_EXCP_NB = 103,
/* QEMU exceptions: used internally during code translation */
POWERPC_EXCP_BRANCH = 0x201, /* branch instruction */
/* QEMU exceptions: special cases we want to stop translation */ /* QEMU exceptions: special cases we want to stop translation */
POWERPC_EXCP_SYSCALL_USER = 0x203, /* System call in user mode only */ POWERPC_EXCP_SYSCALL_USER = 0x203, /* System call in user mode only */
}; };

8
target/ppc/translate.c
View File

@ -4692,7 +4692,6 @@ static void gen_b(DisasContext *ctx)
{ {
target_ulong li, target; target_ulong li, target;
ctx->exception = POWERPC_EXCP_BRANCH;
/* sign extend LI */ /* sign extend LI */
li = LI(ctx->opcode); li = LI(ctx->opcode);
li = (li ^ 0x02000000) - 0x02000000; li = (li ^ 0x02000000) - 0x02000000;
@ -4706,6 +4705,7 @@ static void gen_b(DisasContext *ctx)
} }
gen_update_cfar(ctx, ctx->cia); gen_update_cfar(ctx, ctx->cia);
gen_goto_tb(ctx, 0, target); gen_goto_tb(ctx, 0, target);
ctx->base.is_jmp = DISAS_NORETURN;
} }
#define BCOND_IM 0 #define BCOND_IM 0
@ -4718,7 +4718,6 @@ static void gen_bcond(DisasContext *ctx, int type)
uint32_t bo = BO(ctx->opcode); uint32_t bo = BO(ctx->opcode);
TCGLabel *l1; TCGLabel *l1;
TCGv target; TCGv target;
ctx->exception = POWERPC_EXCP_BRANCH;
if (type == BCOND_LR || type == BCOND_CTR || type == BCOND_TAR) { if (type == BCOND_LR || type == BCOND_CTR || type == BCOND_TAR) {
target = tcg_temp_local_new(); target = tcg_temp_local_new();
@ -4825,6 +4824,7 @@ static void gen_bcond(DisasContext *ctx, int type)
gen_set_label(l1); gen_set_label(l1);
gen_goto_tb(ctx, 1, ctx->base.pc_next); gen_goto_tb(ctx, 1, ctx->base.pc_next);
} }
ctx->base.is_jmp = DISAS_NORETURN;
} }
static void gen_bc(DisasContext *ctx) static void gen_bc(DisasContext *ctx)
@ -9102,7 +9102,6 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
/* Check trace mode exceptions */ /* Check trace mode exceptions */
if (unlikely(ctx->singlestep_enabled & CPU_SINGLE_STEP && if (unlikely(ctx->singlestep_enabled & CPU_SINGLE_STEP &&
(ctx->base.pc_next <= 0x100 || ctx->base.pc_next > 0xF00) && (ctx->base.pc_next <= 0x100 || ctx->base.pc_next > 0xF00) &&
ctx->exception != POWERPC_EXCP_BRANCH &&
ctx->base.is_jmp != DISAS_NORETURN)) { ctx->base.is_jmp != DISAS_NORETURN)) {
uint32_t excp = gen_prep_dbgex(ctx); uint32_t excp = gen_prep_dbgex(ctx);
gen_exception_nip(ctx, excp, ctx->base.pc_next); gen_exception_nip(ctx, excp, ctx->base.pc_next);
@ -9118,9 +9117,6 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
switch (ctx->exception) { switch (ctx->exception) {
case POWERPC_EXCP_NONE: case POWERPC_EXCP_NONE:
break; break;
case POWERPC_EXCP_BRANCH:
ctx->base.is_jmp = DISAS_NORETURN;
break;
default: default:
/* Every other ctx->exception should have set NORETURN. */ /* Every other ctx->exception should have set NORETURN. */
g_assert_not_reached(); g_assert_not_reached();