| Message ID | 20240513074717.130949-14-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/hppa: Misc improvements | expand |
* Richard Henderson <richard.henderson@linaro.org>: > Move space assighments to a central location. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Helge Deller <deller@gmx.de> > --- > target/hppa/translate.c | 58 +++++++++++++++++++---------------------- > 1 file changed, 27 insertions(+), 31 deletions(-) > > diff --git a/target/hppa/translate.c b/target/hppa/translate.c > index d24220c60f..05383dcd04 100644 > --- a/target/hppa/translate.c > +++ b/target/hppa/translate.c > @@ -624,8 +624,9 @@ static void copy_iaoq_entry(DisasContext *ctx, TCGv_i64 dest, > } > } > > -static void install_iaq_entries(DisasContext *ctx, uint64_t bi, TCGv_i64 bv, > - uint64_t ni, TCGv_i64 nv) > +static void install_iaq_entries(DisasContext *ctx, > + uint64_t bi, TCGv_i64 bv, TCGv_i64 bs, > + uint64_t ni, TCGv_i64 nv, TCGv_i64 ns) > { > copy_iaoq_entry(ctx, cpu_iaoq_f, bi, bv); > > @@ -639,6 +640,12 @@ static void install_iaq_entries(DisasContext *ctx, uint64_t bi, TCGv_i64 bv, > tcg_gen_andi_i64(cpu_iaoq_b, cpu_iaoq_b, > gva_offset_mask(ctx->tb_flags)); > } > + if (bs) { > + tcg_gen_mov_i64(cpu_iasq_f, bs); > + } > + if (ns || bs) { > + tcg_gen_mov_i64(cpu_iasq_b, ns ? ns : bs); > + } > } > > static void install_link(DisasContext *ctx, unsigned link, bool with_sr0) > @@ -670,7 +677,8 @@ static void gen_excp_1(int exception) > > static void gen_excp(DisasContext *ctx, int exception) > { > - install_iaq_entries(ctx, ctx->iaoq_f, cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b); > + install_iaq_entries(ctx, ctx->iaoq_f, cpu_iaoq_f, NULL, > + ctx->iaoq_b, cpu_iaoq_b, NULL); > nullify_save(ctx); > gen_excp_1(exception); > ctx->base.is_jmp = DISAS_NORETURN; > @@ -724,10 +732,11 @@ static void gen_goto_tb(DisasContext *ctx, int which, > { > if (use_goto_tb(ctx, b, n)) { > tcg_gen_goto_tb(which); > - install_iaq_entries(ctx, b, NULL, n, NULL); > + install_iaq_entries(ctx, b, NULL, NULL, n, NULL, NULL); > tcg_gen_exit_tb(ctx->base.tb, which); > } else { > - install_iaq_entries(ctx, b, cpu_iaoq_b, n, ctx->iaoq_n_var); > + install_iaq_entries(ctx, b, cpu_iaoq_b, ctx->iasq_b, > + n, ctx->iaoq_n_var, ctx->iasq_n); > tcg_gen_lookup_and_goto_ptr(); > } > } > @@ -1916,7 +1925,7 @@ static bool do_ibranch(DisasContext *ctx, TCGv_i64 dest, > install_link(ctx, link, false); > if (is_n) { > if (use_nullify_skip(ctx)) { > - install_iaq_entries(ctx, -1, next, -1, NULL); > + install_iaq_entries(ctx, -1, next, NULL, -1, NULL, NULL); > nullify_set(ctx, 0); > ctx->base.is_jmp = DISAS_IAQ_N_UPDATED; > return true; > @@ -1935,10 +1944,11 @@ static bool do_ibranch(DisasContext *ctx, TCGv_i64 dest, > > install_link(ctx, link, false); > if (is_n && use_nullify_skip(ctx)) { > - install_iaq_entries(ctx, -1, next, -1, NULL); > + install_iaq_entries(ctx, -1, next, NULL, -1, NULL, NULL); > nullify_set(ctx, 0); > } else { > - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, next); > + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, > + -1, next, NULL); > nullify_set(ctx, is_n); > } > > @@ -2026,7 +2036,7 @@ static void do_page_zero(DisasContext *ctx) > tcg_gen_st_i64(cpu_gr[26], tcg_env, offsetof(CPUHPPAState, cr[27])); > tmp = tcg_temp_new_i64(); > tcg_gen_ori_i64(tmp, cpu_gr[31], 3); > - install_iaq_entries(ctx, -1, tmp, -1, NULL); > + install_iaq_entries(ctx, -1, tmp, NULL, -1, NULL, NULL); > ctx->base.is_jmp = DISAS_IAQ_N_UPDATED; > break; > > @@ -2770,8 +2780,8 @@ static bool trans_or(DisasContext *ctx, arg_rrr_cf_d *a) > nullify_over(ctx); > > /* Advance the instruction queue. */ > - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, > - ctx->iaoq_n, ctx->iaoq_n_var); > + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, > + ctx->iaoq_n, ctx->iaoq_n_var, ctx->iasq_n); > nullify_set(ctx, 0); > > /* Tell the qemu main loop to halt until this cpu has work. */ > @@ -3921,16 +3931,11 @@ static bool trans_be(DisasContext *ctx, arg_be *a) > load_spr(ctx, new_spc, a->sp); > install_link(ctx, a->l, true); > if (a->n && use_nullify_skip(ctx)) { > - install_iaq_entries(ctx, -1, tmp, -1, NULL); > - tcg_gen_mov_i64(cpu_iasq_f, new_spc); > - tcg_gen_mov_i64(cpu_iasq_b, new_spc); > + install_iaq_entries(ctx, -1, tmp, new_spc, -1, NULL, new_spc); > nullify_set(ctx, 0); > } else { > - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, tmp); > - if (ctx->iasq_b) { > - tcg_gen_mov_i64(cpu_iasq_f, ctx->iasq_b); > - } > - tcg_gen_mov_i64(cpu_iasq_b, new_spc); > + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, > + -1, tmp, new_spc); > nullify_set(ctx, a->n); > } > tcg_gen_lookup_and_goto_ptr(); > @@ -4041,11 +4046,8 @@ static bool trans_bve(DisasContext *ctx, arg_bve *a) > dest = do_ibranch_priv(ctx, dest); > > install_link(ctx, a->l, false); > - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, dest); > - if (ctx->iasq_b) { > - tcg_gen_mov_i64(cpu_iasq_f, ctx->iasq_b); > - } > - tcg_gen_mov_i64(cpu_iasq_b, space_select(ctx, 0, dest)); > + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, > + -1, dest, space_select(ctx, 0, dest)); > nullify_set(ctx, a->n); > tcg_gen_lookup_and_goto_ptr(); > ctx->base.is_jmp = DISAS_NORETURN; > @@ -4781,13 +4783,7 @@ static void hppa_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) > } > /* FALLTHRU */ > case DISAS_IAQ_N_STALE_EXIT: > - install_iaq_entries(ctx, fi, fv, bi, bv); > - if (fs) { > - tcg_gen_mov_i64(cpu_iasq_f, fs); > - } > - if (bs) { > - tcg_gen_mov_i64(cpu_iasq_b, bs); > - } > + install_iaq_entries(ctx, fi, fv, fs, bi, bv, bs); > nullify_save(ctx); > if (is_jmp == DISAS_IAQ_N_STALE_EXIT) { > tcg_gen_exit_tb(NULL, 0); > -- > 2.34.1 >
diff --git a/target/hppa/translate.c b/target/hppa/translate.c index d24220c60f..05383dcd04 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -624,8 +624,9 @@ static void copy_iaoq_entry(DisasContext *ctx, TCGv_i64 dest, } } -static void install_iaq_entries(DisasContext *ctx, uint64_t bi, TCGv_i64 bv, - uint64_t ni, TCGv_i64 nv) +static void install_iaq_entries(DisasContext *ctx, + uint64_t bi, TCGv_i64 bv, TCGv_i64 bs, + uint64_t ni, TCGv_i64 nv, TCGv_i64 ns) { copy_iaoq_entry(ctx, cpu_iaoq_f, bi, bv); @@ -639,6 +640,12 @@ static void install_iaq_entries(DisasContext *ctx, uint64_t bi, TCGv_i64 bv, tcg_gen_andi_i64(cpu_iaoq_b, cpu_iaoq_b, gva_offset_mask(ctx->tb_flags)); } + if (bs) { + tcg_gen_mov_i64(cpu_iasq_f, bs); + } + if (ns || bs) { + tcg_gen_mov_i64(cpu_iasq_b, ns ? ns : bs); + } } static void install_link(DisasContext *ctx, unsigned link, bool with_sr0) @@ -670,7 +677,8 @@ static void gen_excp_1(int exception) static void gen_excp(DisasContext *ctx, int exception) { - install_iaq_entries(ctx, ctx->iaoq_f, cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b); + install_iaq_entries(ctx, ctx->iaoq_f, cpu_iaoq_f, NULL, + ctx->iaoq_b, cpu_iaoq_b, NULL); nullify_save(ctx); gen_excp_1(exception); ctx->base.is_jmp = DISAS_NORETURN; @@ -724,10 +732,11 @@ static void gen_goto_tb(DisasContext *ctx, int which, { if (use_goto_tb(ctx, b, n)) { tcg_gen_goto_tb(which); - install_iaq_entries(ctx, b, NULL, n, NULL); + install_iaq_entries(ctx, b, NULL, NULL, n, NULL, NULL); tcg_gen_exit_tb(ctx->base.tb, which); } else { - install_iaq_entries(ctx, b, cpu_iaoq_b, n, ctx->iaoq_n_var); + install_iaq_entries(ctx, b, cpu_iaoq_b, ctx->iasq_b, + n, ctx->iaoq_n_var, ctx->iasq_n); tcg_gen_lookup_and_goto_ptr(); } } @@ -1916,7 +1925,7 @@ static bool do_ibranch(DisasContext *ctx, TCGv_i64 dest, install_link(ctx, link, false); if (is_n) { if (use_nullify_skip(ctx)) { - install_iaq_entries(ctx, -1, next, -1, NULL); + install_iaq_entries(ctx, -1, next, NULL, -1, NULL, NULL); nullify_set(ctx, 0); ctx->base.is_jmp = DISAS_IAQ_N_UPDATED; return true; @@ -1935,10 +1944,11 @@ static bool do_ibranch(DisasContext *ctx, TCGv_i64 dest, install_link(ctx, link, false); if (is_n && use_nullify_skip(ctx)) { - install_iaq_entries(ctx, -1, next, -1, NULL); + install_iaq_entries(ctx, -1, next, NULL, -1, NULL, NULL); nullify_set(ctx, 0); } else { - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, next); + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, + -1, next, NULL); nullify_set(ctx, is_n); } @@ -2026,7 +2036,7 @@ static void do_page_zero(DisasContext *ctx) tcg_gen_st_i64(cpu_gr[26], tcg_env, offsetof(CPUHPPAState, cr[27])); tmp = tcg_temp_new_i64(); tcg_gen_ori_i64(tmp, cpu_gr[31], 3); - install_iaq_entries(ctx, -1, tmp, -1, NULL); + install_iaq_entries(ctx, -1, tmp, NULL, -1, NULL, NULL); ctx->base.is_jmp = DISAS_IAQ_N_UPDATED; break; @@ -2770,8 +2780,8 @@ static bool trans_or(DisasContext *ctx, arg_rrr_cf_d *a) nullify_over(ctx); /* Advance the instruction queue. */ - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, - ctx->iaoq_n, ctx->iaoq_n_var); + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, + ctx->iaoq_n, ctx->iaoq_n_var, ctx->iasq_n); nullify_set(ctx, 0); /* Tell the qemu main loop to halt until this cpu has work. */ @@ -3921,16 +3931,11 @@ static bool trans_be(DisasContext *ctx, arg_be *a) load_spr(ctx, new_spc, a->sp); install_link(ctx, a->l, true); if (a->n && use_nullify_skip(ctx)) { - install_iaq_entries(ctx, -1, tmp, -1, NULL); - tcg_gen_mov_i64(cpu_iasq_f, new_spc); - tcg_gen_mov_i64(cpu_iasq_b, new_spc); + install_iaq_entries(ctx, -1, tmp, new_spc, -1, NULL, new_spc); nullify_set(ctx, 0); } else { - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, tmp); - if (ctx->iasq_b) { - tcg_gen_mov_i64(cpu_iasq_f, ctx->iasq_b); - } - tcg_gen_mov_i64(cpu_iasq_b, new_spc); + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, + -1, tmp, new_spc); nullify_set(ctx, a->n); } tcg_gen_lookup_and_goto_ptr(); @@ -4041,11 +4046,8 @@ static bool trans_bve(DisasContext *ctx, arg_bve *a) dest = do_ibranch_priv(ctx, dest); install_link(ctx, a->l, false); - install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, dest); - if (ctx->iasq_b) { - tcg_gen_mov_i64(cpu_iasq_f, ctx->iasq_b); - } - tcg_gen_mov_i64(cpu_iasq_b, space_select(ctx, 0, dest)); + install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, ctx->iasq_b, + -1, dest, space_select(ctx, 0, dest)); nullify_set(ctx, a->n); tcg_gen_lookup_and_goto_ptr(); ctx->base.is_jmp = DISAS_NORETURN; @@ -4781,13 +4783,7 @@ static void hppa_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) } /* FALLTHRU */ case DISAS_IAQ_N_STALE_EXIT: - install_iaq_entries(ctx, fi, fv, bi, bv); - if (fs) { - tcg_gen_mov_i64(cpu_iasq_f, fs); - } - if (bs) { - tcg_gen_mov_i64(cpu_iasq_b, bs); - } + install_iaq_entries(ctx, fi, fv, fs, bi, bv, bs); nullify_save(ctx); if (is_jmp == DISAS_IAQ_N_STALE_EXIT) { tcg_gen_exit_tb(NULL, 0);
Move space assighments to a central location. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/hppa/translate.c | 58 +++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 31 deletions(-)