Commit 4790577aed for qemu.org
commit 4790577aed60f39f810de538c827b55e894fc226
Author: Richard Henderson <richard.henderson@linaro.org>
Date: Fri Jul 31 11:56:19 2026 -0700
target/s390x/tcg: Convert op_ld32u to op_ld
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20260731185628.23161-7-richard.henderson@linaro.org>
diff --git a/target/s390x/tcg/insn-data.h.inc b/target/s390x/tcg/insn-data.h.inc
index 69d5114f24..5853804f2d 100644
--- a/target/s390x/tcg/insn-data.h.inc
+++ b/target/s390x/tcg/insn-data.h.inc
@@ -510,16 +510,16 @@
D(0xc405, LHRL, RIL_b, GIE, 0, ri2, new, r1_32, ld, 0, MO_BESW)
D(0xc404, LGHRL, RIL_b, GIE, 0, ri2, r1, 0, ld, 0, MO_BESW)
/* LOAD HIGH */
- D(0xe3ca, LFH, RXY_a, HW, 0, a2, new, r1_32h, ld32u, 0, 0)
+ D(0xe3ca, LFH, RXY_a, HW, 0, a2, new, r1_32h, ld, 0, MO_BEUL)
/* LOAG HIGH AND TRAP */
C(0xe3c8, LFHAT, RXY_a, LAT, 0, m2_32u, r1, 0, lfhat, 0)
/* LOAD LOGICAL */
C(0xb916, LLGFR, RRE, Z, 0, r2_32u, 0, r1, mov2, 0)
- D(0xe316, LLGF, RXY_a, Z, 0, a2, r1, 0, ld32u, 0, 0)
+ D(0xe316, LLGF, RXY_a, Z, 0, a2, r1, 0, ld, 0, MO_BEUL)
/* LOAD LOGICAL AND TRAP */
C(0xe39d, LLGFAT, RXY_a, LAT, 0, a2, r1, 0, llgfat, 0)
/* LOAD LOGICAL RELATIVE LONG */
- D(0xc40e, LLGFRL, RIL_b, GIE, 0, ri2, r1, 0, ld32u, 0, MO_ALIGN)
+ D(0xc40e, LLGFRL, RIL_b, GIE, 0, ri2, r1, 0, ld, 0, MO_BEUL | MO_ALIGN)
/* LOAD LOGICAL CHARACTER */
C(0xb994, LLCR, RRE, EI, 0, r2_8u, 0, r1_32, mov2, 0)
C(0xb984, LLGCR, RRE, EI, 0, r2_8u, 0, r1, mov2, 0)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 42b208a3ca..607dc3a3af 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -2755,13 +2755,6 @@ static DisasJumpType op_ld(DisasContext *s, DisasOps *o)
return DISAS_NEXT;
}
-static DisasJumpType op_ld32u(DisasContext *s, DisasOps *o)
-{
- tcg_gen_qemu_ld_i64(o->out, o->in2, get_mem_index(s),
- MO_BEUL | s->insn->data);
- return DISAS_NEXT;
-}
-
static DisasJumpType op_ld64(DisasContext *s, DisasOps *o)
{
tcg_gen_qemu_ld_i64(o->out, o->in2, get_mem_index(s),