tcg/s390x: Cleanup tcg_out_movi

Merge maybe_out_small_movi, as it no longer has additional users.
Use is_const_p{16,32}.

Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-12-08 20:53:38 +00:00
parent 32c256eda6
commit 1818c71ba1

View file

@ -874,14 +874,19 @@ static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg dst, TCGReg src)
return true; return true;
} }
static const S390Opcode lli_insns[4] = { static const S390Opcode li_insns[4] = {
RI_LLILL, RI_LLILH, RI_LLIHL, RI_LLIHH RI_LLILL, RI_LLILH, RI_LLIHL, RI_LLIHH
}; };
static const S390Opcode lif_insns[2] = {
RIL_LLILF, RIL_LLIHF,
};
static bool maybe_out_small_movi(TCGContext *s, TCGType type, /* load a register with an immediate value */
static void tcg_out_movi(TCGContext *s, TCGType type,
TCGReg ret, tcg_target_long sval) TCGReg ret, tcg_target_long sval)
{ {
tcg_target_ulong uval = sval; tcg_target_ulong uval = sval;
ptrdiff_t pc_off;
int i; int i;
if (type == TCG_TYPE_I32) { if (type == TCG_TYPE_I32) {
@ -892,36 +897,13 @@ static bool maybe_out_small_movi(TCGContext *s, TCGType type,
/* Try all 32-bit insns that can load it in one go. */ /* Try all 32-bit insns that can load it in one go. */
if (sval >= -0x8000 && sval < 0x8000) { if (sval >= -0x8000 && sval < 0x8000) {
tcg_out_insn(s, RI, LGHI, ret, sval); tcg_out_insn(s, RI, LGHI, ret, sval);
return true;
}
for (i = 0; i < 4; i++) {
tcg_target_long mask = 0xffffull << i * 16;
if ((uval & mask) == uval) {
tcg_out_insn_RI(s, lli_insns[i], ret, uval >> i * 16);
return true;
}
}
return false;
}
/* load a register with an immediate value */
static void tcg_out_movi(TCGContext *s, TCGType type,
TCGReg ret, tcg_target_long sval)
{
tcg_target_ulong uval;
ptrdiff_t pc_off;
/* Try all 32-bit insns that can load it in one go. */
if (maybe_out_small_movi(s, type, ret, sval)) {
return; return;
} }
uval = sval; i = is_const_p16(uval);
if (type == TCG_TYPE_I32) { if (i >= 0) {
uval = (uint32_t)sval; tcg_out_insn_RI(s, li_insns[i], ret, uval >> (i * 16));
sval = (int32_t)sval; return;
} }
/* Try all 48-bit insns that can load it in one go. */ /* Try all 48-bit insns that can load it in one go. */
@ -929,12 +911,10 @@ static void tcg_out_movi(TCGContext *s, TCGType type,
tcg_out_insn(s, RIL, LGFI, ret, sval); tcg_out_insn(s, RIL, LGFI, ret, sval);
return; return;
} }
if (uval <= 0xffffffff) {
tcg_out_insn(s, RIL, LLILF, ret, uval); i = is_const_p32(uval);
return; if (i >= 0) {
} tcg_out_insn_RIL(s, lif_insns[i], ret, uval >> (i * 32));
if ((uval & 0xffffffff) == 0) {
tcg_out_insn(s, RIL, LLIHF, ret, uval >> 32);
return; return;
} }