Commit ae394436a9 for qemu.org
commit ae394436a9d308b7ba916b10c16cf8ba4c38678d
Author: Richard Henderson <richard.henderson@linaro.org>
Date: Fri Jul 31 11:56:17 2026 -0700
target/s390x/tcg: Convert op_ld16u to op_ld
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20260731185628.23161-5-richard.henderson@linaro.org>
diff --git a/target/s390x/tcg/insn-data.h.inc b/target/s390x/tcg/insn-data.h.inc
index 68ce6c2b19..23b00a0eeb 100644
--- a/target/s390x/tcg/insn-data.h.inc
+++ b/target/s390x/tcg/insn-data.h.inc
@@ -530,13 +530,13 @@
/* LOAD LOGICAL HALFWORD */
C(0xb995, LLHR, RRE, EI, 0, r2_16u, 0, r1_32, mov2, 0)
C(0xb985, LLGHR, RRE, EI, 0, r2_16u, 0, r1, mov2, 0)
- C(0xe395, LLH, RXY_a, EI, 0, a2, new, r1_32, ld16u, 0)
- C(0xe391, LLGH, RXY_a, Z, 0, a2, r1, 0, ld16u, 0)
+ D(0xe395, LLH, RXY_a, EI, 0, a2, new, r1_32, ld, 0, MO_BEUW)
+ D(0xe391, LLGH, RXY_a, Z, 0, a2, r1, 0, ld, 0, MO_BEUW)
/* LOAD LOGICAL HALFWORD HIGH */
- C(0xe3c6, LLHH, RXY_a, HW, 0, a2, new, r1_32h, ld16u, 0)
+ D(0xe3c6, LLHH, RXY_a, HW, 0, a2, new, r1_32h, ld, 0, MO_BEUW)
/* LOAD LOGICAL HALFWORD RELATIVE LONG */
- C(0xc402, LLHRL, RIL_b, GIE, 0, ri2, new, r1_32, ld16u, 0)
- C(0xc406, LLGHRL, RIL_b, GIE, 0, ri2, r1, 0, ld16u, 0)
+ D(0xc402, LLHRL, RIL_b, GIE, 0, ri2, new, r1_32, ld, 0, MO_BEUW)
+ D(0xc406, LLGHRL, RIL_b, GIE, 0, ri2, r1, 0, ld, 0, MO_BEUW)
/* LOAD LOGICAL IMMEDIATE */
D(0xc00e, LLIHF, RIL_a, EI, 0, i2_32u_shl, 0, r1, mov2, 0, 32)
D(0xc00f, LLILF, RIL_a, EI, 0, i2_32u_shl, 0, r1, mov2, 0, 0)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 3123986618..b724db6a1c 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -2755,12 +2755,6 @@ static DisasJumpType op_ld(DisasContext *s, DisasOps *o)
return DISAS_NEXT;
}
-static DisasJumpType op_ld16u(DisasContext *s, DisasOps *o)
-{
- tcg_gen_qemu_ld_i64(o->out, o->in2, get_mem_index(s), MO_BEUW);
- return DISAS_NEXT;
-}
-
static DisasJumpType op_ld32s(DisasContext *s, DisasOps *o)
{
tcg_gen_qemu_ld_i64(o->out, o->in2, get_mem_index(s),