[PATCH 07/14] target/s390x: Convert op_ld64 to op_ld
Richard Henderson <[email protected]>
| Newsgroups | gmane.comp.emulators.qemu |
|---|---|
| Message-ID | <[email protected]> |
Signed-off-by: Richard Henderson <[email protected]> --- target/s390x/tcg/translate.c | 7 ------- target/s390x/tcg/insn-data.h.inc | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 4f1e8db780..34ee2d6087 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_ld64(DisasContext *s, DisasOps *o) -{ - tcg_gen_qemu_ld_i64(o->out, o->in2, get_mem_index(s), - MO_BEUQ | s->insn->data); - return DISAS_NEXT; -} - static DisasJumpType op_lat(DisasContext *s, DisasOps *o) { TCGLabel *lab = gen_new_label(); diff --git a/target/s390x/tcg/insn-data.h.inc b/target/s390x/tcg/insn-data.h.inc index 00c8994345..f72607e389 100644 --- a/target/s390x/tcg/insn-data.h.inc +++ b/target/s390x/tcg/insn-data.h.inc @@ -422,7 +422,7 @@ D(0xe358, LY, RXY_a, LD, 0, a2, new, r1_32, ld, 0, MO_BESL) C(0xb904, LGR, RRE, Z, 0, r2_o, 0, r1, mov2, 0) C(0xb914, LGFR, RRE, Z, 0, r2_32s, 0, r1, mov2, 0) - D(0xe304, LG, RXY_a, Z, 0, a2, r1, 0, ld64, 0, 0) + D(0xe304, LG, RXY_a, Z, 0, a2, r1, 0, ld, 0, MO_BEUQ) D(0xe314, LGF, RXY_a, Z, 0, a2, r1, 0, ld, 0, MO_BESL) F(0x2800, LDR, RR_a, Z, 0, f2, 0, f1, mov2, 0, IF_AFP1 | IF_AFP2) F(0x6800, LD, RX_a, Z, 0, m2_64, 0, f1, mov2, 0, IF_AFP1) @@ -435,7 +435,7 @@ C(0xc001, LGFI, RIL_a, EI, 0, i2, 0, r1, mov2, 0) /* LOAD RELATIVE LONG */ D(0xc40d, LRL, RIL_b, GIE, 0, ri2, new, r1_32, ld, 0, MO_BESL | MO_ALIGN) - D(0xc408, LGRL, RIL_b, GIE, 0, ri2, r1, 0, ld64, 0, MO_ALIGN) + D(0xc408, LGRL, RIL_b, GIE, 0, ri2, r1, 0, ld, 0, MO_BEUQ | MO_ALIGN) D(0xc40c, LGFRL, RIL_b, GIE, 0, ri2, r1, 0, ld, 0, MO_BESL | MO_ALIGN) /* LOAD ADDRESS */ C(0x4100, LA, RX_a, Z, 0, a2, 0, r1, mov2, 0) @@ -465,7 +465,7 @@ C(0xb902, LTGR, RRE, Z, 0, r2_o, 0, r1, mov2, s64) C(0xb912, LTGFR, RRE, Z, 0, r2_32s, 0, r1, mov2, s64) D(0xe312, LT, RXY_a, EI, 0, a2, new, r1_32, ld, s64, MO_BESL) - D(0xe302, LTG, RXY_a, EI, 0, a2, r1, 0, ld64, s64, 0) + D(0xe302, LTG, RXY_a, EI, 0, a2, r1, 0, ld, s64, MO_BEUQ) D(0xe332, LTGF, RXY_a, GIE, 0, a2, r1, 0, ld, s64, MO_BESL) F(0xb302, LTEBR, RRE, Z, 0, e2, 0, cond_e1e2, mov2, f32, IF_BFP) F(0xb312, LTDBR, RRE, Z, 0, f2, 0, f1, mov2, f64, IF_BFP) -- 2.43.0