target/sparc: Remove the constant pool
Partially reverts ab20bdc116
. The 14-bit displacement that we
allowed to reach the constant pool is not always sufficient.
Retain the tb-relative addressing, as that is how most return
values from the tb are computed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
58b1f0f21e
commit
f6823cbe37
|
@ -311,24 +311,6 @@ static void patch_reloc(tcg_insn_unit *code_ptr, int type,
|
||||||
insn &= ~INSN_OFF19(-1);
|
insn &= ~INSN_OFF19(-1);
|
||||||
insn |= INSN_OFF19(pcrel);
|
insn |= INSN_OFF19(pcrel);
|
||||||
break;
|
break;
|
||||||
case R_SPARC_13:
|
|
||||||
/* Note that we're abusing this reloc type for our own needs. */
|
|
||||||
if (!check_fit_ptr(value, 13)) {
|
|
||||||
int adj = (value > 0 ? 0xff8 : -0x1000);
|
|
||||||
value -= adj;
|
|
||||||
assert(check_fit_ptr(value, 13));
|
|
||||||
*code_ptr++ = (ARITH_ADD | INSN_RD(TCG_REG_T2)
|
|
||||||
| INSN_RS1(TCG_REG_TB) | INSN_IMM13(adj));
|
|
||||||
insn ^= INSN_RS1(TCG_REG_TB) ^ INSN_RS1(TCG_REG_T2);
|
|
||||||
}
|
|
||||||
insn &= ~INSN_IMM13(-1);
|
|
||||||
insn |= INSN_IMM13(value);
|
|
||||||
break;
|
|
||||||
case R_SPARC_32:
|
|
||||||
/* Note that we're abusing this reloc type for our own needs. */
|
|
||||||
code_ptr[0] = deposit32(code_ptr[0], 0, 22, value >> 10);
|
|
||||||
code_ptr[1] = deposit32(code_ptr[1], 0, 10, value);
|
|
||||||
return;
|
|
||||||
default:
|
default:
|
||||||
g_assert_not_reached();
|
g_assert_not_reached();
|
||||||
}
|
}
|
||||||
|
@ -459,6 +441,15 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* A 13-bit constant relative to the TB. */
|
||||||
|
if (!in_prologue && USE_REG_TB) {
|
||||||
|
test = arg - (uintptr_t)s->code_gen_ptr;
|
||||||
|
if (check_fit_ptr(test, 13)) {
|
||||||
|
tcg_out_arithi(s, ret, TCG_REG_TB, test, ARITH_ADD);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* A 32-bit constant, or 32-bit zero-extended to 64-bits. */
|
/* A 32-bit constant, or 32-bit zero-extended to 64-bits. */
|
||||||
if (type == TCG_TYPE_I32 || arg == (uint32_t)arg) {
|
if (type == TCG_TYPE_I32 || arg == (uint32_t)arg) {
|
||||||
tcg_out_sethi(s, ret, arg);
|
tcg_out_sethi(s, ret, arg);
|
||||||
|
@ -488,26 +479,6 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!in_prologue) {
|
|
||||||
if (USE_REG_TB) {
|
|
||||||
intptr_t diff = arg - (uintptr_t)s->code_gen_ptr;
|
|
||||||
if (check_fit_ptr(diff, 13)) {
|
|
||||||
tcg_out_arithi(s, ret, TCG_REG_TB, diff, ARITH_ADD);
|
|
||||||
} else {
|
|
||||||
new_pool_label(s, arg, R_SPARC_13, s->code_ptr,
|
|
||||||
-(intptr_t)s->code_gen_ptr);
|
|
||||||
tcg_out32(s, LDX | INSN_RD(ret) | INSN_RS1(TCG_REG_TB));
|
|
||||||
/* May be used to extend the 13-bit range in patch_reloc. */
|
|
||||||
tcg_out32(s, NOP);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
new_pool_label(s, arg, R_SPARC_32, s->code_ptr, 0);
|
|
||||||
tcg_out_sethi(s, ret, 0);
|
|
||||||
tcg_out32(s, LDX | INSN_RD(ret) | INSN_RS1(ret) | INSN_IMM13(0));
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* A 64-bit constant decomposed into 2 32-bit pieces. */
|
/* A 64-bit constant decomposed into 2 32-bit pieces. */
|
||||||
if (check_fit_i32(lo, 13)) {
|
if (check_fit_i32(lo, 13)) {
|
||||||
hi = (arg - lo) >> 32;
|
hi = (arg - lo) >> 32;
|
||||||
|
|
Loading…
Reference in a new issue