On Wed, Mar 18, 2026 at 8:33 PM Philippe Mathieu-Daudé
<philmd@linaro.org> wrote:
>
> Following commit 73ae67fd4e6, extract the implicit MO_TE
> definition in order to replace it.
>
> Mechanical change using:
>
> $ for n in UW UL UQ UO SW SL SQ; do \
> sed -i -e "s/MO_TE$n/MO_TE | MO_$n/" \
> $(git grep -l MO_TE$n target/riscv); \
> done
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> target/riscv/insn_trans/trans_rvzalasr.c.inc | 12 ++++++------
> target/riscv/insn_trans/trans_xmips.c.inc | 16 ++++++++--------
> target/riscv/insn_trans/trans_zilsd.c.inc | 4 ++--
> 3 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/target/riscv/insn_trans/trans_rvzalasr.c.inc b/target/riscv/insn_trans/trans_rvzalasr.c.inc
> index bf86805cef6..525f01ca347 100644
> --- a/target/riscv/insn_trans/trans_rvzalasr.c.inc
> +++ b/target/riscv/insn_trans/trans_rvzalasr.c.inc
> @@ -49,20 +49,20 @@ static bool trans_lb_aqrl(DisasContext *ctx, arg_lb_aqrl *a)
> static bool trans_lh_aqrl(DisasContext *ctx, arg_lh_aqrl *a)
> {
> REQUIRE_ZALASR(ctx);
> - return gen_load_acquire(ctx, a, (MO_ALIGN | MO_TESW));
> + return gen_load_acquire(ctx, a, (MO_ALIGN | MO_TE | MO_SW));
> }
>
> static bool trans_lw_aqrl(DisasContext *ctx, arg_lw_aqrl *a)
> {
> REQUIRE_ZALASR(ctx);
> - return gen_load_acquire(ctx, a, (MO_ALIGN | MO_TESL));
> + return gen_load_acquire(ctx, a, (MO_ALIGN | MO_TE | MO_SL));
> }
>
> static bool trans_ld_aqrl(DisasContext *ctx, arg_ld_aqrl *a)
> {
> REQUIRE_64BIT(ctx);
> REQUIRE_ZALASR(ctx);
> - return gen_load_acquire(ctx, a, (MO_ALIGN | MO_TEUQ));
> + return gen_load_acquire(ctx, a, (MO_ALIGN | MO_TE | MO_UQ));
> }
>
> static bool gen_store_release(DisasContext *ctx, arg_sb_aqrl *a, MemOp memop)
> @@ -96,18 +96,18 @@ static bool trans_sb_aqrl(DisasContext *ctx, arg_sb_aqrl *a)
> static bool trans_sh_aqrl(DisasContext *ctx, arg_sh_aqrl *a)
> {
> REQUIRE_ZALASR(ctx);
> - return gen_store_release(ctx, a, (MO_ALIGN | MO_TESW));
> + return gen_store_release(ctx, a, (MO_ALIGN | MO_TE | MO_SW));
> }
>
> static bool trans_sw_aqrl(DisasContext *ctx, arg_sw_aqrl *a)
> {
> REQUIRE_ZALASR(ctx);
> - return gen_store_release(ctx, a, (MO_ALIGN | MO_TESL));
> + return gen_store_release(ctx, a, (MO_ALIGN | MO_TE | MO_SL));
> }
>
> static bool trans_sd_aqrl(DisasContext *ctx, arg_sd_aqrl *a)
> {
> REQUIRE_64BIT(ctx);
> REQUIRE_ZALASR(ctx);
> - return gen_store_release(ctx, a, (MO_ALIGN | MO_TEUQ));
> + return gen_store_release(ctx, a, (MO_ALIGN | MO_TE | MO_UQ));
> }
> diff --git a/target/riscv/insn_trans/trans_xmips.c.inc b/target/riscv/insn_trans/trans_xmips.c.inc
> index 9a72f3392f1..37572563ae9 100644
> --- a/target/riscv/insn_trans/trans_xmips.c.inc
> +++ b/target/riscv/insn_trans/trans_xmips.c.inc
> @@ -56,11 +56,11 @@ static bool trans_ldp(DisasContext *ctx, arg_ldp *a)
> TCGv addr = tcg_temp_new();
>
> tcg_gen_addi_tl(addr, src, a->imm_y);
> - tcg_gen_qemu_ld_tl(dest0, addr, ctx->mem_idx, MO_TESQ);
> + tcg_gen_qemu_ld_tl(dest0, addr, ctx->mem_idx, MO_TE | MO_SQ);
> gen_set_gpr(ctx, a->rd, dest0);
>
> tcg_gen_addi_tl(addr, addr, 8);
> - tcg_gen_qemu_ld_tl(dest1, addr, ctx->mem_idx, MO_TESQ);
> + tcg_gen_qemu_ld_tl(dest1, addr, ctx->mem_idx, MO_TE | MO_SQ);
> gen_set_gpr(ctx, a->rs3, dest1);
>
> return true;
> @@ -77,11 +77,11 @@ static bool trans_lwp(DisasContext *ctx, arg_lwp *a)
> TCGv addr = tcg_temp_new();
>
> tcg_gen_addi_tl(addr, src, a->imm_x);
> - tcg_gen_qemu_ld_tl(dest0, addr, ctx->mem_idx, MO_TESL);
> + tcg_gen_qemu_ld_tl(dest0, addr, ctx->mem_idx, MO_TE | MO_SL);
> gen_set_gpr(ctx, a->rd, dest0);
>
> tcg_gen_addi_tl(addr, addr, 4);
> - tcg_gen_qemu_ld_tl(dest1, addr, ctx->mem_idx, MO_TESL);
> + tcg_gen_qemu_ld_tl(dest1, addr, ctx->mem_idx, MO_TE | MO_SL);
> gen_set_gpr(ctx, a->rs3, dest1);
>
> return true;
> @@ -99,10 +99,10 @@ static bool trans_sdp(DisasContext *ctx, arg_sdp *a)
> TCGv addr = tcg_temp_new();
>
> tcg_gen_addi_tl(addr, src, a->imm_w);
> - tcg_gen_qemu_st_tl(data0, addr, ctx->mem_idx, MO_TEUQ);
> + tcg_gen_qemu_st_tl(data0, addr, ctx->mem_idx, MO_TE | MO_UQ);
>
> tcg_gen_addi_tl(addr, addr, 8);
> - tcg_gen_qemu_st_tl(data1, addr, ctx->mem_idx, MO_TEUQ);
> + tcg_gen_qemu_st_tl(data1, addr, ctx->mem_idx, MO_TE | MO_UQ);
>
> return true;
> }
> @@ -118,10 +118,10 @@ static bool trans_swp(DisasContext *ctx, arg_swp *a)
> TCGv addr = tcg_temp_new();
>
> tcg_gen_addi_tl(addr, src, a->imm_v);
> - tcg_gen_qemu_st_tl(data0, addr, ctx->mem_idx, MO_TESL);
> + tcg_gen_qemu_st_tl(data0, addr, ctx->mem_idx, MO_TE | MO_SL);
>
> tcg_gen_addi_tl(addr, addr, 4);
> - tcg_gen_qemu_st_tl(data1, addr, ctx->mem_idx, MO_TESL);
> + tcg_gen_qemu_st_tl(data1, addr, ctx->mem_idx, MO_TE | MO_SL);
>
> return true;
> }
> diff --git a/target/riscv/insn_trans/trans_zilsd.c.inc b/target/riscv/insn_trans/trans_zilsd.c.inc
> index 369c33004b6..445406cf015 100644
> --- a/target/riscv/insn_trans/trans_zilsd.c.inc
> +++ b/target/riscv/insn_trans/trans_zilsd.c.inc
> @@ -30,7 +30,7 @@ static bool gen_load_i64(DisasContext *ctx, arg_ld *a)
> TCGv addr = get_address(ctx, a->rs1, a->imm);
> TCGv_i64 tmp = tcg_temp_new_i64();
>
> - tcg_gen_qemu_ld_i64(tmp, addr, ctx->mem_idx, MO_TESQ);
> + tcg_gen_qemu_ld_i64(tmp, addr, ctx->mem_idx, MO_TE | MO_SQ);
>
> if (a->rd == 0) {
> return true;
> @@ -85,7 +85,7 @@ static bool gen_store_i64(DisasContext *ctx, arg_sd *a)
> } else {
> tcg_gen_concat_tl_i64(tmp, data_low, data_high);
> }
> - tcg_gen_qemu_st_i64(tmp, addr, ctx->mem_idx, MO_TESQ);
> + tcg_gen_qemu_st_i64(tmp, addr, ctx->mem_idx, MO_TE | MO_SQ);
>
> return true;
> }
> --
> 2.53.0
>
>