[v2,07/45] target/hppa: Add install_iaq_entries

Instead of two separate cpu_iaoq_entry calls, use one call to update
both IAQ_Front and IAQ_Back.  Simplify with an argument combination
that automatically handles a simple increment from Front to Back.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/hppa/translate.c | 64 +++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

* Richard Henderson <richard.henderson@linaro.org>:
> Instead of two separate cpu_iaoq_entry calls, use one call to update
> both IAQ_Front and IAQ_Back.  Simplify with an argument combination
> that automatically handles a simple increment from Front to Back.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Helge Deller <deller@gmx.de>

> ---
>  target/hppa/translate.c | 64 +++++++++++++++++++++--------------------
>  1 file changed, 33 insertions(+), 31 deletions(-)
> 
> diff --git a/target/hppa/translate.c b/target/hppa/translate.c
> index d272be0e6e..08d5e2a4bc 100644
> --- a/target/hppa/translate.c
> +++ b/target/hppa/translate.c
> @@ -617,6 +617,23 @@ 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)
> +{
> +    copy_iaoq_entry(ctx, cpu_iaoq_f, bi, bv);
> +
> +    /* Allow ni variable, with nv null, to indicate a trivial advance. */
> +    if (ni != -1 || nv) {
> +        copy_iaoq_entry(ctx, cpu_iaoq_b, ni, nv);
> +    } else if (bi != -1) {
> +        copy_iaoq_entry(ctx, cpu_iaoq_b, bi + 4, NULL);
> +    } else {
> +        tcg_gen_addi_i64(cpu_iaoq_b, cpu_iaoq_f, 4);
> +        tcg_gen_andi_i64(cpu_iaoq_b, cpu_iaoq_b,
> +                         gva_offset_mask(ctx->tb_flags));
> +    }
> +}
> +
>  static inline uint64_t iaoq_dest(DisasContext *ctx, int64_t disp)
>  {
>      return ctx->iaoq_f + disp + 8;
> @@ -629,8 +646,7 @@ static void gen_excp_1(int exception)
>  
>  static void gen_excp(DisasContext *ctx, int exception)
>  {
> -    copy_iaoq_entry(ctx, cpu_iaoq_f, ctx->iaoq_f, cpu_iaoq_f);
> -    copy_iaoq_entry(ctx, cpu_iaoq_b, ctx->iaoq_b, cpu_iaoq_b);
> +    install_iaq_entries(ctx, ctx->iaoq_f, cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b);
>      nullify_save(ctx);
>      gen_excp_1(exception);
>      ctx->base.is_jmp = DISAS_NORETURN;
> @@ -684,12 +700,10 @@ static void gen_goto_tb(DisasContext *ctx, int which,
>  {
>      if (use_goto_tb(ctx, b, n)) {
>          tcg_gen_goto_tb(which);
> -        copy_iaoq_entry(ctx, cpu_iaoq_f, b, NULL);
> -        copy_iaoq_entry(ctx, cpu_iaoq_b, n, NULL);
> +        install_iaq_entries(ctx, b, NULL, n, NULL);
>          tcg_gen_exit_tb(ctx->base.tb, which);
>      } else {
> -        copy_iaoq_entry(ctx, cpu_iaoq_f, b, cpu_iaoq_b);
> -        copy_iaoq_entry(ctx, cpu_iaoq_b, n, ctx->iaoq_n_var);
> +        install_iaq_entries(ctx, b, cpu_iaoq_b, n, ctx->iaoq_n_var);
>          tcg_gen_lookup_and_goto_ptr();
>      }
>  }
> @@ -1883,9 +1897,7 @@ static bool do_ibranch(DisasContext *ctx, TCGv_i64 dest,
>          }
>          if (is_n) {
>              if (use_nullify_skip(ctx)) {
> -                copy_iaoq_entry(ctx, cpu_iaoq_f, -1, next);
> -                tcg_gen_addi_i64(next, next, 4);
> -                copy_iaoq_entry(ctx, cpu_iaoq_b, -1, next);
> +                install_iaq_entries(ctx, -1, next, -1, NULL);
>                  nullify_set(ctx, 0);
>                  ctx->base.is_jmp = DISAS_IAQ_N_UPDATED;
>                  return true;
> @@ -1900,14 +1912,10 @@ static bool do_ibranch(DisasContext *ctx, TCGv_i64 dest,
>      nullify_over(ctx);
>  
>      if (is_n && use_nullify_skip(ctx)) {
> -        copy_iaoq_entry(ctx, cpu_iaoq_f, -1, dest);
> -        next = tcg_temp_new_i64();
> -        tcg_gen_addi_i64(next, dest, 4);
> -        copy_iaoq_entry(ctx, cpu_iaoq_b, -1, next);
> +        install_iaq_entries(ctx, -1, dest, -1, NULL);
>          nullify_set(ctx, 0);
>      } else {
> -        copy_iaoq_entry(ctx, cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b);
> -        copy_iaoq_entry(ctx, cpu_iaoq_b, -1, dest);
> +        install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, dest);
>          nullify_set(ctx, is_n);
>      }
>      if (link != 0) {
> @@ -1998,9 +2006,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);
> -        copy_iaoq_entry(ctx, cpu_iaoq_f, -1, tmp);
> -        tcg_gen_addi_i64(tmp, tmp, 4);
> -        copy_iaoq_entry(ctx, cpu_iaoq_b, -1, tmp);
> +        install_iaq_entries(ctx, -1, tmp, -1, NULL);
>          ctx->base.is_jmp = DISAS_IAQ_N_UPDATED;
>          break;
>  
> @@ -2744,8 +2750,8 @@ static bool trans_or(DisasContext *ctx, arg_rrr_cf_d *a)
>              nullify_over(ctx);
>  
>              /* Advance the instruction queue.  */
> -            copy_iaoq_entry(ctx, cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b);
> -            copy_iaoq_entry(ctx, cpu_iaoq_b, ctx->iaoq_n, ctx->iaoq_n_var);
> +            install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b,
> +                                ctx->iaoq_n, ctx->iaoq_n_var);
>              nullify_set(ctx, 0);
>  
>              /* Tell the qemu main loop to halt until this cpu has work.  */
> @@ -3898,18 +3904,15 @@ static bool trans_be(DisasContext *ctx, arg_be *a)
>          tcg_gen_mov_i64(cpu_sr[0], cpu_iasq_b);
>      }
>      if (a->n && use_nullify_skip(ctx)) {
> -        copy_iaoq_entry(ctx, cpu_iaoq_f, -1, tmp);
> -        tcg_gen_addi_i64(tmp, tmp, 4);
> -        copy_iaoq_entry(ctx, cpu_iaoq_b, -1, tmp);
> +        install_iaq_entries(ctx, -1, tmp, -1, NULL);
>          tcg_gen_mov_i64(cpu_iasq_f, new_spc);
>          tcg_gen_mov_i64(cpu_iasq_b, cpu_iasq_f);
>          nullify_set(ctx, 0);
>      } else {
> -        copy_iaoq_entry(ctx, cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b);
> +        install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, tmp);
>          if (ctx->iaoq_b == -1) {
>              tcg_gen_mov_i64(cpu_iasq_f, cpu_iasq_b);
>          }
> -        copy_iaoq_entry(ctx, cpu_iaoq_b, -1, tmp);
>          tcg_gen_mov_i64(cpu_iasq_b, new_spc);
>          nullify_set(ctx, a->n);
>      }
> @@ -4018,11 +4021,10 @@ static bool trans_bve(DisasContext *ctx, arg_bve *a)
>      nullify_over(ctx);
>      dest = do_ibranch_priv(ctx, load_gpr(ctx, a->b));
>  
> -    copy_iaoq_entry(ctx, cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b);
> +    install_iaq_entries(ctx, ctx->iaoq_b, cpu_iaoq_b, -1, dest);
>      if (ctx->iaoq_b == -1) {
>          tcg_gen_mov_i64(cpu_iasq_f, cpu_iasq_b);
>      }
> -    copy_iaoq_entry(ctx, cpu_iaoq_b, -1, dest);
>      tcg_gen_mov_i64(cpu_iasq_b, space_select(ctx, 0, dest));
>      if (a->l) {
>          copy_iaoq_entry(ctx, cpu_gr[a->l], ctx->iaoq_n, ctx->iaoq_n_var);
> @@ -4721,8 +4723,8 @@ static void hppa_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
>      case DISAS_IAQ_N_STALE:
>      case DISAS_IAQ_N_STALE_EXIT:
>          if (ctx->iaoq_f == -1) {
> -            copy_iaoq_entry(ctx, cpu_iaoq_f, -1, cpu_iaoq_b);
> -            copy_iaoq_entry(ctx, cpu_iaoq_b, ctx->iaoq_n, ctx->iaoq_n_var);
> +            install_iaq_entries(ctx, -1, cpu_iaoq_b,
> +                                ctx->iaoq_n, ctx->iaoq_n_var);
>  #ifndef CONFIG_USER_ONLY
>              tcg_gen_mov_i64(cpu_iasq_f, cpu_iasq_b);
>  #endif
> @@ -4751,8 +4753,8 @@ static void hppa_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs)
>      case DISAS_TOO_MANY:
>      case DISAS_IAQ_N_STALE:
>      case DISAS_IAQ_N_STALE_EXIT:
> -        copy_iaoq_entry(ctx, cpu_iaoq_f, ctx->iaoq_f, cpu_iaoq_f);
> -        copy_iaoq_entry(ctx, cpu_iaoq_b, ctx->iaoq_b, cpu_iaoq_b);
> +        install_iaq_entries(ctx, ctx->iaoq_f, cpu_iaoq_f,
> +                            ctx->iaoq_b, cpu_iaoq_b);
>          nullify_save(ctx);
>          /* FALLTHRU */
>      case DISAS_IAQ_N_UPDATED:
> -- 
> 2.34.1
>