| Message ID | 20210430011543.1017113-18-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Base for adding PowerPC 64-bit instructions | expand |
On 29/04/2021 22:15, Richard Henderson wrote: > Now that we have removed all of the fake exceptions, and all real > exceptions exit via DISAS_NORETURN, we can remove this field. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/ppc/translate.c | 22 ++-------------------- > 1 file changed, 2 insertions(+), 20 deletions(-) > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index 276a4a2a79..d78071a4a4 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -259,15 +259,12 @@ static void gen_exception_err(DisasContext *ctx, uint32_t excp, uint32_t error) > * These are all synchronous exceptions, we set the PC back to the > * faulting instruction > */ > - if (ctx->exception == POWERPC_EXCP_NONE) { > - gen_update_nip(ctx, ctx->cia); > - } > + gen_update_nip(ctx, ctx->cia); > t0 = tcg_const_i32(excp); > t1 = tcg_const_i32(error); > gen_helper_raise_exception_err(cpu_env, t0, t1); > tcg_temp_free_i32(t0); > tcg_temp_free_i32(t1); > - ctx->exception = excp; > ctx->base.is_jmp = DISAS_NORETURN; > } > > @@ -279,13 +276,10 @@ static void gen_exception(DisasContext *ctx, uint32_t excp) > * These are all synchronous exceptions, we set the PC back to the > * faulting instruction > */ > - if (ctx->exception == POWERPC_EXCP_NONE) { > - gen_update_nip(ctx, ctx->cia); > - } > + gen_update_nip(ctx, ctx->cia); > t0 = tcg_const_i32(excp); > gen_helper_raise_exception(cpu_env, t0); > tcg_temp_free_i32(t0); > - ctx->exception = excp; > ctx->base.is_jmp = DISAS_NORETURN; > } > > @@ -298,7 +292,6 @@ static void gen_exception_nip(DisasContext *ctx, uint32_t excp, > t0 = tcg_const_i32(excp); > gen_helper_raise_exception(cpu_env, t0); > tcg_temp_free_i32(t0); > - ctx->exception = excp; > ctx->base.is_jmp = DISAS_NORETURN; > } > > @@ -7919,7 +7912,6 @@ static void ppc_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) > CPUPPCState *env = cs->env_ptr; > int bound; > > - ctx->exception = POWERPC_EXCP_NONE; > ctx->spr_cb = env->spr_cb; > ctx->pr = msr_pr; > ctx->mem_idx = env->dmmu_idx; > @@ -8067,16 +8059,6 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) > "temporaries\n", opc1(ctx->opcode), opc2(ctx->opcode), > opc3(ctx->opcode), opc4(ctx->opcode), ctx->opcode); > } > - > - if (ctx->base.is_jmp == DISAS_NEXT) { > - switch (ctx->exception) { > - case POWERPC_EXCP_NONE: > - break; > - default: > - /* Every other ctx->exception should have set NORETURN. */ > - g_assert_not_reached(); > - } > - } > } > > static void ppc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) > You removed the uses, but left the field. Thanks, Matheus K. Ferst Instituto de Pesquisas ELDORADO <http://www.eldorado.org.br/> Analista de Software Júnior Aviso Legal - Disclaimer <https://www.eldorado.org.br/disclaimer.html>
diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 276a4a2a79..d78071a4a4 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -259,15 +259,12 @@ static void gen_exception_err(DisasContext *ctx, uint32_t excp, uint32_t error) * These are all synchronous exceptions, we set the PC back to the * faulting instruction */ - if (ctx->exception == POWERPC_EXCP_NONE) { - gen_update_nip(ctx, ctx->cia); - } + gen_update_nip(ctx, ctx->cia); t0 = tcg_const_i32(excp); t1 = tcg_const_i32(error); gen_helper_raise_exception_err(cpu_env, t0, t1); tcg_temp_free_i32(t0); tcg_temp_free_i32(t1); - ctx->exception = excp; ctx->base.is_jmp = DISAS_NORETURN; } @@ -279,13 +276,10 @@ static void gen_exception(DisasContext *ctx, uint32_t excp) * These are all synchronous exceptions, we set the PC back to the * faulting instruction */ - if (ctx->exception == POWERPC_EXCP_NONE) { - gen_update_nip(ctx, ctx->cia); - } + gen_update_nip(ctx, ctx->cia); t0 = tcg_const_i32(excp); gen_helper_raise_exception(cpu_env, t0); tcg_temp_free_i32(t0); - ctx->exception = excp; ctx->base.is_jmp = DISAS_NORETURN; } @@ -298,7 +292,6 @@ static void gen_exception_nip(DisasContext *ctx, uint32_t excp, t0 = tcg_const_i32(excp); gen_helper_raise_exception(cpu_env, t0); tcg_temp_free_i32(t0); - ctx->exception = excp; ctx->base.is_jmp = DISAS_NORETURN; } @@ -7919,7 +7912,6 @@ static void ppc_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) CPUPPCState *env = cs->env_ptr; int bound; - ctx->exception = POWERPC_EXCP_NONE; ctx->spr_cb = env->spr_cb; ctx->pr = msr_pr; ctx->mem_idx = env->dmmu_idx; @@ -8067,16 +8059,6 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) "temporaries\n", opc1(ctx->opcode), opc2(ctx->opcode), opc3(ctx->opcode), opc4(ctx->opcode), ctx->opcode); } - - if (ctx->base.is_jmp == DISAS_NEXT) { - switch (ctx->exception) { - case POWERPC_EXCP_NONE: - break; - default: - /* Every other ctx->exception should have set NORETURN. */ - g_assert_not_reached(); - } - } } static void ppc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs)
Now that we have removed all of the fake exceptions, and all real exceptions exit via DISAS_NORETURN, we can remove this field. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/ppc/translate.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) -- 2.25.1