OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tcg/arm: Support split-wx code generation

Browse Source 
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2020-11-05 15:27:27 -08:00
parent df5af1306a
commit 69478b8b15
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tcg/arm/tcg-target.c.inc
View File

@ -187,29 +187,32 @@ static const uint8_t tcg_cond_to_arm_cond[] = {
[TCG_COND_GTU] = COND_HI, [TCG_COND_GTU] = COND_HI,
}; };
static inline bool reloc_pc24(tcg_insn_unit *code_ptr, tcg_insn_unit *target) static bool reloc_pc24(tcg_insn_unit *src_rw, const tcg_insn_unit *target)
{ {
ptrdiff_t offset = (tcg_ptr_byte_diff(target, code_ptr) - 8) >> 2; const tcg_insn_unit *src_rx = tcg_splitwx_to_rx(src_rw);
ptrdiff_t offset = (tcg_ptr_byte_diff(target, src_rx) - 8) >> 2;
if (offset == sextract32(offset, 0, 24)) { if (offset == sextract32(offset, 0, 24)) {
*code_ptr = (*code_ptr & ~0xffffff) | (offset & 0xffffff); *src_rw = deposit32(*src_rw, 0, 24, offset);
return true; return true;
} }
return false; return false;
} }
static inline bool reloc_pc13(tcg_insn_unit *code_ptr, tcg_insn_unit *target) static bool reloc_pc13(tcg_insn_unit *src_rw, const tcg_insn_unit *target)
{ {
ptrdiff_t offset = tcg_ptr_byte_diff(target, code_ptr) - 8; const tcg_insn_unit *src_rx = tcg_splitwx_to_rx(src_rw);
ptrdiff_t offset = tcg_ptr_byte_diff(target, src_rx) - 8;
if (offset >= -0xfff && offset <= 0xfff) { if (offset >= -0xfff && offset <= 0xfff) {
tcg_insn_unit insn = *code_ptr; tcg_insn_unit insn = *src_rw;
bool u = (offset >= 0); bool u = (offset >= 0);
if (!u) { if (!u) {
offset = -offset; offset = -offset;
} }
insn = deposit32(insn, 23, 1, u); insn = deposit32(insn, 23, 1, u);
insn = deposit32(insn, 0, 12, offset); insn = deposit32(insn, 0, 12, offset);
*code_ptr = insn; *src_rw = insn;
return true; return true;
} }
return false; return false;
@ -221,9 +224,9 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
tcg_debug_assert(addend == 0); tcg_debug_assert(addend == 0);
if (type == R_ARM_PC24) { if (type == R_ARM_PC24) {
return reloc_pc24(code_ptr, (tcg_insn_unit *)value); return reloc_pc24(code_ptr, (const tcg_insn_unit *)value);
} else if (type == R_ARM_PC13) { } else if (type == R_ARM_PC13) {
return reloc_pc13(code_ptr, (tcg_insn_unit *)value); return reloc_pc13(code_ptr, (const tcg_insn_unit *)value);
} else { } else {
g_assert_not_reached(); g_assert_not_reached();
} }
@ -617,7 +620,7 @@ static void tcg_out_movi32(TCGContext *s, int cond, int rd, uint32_t arg)
/* Check for a pc-relative address. This will usually be the TB, /* Check for a pc-relative address. This will usually be the TB,
or within the TB, which is immediately before the code block. */ or within the TB, which is immediately before the code block. */
diff = arg - ((intptr_t)s->code_ptr + 8); diff = tcg_pcrel_diff(s, (void *)arg) - 8;
if (diff >= 0) { if (diff >= 0) {
rot = encode_imm(diff); rot = encode_imm(diff);
if (rot >= 0) { if (rot >= 0) {
@ -1337,7 +1340,8 @@ static void add_qemu_ldst_label(TCGContext *s, bool is_ld, TCGMemOpIdx oi,
label->datahi_reg = datahi; label->datahi_reg = datahi;
label->addrlo_reg = addrlo; label->addrlo_reg = addrlo;
label->addrhi_reg = addrhi; label->addrhi_reg = addrhi;
label->raddr = raddr; /* TODO: Cast goes away when all hosts converted */
label->raddr = (void *)tcg_splitwx_to_rx(raddr);
label->label_ptr[0] = label_ptr; label->label_ptr[0] = label_ptr;
} }
@ -1348,7 +1352,7 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb)
MemOp opc = get_memop(oi); MemOp opc = get_memop(oi);
void *func; void *func;
if (!reloc_pc24(lb->label_ptr[0], s->code_ptr)) { if (!reloc_pc24(lb->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) {
return false; return false;
} }
@ -1411,7 +1415,7 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb)
TCGMemOpIdx oi = lb->oi; TCGMemOpIdx oi = lb->oi;
MemOp opc = get_memop(oi); MemOp opc = get_memop(oi);
if (!reloc_pc24(lb->label_ptr[0], s->code_ptr)) { if (!reloc_pc24(lb->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) {
return false; return false;
} }
@ -1762,8 +1766,8 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
TCGReg base = TCG_REG_PC; TCGReg base = TCG_REG_PC;
tcg_debug_assert(s->tb_jmp_insn_offset == 0); tcg_debug_assert(s->tb_jmp_insn_offset == 0);
ptr = (intptr_t)(s->tb_jmp_target_addr + args[0]); ptr = (intptr_t)tcg_splitwx_to_rx(s->tb_jmp_target_addr + args[0]);
dif = ptr - ((intptr_t)s->code_ptr + 8); dif = tcg_pcrel_diff(s, (void *)ptr) - 8;
dil = sextract32(dif, 0, 12); dil = sextract32(dif, 0, 12);
if (dif != dil) { if (dif != dil) {
/* The TB is close, but outside the 12 bits addressable by /* The TB is close, but outside the 12 bits addressable by
@ -2297,7 +2301,8 @@ static void tcg_target_qemu_prologue(TCGContext *s)
* Return path for goto_ptr. Set return value to 0, a-la exit_tb, * Return path for goto_ptr. Set return value to 0, a-la exit_tb,
* and fall through to the rest of the epilogue. * and fall through to the rest of the epilogue.
*/ */
tcg_code_gen_epilogue = 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_movi(s, TCG_TYPE_PTR, TCG_REG_R0, 0); tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R0, 0);
tcg_out_epilogue(s); tcg_out_epilogue(s);
} }

2
tcg/arm/tcg-target.h
View File

@ -142,6 +142,6 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
#define TCG_TARGET_NEED_LDST_LABELS #define TCG_TARGET_NEED_LDST_LABELS
#endif #endif
#define TCG_TARGET_NEED_POOL_LABELS #define TCG_TARGET_NEED_POOL_LABELS
#define TCG_TARGET_SUPPORT_MIRROR 0 #define TCG_TARGET_SUPPORT_MIRROR 1
#endif #endif