On Sat, Oct 11, 2025 at 1:53 AM Philippe Mathieu-Daudé <[email protected]> wrote: > > All callers of gen_amo() set the MO_TE flag. Set it once in > the callee. > > Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Alistair Francis <[email protected]> Alistair > --- > target/riscv/translate.c | 1 + > target/riscv/insn_trans/trans_rva.c.inc | 36 ++++++++++----------- > target/riscv/insn_trans/trans_rvzabha.c.inc | 18 +++++------ > 3 files changed, 28 insertions(+), 27 deletions(-) > > diff --git a/target/riscv/translate.c b/target/riscv/translate.c > index 9a53aecbfe9..94af9853cfe 100644 > --- a/target/riscv/translate.c > +++ b/target/riscv/translate.c > @@ -1135,6 +1135,7 @@ static bool gen_amo(DisasContext *ctx, arg_atomic *a, > TCGv src1, src2 = get_gpr(ctx, a->rs2, EXT_NONE); > MemOp size = mop & MO_SIZE; > > + mop |= MO_TE; > if (ctx->cfg_ptr->ext_zama16b && size >= MO_32) { > mop |= MO_ATOM_WITHIN16; > } else { > diff --git a/target/riscv/insn_trans/trans_rva.c.inc > b/target/riscv/insn_trans/trans_rva.c.inc > index 10e4c55efda..e0fbfafdde4 100644 > --- a/target/riscv/insn_trans/trans_rva.c.inc > +++ b/target/riscv/insn_trans/trans_rva.c.inc > @@ -111,55 +111,55 @@ static bool trans_sc_w(DisasContext *ctx, arg_sc_w *a) > static bool trans_amoswap_w(DisasContext *ctx, arg_amoswap_w *a) > { > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_xchg_tl, MO_TE | MO_SL); > + return gen_amo(ctx, a, &tcg_gen_atomic_xchg_tl, MO_SL); > } > > static bool trans_amoadd_w(DisasContext *ctx, arg_amoadd_w *a) > { > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_add_tl, MO_TE | MO_SL); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_add_tl, MO_SL); > } > > static bool trans_amoxor_w(DisasContext *ctx, arg_amoxor_w *a) > { > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_xor_tl, MO_TE | MO_SL); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_xor_tl, MO_SL); > } > > static bool trans_amoand_w(DisasContext *ctx, arg_amoand_w *a) > { > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_and_tl, MO_TE | MO_SL); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_and_tl, MO_SL); > } > > static bool trans_amoor_w(DisasContext *ctx, arg_amoor_w *a) > { > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_or_tl, MO_TE | MO_SL); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_or_tl, MO_SL); > } > > static bool trans_amomin_w(DisasContext *ctx, arg_amomin_w *a) > { > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smin_tl, MO_TE | MO_SL); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smin_tl, MO_SL); > } > > static bool trans_amomax_w(DisasContext *ctx, arg_amomax_w *a) > { > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smax_tl, MO_TE | MO_SL); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smax_tl, MO_SL); > } > > static bool trans_amominu_w(DisasContext *ctx, arg_amominu_w *a) > { > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umin_tl, MO_TE | MO_SL); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umin_tl, MO_SL); > } > > static bool trans_amomaxu_w(DisasContext *ctx, arg_amomaxu_w *a) > { > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umax_tl, MO_TE | MO_SL); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umax_tl, MO_SL); > } > > static bool trans_lr_d(DisasContext *ctx, arg_lr_d *a) > @@ -180,61 +180,61 @@ static bool trans_amoswap_d(DisasContext *ctx, > arg_amoswap_d *a) > { > REQUIRE_64BIT(ctx); > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_xchg_tl, MO_TE | MO_UQ); > + return gen_amo(ctx, a, &tcg_gen_atomic_xchg_tl, MO_UQ); > } > > static bool trans_amoadd_d(DisasContext *ctx, arg_amoadd_d *a) > { > REQUIRE_64BIT(ctx); > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_add_tl, MO_TE | MO_UQ); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_add_tl, MO_UQ); > } > > static bool trans_amoxor_d(DisasContext *ctx, arg_amoxor_d *a) > { > REQUIRE_64BIT(ctx); > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_xor_tl, MO_TE | MO_UQ); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_xor_tl, MO_UQ); > } > > static bool trans_amoand_d(DisasContext *ctx, arg_amoand_d *a) > { > REQUIRE_64BIT(ctx); > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_and_tl, MO_TE | MO_UQ); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_and_tl, MO_UQ); > } > > static bool trans_amoor_d(DisasContext *ctx, arg_amoor_d *a) > { > REQUIRE_64BIT(ctx); > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_or_tl, MO_TE | MO_UQ); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_or_tl, MO_UQ); > } > > static bool trans_amomin_d(DisasContext *ctx, arg_amomin_d *a) > { > REQUIRE_64BIT(ctx); > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smin_tl, MO_TE | MO_UQ); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smin_tl, MO_UQ); > } > > static bool trans_amomax_d(DisasContext *ctx, arg_amomax_d *a) > { > REQUIRE_64BIT(ctx); > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smax_tl, MO_TE | MO_UQ); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smax_tl, MO_UQ); > } > > static bool trans_amominu_d(DisasContext *ctx, arg_amominu_d *a) > { > REQUIRE_64BIT(ctx); > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umin_tl, MO_TE | MO_UQ); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umin_tl, MO_UQ); > } > > static bool trans_amomaxu_d(DisasContext *ctx, arg_amomaxu_d *a) > { > REQUIRE_64BIT(ctx); > REQUIRE_A_OR_ZAAMO(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umax_tl, MO_TE | MO_UQ); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umax_tl, MO_UQ); > } > diff --git a/target/riscv/insn_trans/trans_rvzabha.c.inc > b/target/riscv/insn_trans/trans_rvzabha.c.inc > index 25db42d24cd..c1f99b65f09 100644 > --- a/target/riscv/insn_trans/trans_rvzabha.c.inc > +++ b/target/riscv/insn_trans/trans_rvzabha.c.inc > @@ -79,55 +79,55 @@ static bool trans_amomaxu_b(DisasContext *ctx, > arg_amomaxu_b *a) > static bool trans_amoswap_h(DisasContext *ctx, arg_amoswap_h *a) > { > REQUIRE_ZABHA(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_xchg_tl, MO_TE | MO_SW); > + return gen_amo(ctx, a, &tcg_gen_atomic_xchg_tl, MO_SW); > } > > static bool trans_amoadd_h(DisasContext *ctx, arg_amoadd_h *a) > { > REQUIRE_ZABHA(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_add_tl, MO_TE | MO_SW); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_add_tl, MO_SW); > } > > static bool trans_amoxor_h(DisasContext *ctx, arg_amoxor_h *a) > { > REQUIRE_ZABHA(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_xor_tl, MO_TE | MO_SW); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_xor_tl, MO_SW); > } > > static bool trans_amoand_h(DisasContext *ctx, arg_amoand_h *a) > { > REQUIRE_ZABHA(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_and_tl, MO_TE | MO_SW); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_and_tl, MO_SW); > } > > static bool trans_amoor_h(DisasContext *ctx, arg_amoor_h *a) > { > REQUIRE_ZABHA(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_or_tl, MO_TE | MO_SW); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_or_tl, MO_SW); > } > > static bool trans_amomin_h(DisasContext *ctx, arg_amomin_h *a) > { > REQUIRE_ZABHA(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smin_tl, MO_TE | MO_SW); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smin_tl, MO_SW); > } > > static bool trans_amomax_h(DisasContext *ctx, arg_amomax_h *a) > { > REQUIRE_ZABHA(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smax_tl, MO_TE | MO_SW); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_smax_tl, MO_SW); > } > > static bool trans_amominu_h(DisasContext *ctx, arg_amominu_h *a) > { > REQUIRE_ZABHA(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umin_tl, MO_TE | MO_SW); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umin_tl, MO_SW); > } > > static bool trans_amomaxu_h(DisasContext *ctx, arg_amomaxu_h *a) > { > REQUIRE_ZABHA(ctx); > - return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umax_tl, MO_TE | MO_SW); > + return gen_amo(ctx, a, &tcg_gen_atomic_fetch_umax_tl, MO_SW); > } > > static bool trans_amocas_b(DisasContext *ctx, arg_amocas_b *a) > -- > 2.51.0 > >
