tcg/ppc: Support split-wx code generation
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
2d6f38ebe5
commit
d54401dfef
|
@ -62,8 +62,6 @@
|
|||
#define TCG_CT_CONST_MONE 0x2000
|
||||
#define TCG_CT_CONST_WSZ 0x4000
|
||||
|
||||
static tcg_insn_unit *tb_ret_addr;
|
||||
|
||||
TCGPowerISA have_isa;
|
||||
static bool have_isel;
|
||||
bool have_altivec;
|
||||
|
@ -184,35 +182,41 @@ static inline bool in_range_b(tcg_target_long target)
|
|||
return target == sextract64(target, 0, 26);
|
||||
}
|
||||
|
||||
static uint32_t reloc_pc24_val(tcg_insn_unit *pc, const tcg_insn_unit *target)
|
||||
static uint32_t reloc_pc24_val(const tcg_insn_unit *pc,
|
||||
const tcg_insn_unit *target)
|
||||
{
|
||||
ptrdiff_t disp = tcg_ptr_byte_diff(target, pc);
|
||||
tcg_debug_assert(in_range_b(disp));
|
||||
return disp & 0x3fffffc;
|
||||
}
|
||||
|
||||
static bool reloc_pc24(tcg_insn_unit *pc, tcg_insn_unit *target)
|
||||
static bool reloc_pc24(tcg_insn_unit *src_rw, const tcg_insn_unit *target)
|
||||
{
|
||||
ptrdiff_t disp = tcg_ptr_byte_diff(target, pc);
|
||||
const tcg_insn_unit *src_rx = tcg_splitwx_to_rx(src_rw);
|
||||
ptrdiff_t disp = tcg_ptr_byte_diff(target, src_rx);
|
||||
|
||||
if (in_range_b(disp)) {
|
||||
*pc = (*pc & ~0x3fffffc) | (disp & 0x3fffffc);
|
||||
*src_rw = (*src_rw & ~0x3fffffc) | (disp & 0x3fffffc);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static uint16_t reloc_pc14_val(tcg_insn_unit *pc, const tcg_insn_unit *target)
|
||||
static uint16_t reloc_pc14_val(const tcg_insn_unit *pc,
|
||||
const tcg_insn_unit *target)
|
||||
{
|
||||
ptrdiff_t disp = tcg_ptr_byte_diff(target, pc);
|
||||
tcg_debug_assert(disp == (int16_t) disp);
|
||||
return disp & 0xfffc;
|
||||
}
|
||||
|
||||
static bool reloc_pc14(tcg_insn_unit *pc, tcg_insn_unit *target)
|
||||
static bool reloc_pc14(tcg_insn_unit *src_rw, const tcg_insn_unit *target)
|
||||
{
|
||||
ptrdiff_t disp = tcg_ptr_byte_diff(target, pc);
|
||||
const tcg_insn_unit *src_rx = tcg_splitwx_to_rx(src_rw);
|
||||
ptrdiff_t disp = tcg_ptr_byte_diff(target, src_rx);
|
||||
|
||||
if (disp == (int16_t) disp) {
|
||||
*pc = (*pc & ~0xfffc) | (disp & 0xfffc);
|
||||
*src_rw = (*src_rw & ~0xfffc) | (disp & 0xfffc);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
@ -673,12 +677,12 @@ static const uint32_t tcg_to_isel[] = {
|
|||
static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
|
||||
intptr_t value, intptr_t addend)
|
||||
{
|
||||
tcg_insn_unit *target;
|
||||
const tcg_insn_unit *target;
|
||||
int16_t lo;
|
||||
int32_t hi;
|
||||
|
||||
value += addend;
|
||||
target = (tcg_insn_unit *)value;
|
||||
target = (const tcg_insn_unit *)value;
|
||||
|
||||
switch (type) {
|
||||
case R_PPC_REL14:
|
||||
|
@ -1544,7 +1548,7 @@ static void tcg_out_setcond(TCGContext *s, TCGType type, TCGCond cond,
|
|||
static void tcg_out_bc(TCGContext *s, int bc, TCGLabel *l)
|
||||
{
|
||||
if (l->has_value) {
|
||||
bc |= reloc_pc14_val(s->code_ptr, l->u.value_ptr);
|
||||
bc |= reloc_pc14_val(tcg_splitwx_to_rx(s->code_ptr), l->u.value_ptr);
|
||||
} else {
|
||||
tcg_out_reloc(s, s->code_ptr, R_PPC_REL14, l, 0);
|
||||
}
|
||||
|
@ -1997,7 +2001,8 @@ static void add_qemu_ldst_label(TCGContext *s, bool is_ld, TCGMemOpIdx oi,
|
|||
label->datahi_reg = datahi_reg;
|
||||
label->addrlo_reg = addrlo_reg;
|
||||
label->addrhi_reg = addrhi_reg;
|
||||
label->raddr = raddr;
|
||||
/* TODO: Cast goes away when all hosts converted */
|
||||
label->raddr = (void *)tcg_splitwx_to_rx(raddr);
|
||||
label->label_ptr[0] = lptr;
|
||||
}
|
||||
|
||||
|
@ -2007,7 +2012,7 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb)
|
|||
MemOp opc = get_memop(oi);
|
||||
TCGReg hi, lo, arg = TCG_REG_R3;
|
||||
|
||||
if (!reloc_pc14(lb->label_ptr[0], s->code_ptr)) {
|
||||
if (!reloc_pc14(lb->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -2055,7 +2060,7 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb)
|
|||
MemOp s_bits = opc & MO_SIZE;
|
||||
TCGReg hi, lo, arg = TCG_REG_R3;
|
||||
|
||||
if (!reloc_pc14(lb->label_ptr[0], s->code_ptr)) {
|
||||
if (!reloc_pc14(lb->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -2306,10 +2311,10 @@ static void tcg_target_qemu_prologue(TCGContext *s)
|
|||
int i;
|
||||
|
||||
#ifdef _CALL_AIX
|
||||
void **desc = (void **)s->code_ptr;
|
||||
desc[0] = desc + 2; /* entry point */
|
||||
desc[1] = 0; /* environment pointer */
|
||||
s->code_ptr = (void *)(desc + 2); /* skip over descriptor */
|
||||
const void **desc = (const void **)s->code_ptr;
|
||||
desc[0] = tcg_splitwx_to_rx(desc + 2); /* entry point */
|
||||
desc[1] = 0; /* environment pointer */
|
||||
s->code_ptr = (void *)(desc + 2); /* skip over descriptor */
|
||||
#endif
|
||||
|
||||
tcg_set_frame(s, TCG_REG_CALL_STACK, REG_SAVE_BOT - CPU_TEMP_BUF_SIZE,
|
||||
|
@ -2341,7 +2346,8 @@ static void tcg_target_qemu_prologue(TCGContext *s)
|
|||
tcg_out32(s, BCCTR | BO_ALWAYS);
|
||||
|
||||
/* Epilogue */
|
||||
tcg_code_gen_epilogue = tb_ret_addr = s->code_ptr;
|
||||
/* TODO: Cast goes away when all hosts converted */
|
||||
tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr);
|
||||
|
||||
tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_R0, TCG_REG_R1, FRAME_SIZE+LR_OFFSET);
|
||||
for (i = 0; i < ARRAY_SIZE(tcg_target_callee_save_regs); ++i) {
|
||||
|
@ -2362,7 +2368,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
|
|||
switch (opc) {
|
||||
case INDEX_op_exit_tb:
|
||||
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R3, args[0]);
|
||||
tcg_out_b(s, 0, tb_ret_addr);
|
||||
tcg_out_b(s, 0, tcg_code_gen_epilogue);
|
||||
break;
|
||||
case INDEX_op_goto_tb:
|
||||
if (s->tb_jmp_insn_offset) {
|
||||
|
@ -2410,7 +2416,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
|
|||
uint32_t insn = B;
|
||||
|
||||
if (l->has_value) {
|
||||
insn |= reloc_pc24_val(s->code_ptr, l->u.value_ptr);
|
||||
insn |= reloc_pc24_val(tcg_splitwx_to_rx(s->code_ptr),
|
||||
l->u.value_ptr);
|
||||
} else {
|
||||
tcg_out_reloc(s, s->code_ptr, R_PPC_REL24, l, 0);
|
||||
}
|
||||
|
|
|
@ -185,6 +185,6 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
|
|||
#define TCG_TARGET_NEED_LDST_LABELS
|
||||
#endif
|
||||
#define TCG_TARGET_NEED_POOL_LABELS
|
||||
#define TCG_TARGET_SUPPORT_MIRROR 0
|
||||
#define TCG_TARGET_SUPPORT_MIRROR 1
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue