Reviewed-by: Matt Turner <[email protected]>
Signed-off-by: Richard Henderson <[email protected]>
---
tcg/s390x/tcg-target-has.h | 5 +++--
tcg/s390x/tcg-target.c.inc | 13 ++++++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/tcg/s390x/tcg-target-has.h b/tcg/s390x/tcg-target-has.h
index 58e3afe5266..33a3b72318e 100644
--- a/tcg/s390x/tcg-target-has.h
+++ b/tcg/s390x/tcg-target-has.h
@@ -77,7 +77,8 @@ tcg_target_sextract_valid(TCGType type, unsigned ofs,
unsigned len)
}
#define TCG_TARGET_sextract_valid tcg_target_sextract_valid
-#define TCG_TARGET_lea_sh_valid(type, sh) 0
-#define TCG_TARGET_lea_imm_valid(type, imm) 0
+#define TCG_TARGET_lea_sh_valid(type, sh) ((sh) == 0)
+#define TCG_TARGET_lea_imm_valid(type, imm) \
+ ((imm) >= -0x80000 && (imm) < 0x80000)
#endif
diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc
index 2fd7012d047..db3b2fc3c92 100644
--- a/tcg/s390x/tcg-target.c.inc
+++ b/tcg/s390x/tcg-target.c.inc
@@ -3187,8 +3187,19 @@ static const TCGOutOpStore outop_st = {
.out_r = tcg_out_st,
};
+static void tgen_lea(TCGContext *s, TCGType type, TCGReg a0, TCGReg a1,
+ TCGReg a2, unsigned sh, tcg_target_long imm)
+{
+ if (imm >= 0 && imm < 0x1000) {
+ tcg_out_insn(s, RX, LA, a0, a1, a2, imm);
+ } else {
+ tcg_out_insn(s, RXY, LAY, a0, a1, a2, imm);
+ }
+}
+
static const TCGOutOpLea outop_lea = {
- .base.static_constraint = C_NotImplemented,
+ .base.static_constraint = C_O1_I2(r, r, r),
+ .out = tgen_lea,
};
static bool tcg_out_dup_vec(TCGContext *s, TCGType type, unsigned vece,
--
2.53.0
