tcg/s390x: Use LARL+AGHI for odd addresses

Add one instead of dropping odd addresses to the constant pool.

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-11-30 01:27:28 +00:00
parent 238da1c942
commit 1b74cf6ea2

View file

@ -806,6 +806,7 @@ 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; tcg_target_ulong uval;
ptrdiff_t pc_off;
/* 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 (maybe_out_small_movi(s, type, ret, sval)) { if (maybe_out_small_movi(s, type, ret, sval)) {
@ -832,14 +833,14 @@ static void tcg_out_movi(TCGContext *s, TCGType type,
return; return;
} }
/* Try for PC-relative address load. For odd addresses, /* Try for PC-relative address load. For odd addresses, add one. */
attempt to use an offset from the start of the TB. */ pc_off = tcg_pcrel_diff(s, (void *)sval) >> 1;
if ((sval & 1) == 0) { if (pc_off == (int32_t)pc_off) {
ptrdiff_t off = tcg_pcrel_diff(s, (void *)sval) >> 1; tcg_out_insn(s, RIL, LARL, ret, pc_off);
if (off == (int32_t)off) { if (sval & 1) {
tcg_out_insn(s, RIL, LARL, ret, off); tcg_out_insn(s, RI, AGHI, ret, 1);
return;
} }
return;
} }
/* Otherwise, stuff it in the constant pool. */ /* Otherwise, stuff it in the constant pool. */