qemu-riscv
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v7 12/18] target/riscv: support for 128-bit shift instruction


From: Alistair Francis
Subject: Re: [PATCH v7 12/18] target/riscv: support for 128-bit shift instructions
Date: Tue, 21 Dec 2021 16:55:13 +1000

On Tue, Dec 14, 2021 at 2:52 AM Frédéric Pétrot
<frederic.petrot@univ-grenoble-alpes.fr> wrote:
>
> Handling shifts for 32, 64 and 128 operation length for RV128, following the
> general framework for handling various olens proposed by Richard.
>
> Signed-off-by: Frédéric Pétrot <frederic.petrot@univ-grenoble-alpes.fr>
> Co-authored-by: Fabien Portas <fabien.portas@grenoble-inp.org>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  target/riscv/insn32.decode              |  10 ++
>  target/riscv/translate.c                |  58 ++++--
>  target/riscv/insn_trans/trans_rvb.c.inc |  22 +--
>  target/riscv/insn_trans/trans_rvi.c.inc | 224 ++++++++++++++++++++++--
>  4 files changed, 270 insertions(+), 44 deletions(-)
>
> diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode
> index 02889c6082..e338a803a0 100644
> --- a/target/riscv/insn32.decode
> +++ b/target/riscv/insn32.decode
> @@ -22,6 +22,7 @@
>  %rs1       15:5
>  %rd        7:5
>  %sh5       20:5
> +%sh6       20:6
>
>  %sh7    20:7
>  %csr    20:12
> @@ -92,6 +93,9 @@
>  # Formats 64:
>  @sh5     .......  ..... .....  ... ..... ....... &shift  shamt=%sh5      
> %rs1 %rd
>
> +# Formats 128:
> +@sh6       ...... ...... ..... ... ..... ....... &shift shamt=%sh6 %rs1 %rd
> +
>  # *** Privileged Instructions ***
>  ecall       000000000000     00000 000 00000 1110011
>  ebreak      000000000001     00000 000 00000 1110011
> @@ -167,6 +171,12 @@ sraw     0100000 .....  ..... 101 ..... 0111011 @r
>  ldu      ............   ..... 111 ..... 0000011 @i
>  lq       ............   ..... 010 ..... 0001111 @i
>  sq       ............   ..... 100 ..... 0100011 @s
> +sllid    000000 ......  ..... 001 ..... 1011011 @sh6
> +srlid    000000 ......  ..... 101 ..... 1011011 @sh6
> +sraid    010000 ......  ..... 101 ..... 1011011 @sh6
> +slld     0000000 ..... .....  001 ..... 1111011 @r
> +srld     0000000 ..... .....  101 ..... 1111011 @r
> +srad     0100000 ..... .....  101 ..... 1111011 @r
>
>  # *** RV32M Standard Extension ***
>  mul      0000001 .....  ..... 000 ..... 0110011 @r
> diff --git a/target/riscv/translate.c b/target/riscv/translate.c
> index 0b87312dda..15e628308d 100644
> --- a/target/riscv/translate.c
> +++ b/target/riscv/translate.c
> @@ -560,7 +560,8 @@ static bool gen_arith_per_ol(DisasContext *ctx, arg_r *a, 
> DisasExtend ext,
>  }
>
>  static bool gen_shift_imm_fn(DisasContext *ctx, arg_shift *a, DisasExtend 
> ext,
> -                             void (*func)(TCGv, TCGv, target_long))
> +                             void (*func)(TCGv, TCGv, target_long),
> +                             void (*f128)(TCGv, TCGv, TCGv, TCGv, 
> target_long))
>  {
>      TCGv dest, src1;
>      int max_len = get_olen(ctx);
> @@ -572,26 +573,38 @@ static bool gen_shift_imm_fn(DisasContext *ctx, 
> arg_shift *a, DisasExtend ext,
>      dest = dest_gpr(ctx, a->rd);
>      src1 = get_gpr(ctx, a->rs1, ext);
>
> -    func(dest, src1, a->shamt);
> +    if (max_len < 128) {
> +        func(dest, src1, a->shamt);
> +        gen_set_gpr(ctx, a->rd, dest);
> +    } else {
> +        TCGv src1h = get_gprh(ctx, a->rs1);
> +        TCGv desth = dest_gprh(ctx, a->rd);
>
> -    gen_set_gpr(ctx, a->rd, dest);
> +        if (f128 == NULL) {
> +            return false;
> +        }
> +        f128(dest, desth, src1, src1h, a->shamt);
> +        gen_set_gpr128(ctx, a->rd, dest, desth);
> +    }
>      return true;
>  }
>
>  static bool gen_shift_imm_fn_per_ol(DisasContext *ctx, arg_shift *a,
>                                      DisasExtend ext,
>                                      void (*f_tl)(TCGv, TCGv, target_long),
> -                                    void (*f_32)(TCGv, TCGv, target_long))
> +                                    void (*f_32)(TCGv, TCGv, target_long),
> +                                    void (*f_128)(TCGv, TCGv, TCGv, TCGv,
> +                                                  target_long))
>  {
>      int olen = get_olen(ctx);
>      if (olen != TARGET_LONG_BITS) {
>          if (olen == 32) {
>              f_tl = f_32;
> -        } else {
> +        } else if (olen != 128) {
>              g_assert_not_reached();
>          }
>      }
> -    return gen_shift_imm_fn(ctx, a, ext, f_tl);
> +    return gen_shift_imm_fn(ctx, a, ext, f_tl, f_128);
>  }
>
>  static bool gen_shift_imm_tl(DisasContext *ctx, arg_shift *a, DisasExtend 
> ext,
> @@ -615,34 +628,49 @@ static bool gen_shift_imm_tl(DisasContext *ctx, 
> arg_shift *a, DisasExtend ext,
>  }
>
>  static bool gen_shift(DisasContext *ctx, arg_r *a, DisasExtend ext,
> -                      void (*func)(TCGv, TCGv, TCGv))
> +                      void (*func)(TCGv, TCGv, TCGv),
> +                      void (*f128)(TCGv, TCGv, TCGv, TCGv, TCGv))
>  {
> -    TCGv dest = dest_gpr(ctx, a->rd);
> -    TCGv src1 = get_gpr(ctx, a->rs1, ext);
>      TCGv src2 = get_gpr(ctx, a->rs2, EXT_NONE);
>      TCGv ext2 = tcg_temp_new();
> +    int max_len = get_olen(ctx);
>
> -    tcg_gen_andi_tl(ext2, src2, get_olen(ctx) - 1);
> -    func(dest, src1, ext2);
> +    tcg_gen_andi_tl(ext2, src2, max_len - 1);
>
> -    gen_set_gpr(ctx, a->rd, dest);
> +    TCGv dest = dest_gpr(ctx, a->rd);
> +    TCGv src1 = get_gpr(ctx, a->rs1, ext);
> +
> +    if (max_len < 128) {
> +        func(dest, src1, ext2);
> +        gen_set_gpr(ctx, a->rd, dest);
> +    } else {
> +        TCGv src1h = get_gprh(ctx, a->rs1);
> +        TCGv desth = dest_gprh(ctx, a->rd);
> +
> +        if (f128 == NULL) {
> +            return false;
> +        }
> +        f128(dest, desth, src1, src1h, ext2);
> +        gen_set_gpr128(ctx, a->rd, dest, desth);
> +    }
>      tcg_temp_free(ext2);
>      return true;
>  }
>
>  static bool gen_shift_per_ol(DisasContext *ctx, arg_r *a, DisasExtend ext,
>                               void (*f_tl)(TCGv, TCGv, TCGv),
> -                             void (*f_32)(TCGv, TCGv, TCGv))
> +                             void (*f_32)(TCGv, TCGv, TCGv),
> +                             void (*f_128)(TCGv, TCGv, TCGv, TCGv, TCGv))
>  {
>      int olen = get_olen(ctx);
>      if (olen != TARGET_LONG_BITS) {
>          if (olen == 32) {
>              f_tl = f_32;
> -        } else {
> +        } else if (olen != 128) {
>              g_assert_not_reached();
>          }
>      }
> -    return gen_shift(ctx, a, ext, f_tl);
> +    return gen_shift(ctx, a, ext, f_tl, f_128);
>  }
>
>  static bool gen_unary(DisasContext *ctx, arg_r2 *a, DisasExtend ext,
> diff --git a/target/riscv/insn_trans/trans_rvb.c.inc 
> b/target/riscv/insn_trans/trans_rvb.c.inc
> index de2cd613b1..ad6548320f 100644
> --- a/target/riscv/insn_trans/trans_rvb.c.inc
> +++ b/target/riscv/insn_trans/trans_rvb.c.inc
> @@ -156,7 +156,7 @@ static void gen_bset(TCGv ret, TCGv arg1, TCGv shamt)
>  static bool trans_bset(DisasContext *ctx, arg_bset *a)
>  {
>      REQUIRE_ZBS(ctx);
> -    return gen_shift(ctx, a, EXT_NONE, gen_bset);
> +    return gen_shift(ctx, a, EXT_NONE, gen_bset, NULL);
>  }
>
>  static bool trans_bseti(DisasContext *ctx, arg_bseti *a)
> @@ -178,7 +178,7 @@ static void gen_bclr(TCGv ret, TCGv arg1, TCGv shamt)
>  static bool trans_bclr(DisasContext *ctx, arg_bclr *a)
>  {
>      REQUIRE_ZBS(ctx);
> -    return gen_shift(ctx, a, EXT_NONE, gen_bclr);
> +    return gen_shift(ctx, a, EXT_NONE, gen_bclr, NULL);
>  }
>
>  static bool trans_bclri(DisasContext *ctx, arg_bclri *a)
> @@ -200,7 +200,7 @@ static void gen_binv(TCGv ret, TCGv arg1, TCGv shamt)
>  static bool trans_binv(DisasContext *ctx, arg_binv *a)
>  {
>      REQUIRE_ZBS(ctx);
> -    return gen_shift(ctx, a, EXT_NONE, gen_binv);
> +    return gen_shift(ctx, a, EXT_NONE, gen_binv, NULL);
>  }
>
>  static bool trans_binvi(DisasContext *ctx, arg_binvi *a)
> @@ -218,7 +218,7 @@ static void gen_bext(TCGv ret, TCGv arg1, TCGv shamt)
>  static bool trans_bext(DisasContext *ctx, arg_bext *a)
>  {
>      REQUIRE_ZBS(ctx);
> -    return gen_shift(ctx, a, EXT_NONE, gen_bext);
> +    return gen_shift(ctx, a, EXT_NONE, gen_bext, NULL);
>  }
>
>  static bool trans_bexti(DisasContext *ctx, arg_bexti *a)
> @@ -248,7 +248,7 @@ static void gen_rorw(TCGv ret, TCGv arg1, TCGv arg2)
>  static bool trans_ror(DisasContext *ctx, arg_ror *a)
>  {
>      REQUIRE_ZBB(ctx);
> -    return gen_shift_per_ol(ctx, a, EXT_NONE, tcg_gen_rotr_tl, gen_rorw);
> +    return gen_shift_per_ol(ctx, a, EXT_NONE, tcg_gen_rotr_tl, gen_rorw, 
> NULL);
>  }
>
>  static void gen_roriw(TCGv ret, TCGv arg1, target_long shamt)
> @@ -266,7 +266,7 @@ static bool trans_rori(DisasContext *ctx, arg_rori *a)
>  {
>      REQUIRE_ZBB(ctx);
>      return gen_shift_imm_fn_per_ol(ctx, a, EXT_NONE,
> -                                   tcg_gen_rotri_tl, gen_roriw);
> +                                   tcg_gen_rotri_tl, gen_roriw, NULL);
>  }
>
>  static void gen_rolw(TCGv ret, TCGv arg1, TCGv arg2)
> @@ -290,7 +290,7 @@ static void gen_rolw(TCGv ret, TCGv arg1, TCGv arg2)
>  static bool trans_rol(DisasContext *ctx, arg_rol *a)
>  {
>      REQUIRE_ZBB(ctx);
> -    return gen_shift_per_ol(ctx, a, EXT_NONE, tcg_gen_rotl_tl, gen_rolw);
> +    return gen_shift_per_ol(ctx, a, EXT_NONE, tcg_gen_rotl_tl, gen_rolw, 
> NULL);
>  }
>
>  static void gen_rev8_32(TCGv ret, TCGv src1)
> @@ -405,7 +405,7 @@ static bool trans_rorw(DisasContext *ctx, arg_rorw *a)
>      REQUIRE_64BIT(ctx);
>      REQUIRE_ZBB(ctx);
>      ctx->ol = MXL_RV32;
> -    return gen_shift(ctx, a, EXT_NONE, gen_rorw);
> +    return gen_shift(ctx, a, EXT_NONE, gen_rorw, NULL);
>  }
>
>  static bool trans_roriw(DisasContext *ctx, arg_roriw *a)
> @@ -413,7 +413,7 @@ static bool trans_roriw(DisasContext *ctx, arg_roriw *a)
>      REQUIRE_64BIT(ctx);
>      REQUIRE_ZBB(ctx);
>      ctx->ol = MXL_RV32;
> -    return gen_shift_imm_fn(ctx, a, EXT_NONE, gen_roriw);
> +    return gen_shift_imm_fn(ctx, a, EXT_NONE, gen_roriw, NULL);
>  }
>
>  static bool trans_rolw(DisasContext *ctx, arg_rolw *a)
> @@ -421,7 +421,7 @@ static bool trans_rolw(DisasContext *ctx, arg_rolw *a)
>      REQUIRE_64BIT(ctx);
>      REQUIRE_ZBB(ctx);
>      ctx->ol = MXL_RV32;
> -    return gen_shift(ctx, a, EXT_NONE, gen_rolw);
> +    return gen_shift(ctx, a, EXT_NONE, gen_rolw, NULL);
>  }
>
>  #define GEN_SHADD_UW(SHAMT)                                       \
> @@ -478,7 +478,7 @@ static bool trans_slli_uw(DisasContext *ctx, arg_slli_uw 
> *a)
>  {
>      REQUIRE_64BIT(ctx);
>      REQUIRE_ZBA(ctx);
> -    return gen_shift_imm_fn(ctx, a, EXT_NONE, gen_slli_uw);
> +    return gen_shift_imm_fn(ctx, a, EXT_NONE, gen_slli_uw, NULL);
>  }
>
>  static bool trans_clmul(DisasContext *ctx, arg_clmul *a)
> diff --git a/target/riscv/insn_trans/trans_rvi.c.inc 
> b/target/riscv/insn_trans/trans_rvi.c.inc
> index 6113acc669..2e3a6c6041 100644
> --- a/target/riscv/insn_trans/trans_rvi.c.inc
> +++ b/target/riscv/insn_trans/trans_rvi.c.inc
> @@ -353,9 +353,22 @@ static bool trans_andi(DisasContext *ctx, arg_andi *a)
>      return gen_logic_imm_fn(ctx, a, tcg_gen_andi_tl);
>  }
>
> +static void gen_slli_i128(TCGv retl, TCGv reth,
> +                          TCGv src1l, TCGv src1h,
> +                          target_long shamt)
> +{
> +    if (shamt >= 64) {
> +        tcg_gen_shli_tl(reth, src1l, shamt - 64);
> +        tcg_gen_movi_tl(retl, 0);
> +    } else {
> +        tcg_gen_extract2_tl(reth, src1l, src1h, 64 - shamt);
> +        tcg_gen_shli_tl(retl, src1l, shamt);
> +    }
> +}
> +
>  static bool trans_slli(DisasContext *ctx, arg_slli *a)
>  {
> -    return gen_shift_imm_fn(ctx, a, EXT_NONE, tcg_gen_shli_tl);
> +    return gen_shift_imm_fn(ctx, a, EXT_NONE, tcg_gen_shli_tl, 
> gen_slli_i128);
>  }
>
>  static void gen_srliw(TCGv dst, TCGv src, target_long shamt)
> @@ -363,10 +376,23 @@ static void gen_srliw(TCGv dst, TCGv src, target_long 
> shamt)
>      tcg_gen_extract_tl(dst, src, shamt, 32 - shamt);
>  }
>
> +static void gen_srli_i128(TCGv retl, TCGv reth,
> +                          TCGv src1l, TCGv src1h,
> +                          target_long shamt)
> +{
> +    if (shamt >= 64) {
> +        tcg_gen_shri_tl(retl, src1h, shamt - 64);
> +        tcg_gen_movi_tl(reth, 0);
> +    } else {
> +        tcg_gen_extract2_tl(retl, src1l, src1h, shamt);
> +        tcg_gen_shri_tl(reth, src1h, shamt);
> +    }
> +}
> +
>  static bool trans_srli(DisasContext *ctx, arg_srli *a)
>  {
>      return gen_shift_imm_fn_per_ol(ctx, a, EXT_NONE,
> -                                   tcg_gen_shri_tl, gen_srliw);
> +                                   tcg_gen_shri_tl, gen_srliw, 
> gen_srli_i128);
>  }
>
>  static void gen_sraiw(TCGv dst, TCGv src, target_long shamt)
> @@ -374,10 +400,23 @@ static void gen_sraiw(TCGv dst, TCGv src, target_long 
> shamt)
>      tcg_gen_sextract_tl(dst, src, shamt, 32 - shamt);
>  }
>
> +static void gen_srai_i128(TCGv retl, TCGv reth,
> +                          TCGv src1l, TCGv src1h,
> +                          target_long shamt)
> +{
> +    if (shamt >= 64) {
> +        tcg_gen_sari_tl(retl, src1h, shamt - 64);
> +        tcg_gen_sari_tl(reth, src1h, 63);
> +    } else {
> +        tcg_gen_extract2_tl(retl, src1l, src1h, shamt);
> +        tcg_gen_sari_tl(reth, src1h, shamt);
> +    }
> +}
> +
>  static bool trans_srai(DisasContext *ctx, arg_srai *a)
>  {
>      return gen_shift_imm_fn_per_ol(ctx, a, EXT_NONE,
> -                                   tcg_gen_sari_tl, gen_sraiw);
> +                                   tcg_gen_sari_tl, gen_sraiw, 
> gen_srai_i128);
>  }
>
>  static bool trans_add(DisasContext *ctx, arg_add *a)
> @@ -390,9 +429,44 @@ static bool trans_sub(DisasContext *ctx, arg_sub *a)
>      return gen_arith(ctx, a, EXT_NONE, tcg_gen_sub_tl);
>  }
>
> +static void gen_sll_i128(TCGv destl, TCGv desth,
> +                         TCGv src1l, TCGv src1h, TCGv shamt)
> +{
> +    TCGv ls = tcg_temp_new();
> +    TCGv rs = tcg_temp_new();
> +    TCGv hs = tcg_temp_new();
> +    TCGv ll = tcg_temp_new();
> +    TCGv lr = tcg_temp_new();
> +    TCGv h0 = tcg_temp_new();
> +    TCGv h1 = tcg_temp_new();
> +    TCGv zero = tcg_constant_tl(0);
> +
> +    tcg_gen_andi_tl(hs, shamt, 64);
> +    tcg_gen_andi_tl(ls, shamt, 63);
> +    tcg_gen_neg_tl(shamt, shamt);
> +    tcg_gen_andi_tl(rs, shamt, 63);
> +
> +    tcg_gen_shl_tl(ll, src1l, ls);
> +    tcg_gen_shl_tl(h0, src1h, ls);
> +    tcg_gen_shr_tl(lr, src1l, rs);
> +    tcg_gen_movcond_tl(TCG_COND_NE, lr, shamt, zero, lr, zero);
> +    tcg_gen_or_tl(h1, h0, lr);
> +
> +    tcg_gen_movcond_tl(TCG_COND_NE, destl, hs, zero, zero, ll);
> +    tcg_gen_movcond_tl(TCG_COND_NE, desth, hs, zero, ll, h1);
> +
> +    tcg_temp_free(ls);
> +    tcg_temp_free(rs);
> +    tcg_temp_free(hs);
> +    tcg_temp_free(ll);
> +    tcg_temp_free(lr);
> +    tcg_temp_free(h0);
> +    tcg_temp_free(h1);
> +}
> +
>  static bool trans_sll(DisasContext *ctx, arg_sll *a)
>  {
> -    return gen_shift(ctx, a, EXT_NONE, tcg_gen_shl_tl);
> +    return gen_shift(ctx, a, EXT_NONE, tcg_gen_shl_tl, gen_sll_i128);
>  }
>
>  static bool trans_slt(DisasContext *ctx, arg_slt *a)
> @@ -405,14 +479,85 @@ static bool trans_sltu(DisasContext *ctx, arg_sltu *a)
>      return gen_arith(ctx, a, EXT_SIGN, gen_sltu);
>  }
>
> +static void gen_srl_i128(TCGv destl, TCGv desth,
> +                         TCGv src1l, TCGv src1h, TCGv shamt)
> +{
> +    TCGv ls = tcg_temp_new();
> +    TCGv rs = tcg_temp_new();
> +    TCGv hs = tcg_temp_new();
> +    TCGv ll = tcg_temp_new();
> +    TCGv lr = tcg_temp_new();
> +    TCGv h0 = tcg_temp_new();
> +    TCGv h1 = tcg_temp_new();
> +    TCGv zero = tcg_constant_tl(0);
> +
> +    tcg_gen_andi_tl(hs, shamt, 64);
> +    tcg_gen_andi_tl(rs, shamt, 63);
> +    tcg_gen_neg_tl(shamt, shamt);
> +    tcg_gen_andi_tl(ls, shamt, 63);
> +
> +    tcg_gen_shr_tl(lr, src1l, rs);
> +    tcg_gen_shr_tl(h1, src1h, rs);
> +    tcg_gen_shl_tl(ll, src1h, ls);
> +    tcg_gen_movcond_tl(TCG_COND_NE, ll, shamt, zero, ll, zero);
> +    tcg_gen_or_tl(h0, ll, lr);
> +
> +    tcg_gen_movcond_tl(TCG_COND_NE, destl, hs, zero, h1, h0);
> +    tcg_gen_movcond_tl(TCG_COND_NE, desth, hs, zero, zero, h1);
> +
> +    tcg_temp_free(ls);
> +    tcg_temp_free(rs);
> +    tcg_temp_free(hs);
> +    tcg_temp_free(ll);
> +    tcg_temp_free(lr);
> +    tcg_temp_free(h0);
> +    tcg_temp_free(h1);
> +}
> +
>  static bool trans_srl(DisasContext *ctx, arg_srl *a)
>  {
> -    return gen_shift(ctx, a, EXT_ZERO, tcg_gen_shr_tl);
> +    return gen_shift(ctx, a, EXT_ZERO, tcg_gen_shr_tl, gen_srl_i128);
> +}
> +
> +static void gen_sra_i128(TCGv destl, TCGv desth,
> +                         TCGv src1l, TCGv src1h, TCGv shamt)
> +{
> +    TCGv ls = tcg_temp_new();
> +    TCGv rs = tcg_temp_new();
> +    TCGv hs = tcg_temp_new();
> +    TCGv ll = tcg_temp_new();
> +    TCGv lr = tcg_temp_new();
> +    TCGv h0 = tcg_temp_new();
> +    TCGv h1 = tcg_temp_new();
> +    TCGv zero = tcg_constant_tl(0);
> +
> +    tcg_gen_andi_tl(hs, shamt, 64);
> +    tcg_gen_andi_tl(rs, shamt, 63);
> +    tcg_gen_neg_tl(shamt, shamt);
> +    tcg_gen_andi_tl(ls, shamt, 63);
> +
> +    tcg_gen_shr_tl(lr, src1l, rs);
> +    tcg_gen_sar_tl(h1, src1h, rs);
> +    tcg_gen_shl_tl(ll, src1h, ls);
> +    tcg_gen_movcond_tl(TCG_COND_NE, ll, shamt, zero, ll, zero);
> +    tcg_gen_or_tl(h0, ll, lr);
> +    tcg_gen_sari_tl(lr, src1h, 63);
> +
> +    tcg_gen_movcond_tl(TCG_COND_NE, destl, hs, zero, h1, h0);
> +    tcg_gen_movcond_tl(TCG_COND_NE, desth, hs, zero, lr, h1);
> +
> +    tcg_temp_free(ls);
> +    tcg_temp_free(rs);
> +    tcg_temp_free(hs);
> +    tcg_temp_free(ll);
> +    tcg_temp_free(lr);
> +    tcg_temp_free(h0);
> +    tcg_temp_free(h1);
>  }
>
>  static bool trans_sra(DisasContext *ctx, arg_sra *a)
>  {
> -    return gen_shift(ctx, a, EXT_SIGN, tcg_gen_sar_tl);
> +    return gen_shift(ctx, a, EXT_SIGN, tcg_gen_sar_tl, gen_sra_i128);
>  }
>
>  static bool trans_xor(DisasContext *ctx, arg_xor *a)
> @@ -439,23 +584,44 @@ static bool trans_addiw(DisasContext *ctx, arg_addiw *a)
>
>  static bool trans_slliw(DisasContext *ctx, arg_slliw *a)
>  {
> -    REQUIRE_64BIT(ctx);
> +    REQUIRE_64_OR_128BIT(ctx);
>      ctx->ol = MXL_RV32;
> -    return gen_shift_imm_fn(ctx, a, EXT_NONE, tcg_gen_shli_tl);
> +    return gen_shift_imm_fn(ctx, a, EXT_NONE, tcg_gen_shli_tl, NULL);
>  }
>
>  static bool trans_srliw(DisasContext *ctx, arg_srliw *a)
>  {
> -    REQUIRE_64BIT(ctx);
> +    REQUIRE_64_OR_128BIT(ctx);
>      ctx->ol = MXL_RV32;
> -    return gen_shift_imm_fn(ctx, a, EXT_NONE, gen_srliw);
> +    return gen_shift_imm_fn(ctx, a, EXT_NONE, gen_srliw, NULL);
>  }
>
>  static bool trans_sraiw(DisasContext *ctx, arg_sraiw *a)
>  {
> -    REQUIRE_64BIT(ctx);
> +    REQUIRE_64_OR_128BIT(ctx);
>      ctx->ol = MXL_RV32;
> -    return gen_shift_imm_fn(ctx, a, EXT_NONE, gen_sraiw);
> +    return gen_shift_imm_fn(ctx, a, EXT_NONE, gen_sraiw, NULL);
> +}
> +
> +static bool trans_sllid(DisasContext *ctx, arg_sllid *a)
> +{
> +    REQUIRE_128BIT(ctx);
> +    ctx->ol = MXL_RV64;
> +    return gen_shift_imm_fn(ctx, a, EXT_NONE, tcg_gen_shli_tl, NULL);
> +}
> +
> +static bool trans_srlid(DisasContext *ctx, arg_srlid *a)
> +{
> +    REQUIRE_128BIT(ctx);
> +    ctx->ol = MXL_RV64;
> +    return gen_shift_imm_fn(ctx, a, EXT_NONE, tcg_gen_shri_tl, NULL);
> +}
> +
> +static bool trans_sraid(DisasContext *ctx, arg_sraid *a)
> +{
> +    REQUIRE_128BIT(ctx);
> +    ctx->ol = MXL_RV64;
> +    return gen_shift_imm_fn(ctx, a, EXT_NONE, tcg_gen_sari_tl,  NULL);
>  }
>
>  static bool trans_addw(DisasContext *ctx, arg_addw *a)
> @@ -474,25 +640,47 @@ static bool trans_subw(DisasContext *ctx, arg_subw *a)
>
>  static bool trans_sllw(DisasContext *ctx, arg_sllw *a)
>  {
> -    REQUIRE_64BIT(ctx);
> +    REQUIRE_64_OR_128BIT(ctx);
>      ctx->ol = MXL_RV32;
> -    return gen_shift(ctx, a, EXT_NONE, tcg_gen_shl_tl);
> +    return gen_shift(ctx, a, EXT_NONE, tcg_gen_shl_tl, NULL);
>  }
>
>  static bool trans_srlw(DisasContext *ctx, arg_srlw *a)
>  {
> -    REQUIRE_64BIT(ctx);
> +    REQUIRE_64_OR_128BIT(ctx);
>      ctx->ol = MXL_RV32;
> -    return gen_shift(ctx, a, EXT_ZERO, tcg_gen_shr_tl);
> +    return gen_shift(ctx, a, EXT_ZERO, tcg_gen_shr_tl, NULL);
>  }
>
>  static bool trans_sraw(DisasContext *ctx, arg_sraw *a)
>  {
> -    REQUIRE_64BIT(ctx);
> +    REQUIRE_64_OR_128BIT(ctx);
>      ctx->ol = MXL_RV32;
> -    return gen_shift(ctx, a, EXT_SIGN, tcg_gen_sar_tl);
> +    return gen_shift(ctx, a, EXT_SIGN, tcg_gen_sar_tl, NULL);
>  }
>
> +static bool trans_slld(DisasContext *ctx, arg_slld *a)
> +{
> +    REQUIRE_128BIT(ctx);
> +    ctx->ol = MXL_RV64;
> +    return gen_shift(ctx, a, EXT_NONE, tcg_gen_shl_tl, NULL);
> +}
> +
> +static bool trans_srld(DisasContext *ctx, arg_srld *a)
> +{
> +    REQUIRE_128BIT(ctx);
> +    ctx->ol = MXL_RV64;
> +    return gen_shift(ctx, a, EXT_ZERO, tcg_gen_shr_tl, NULL);
> +}
> +
> +static bool trans_srad(DisasContext *ctx, arg_srad *a)
> +{
> +    REQUIRE_128BIT(ctx);
> +    ctx->ol = MXL_RV64;
> +    return gen_shift(ctx, a, EXT_SIGN, tcg_gen_sar_tl, NULL);
> +}
> +
> +
>  static bool trans_fence(DisasContext *ctx, arg_fence *a)
>  {
>      /* FENCE is a full memory barrier. */
> --
> 2.34.1
>
>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]