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

tcg/i386: Support split-wx code generation 

Reviewed-by: Joelle van Dyne <j@getutm.app>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2020-10-28 23:42:12 -07:00
parent eba40358b4
commit 705ed477d5
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tcg/i386/tcg-target.c.inc
View File

@ -164,7 +164,7 @@ static bool have_lzcnt;
# define have_lzcnt 0 # define have_lzcnt 0
#endif #endif
static tcg_insn_unit *tb_ret_addr; static const tcg_insn_unit *tb_ret_addr;
static bool patch_reloc(tcg_insn_unit *code_ptr, int type, static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
intptr_t value, intptr_t addend) intptr_t value, intptr_t addend)
@ -172,7 +172,7 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
value += addend; value += addend;
switch(type) { switch(type) {
case R_386_PC32: case R_386_PC32:
value -= (uintptr_t)code_ptr; value -= (uintptr_t)tcg_splitwx_to_rx(code_ptr);
if (value != (int32_t)value) { if (value != (int32_t)value) {
return false; return false;
} }
@ -181,7 +181,7 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
tcg_patch32(code_ptr, value); tcg_patch32(code_ptr, value);
break; break;
case R_386_PC8: case R_386_PC8:
value -= (uintptr_t)code_ptr; value -= (uintptr_t)tcg_splitwx_to_rx(code_ptr);
if (value != (int8_t)value) { if (value != (int8_t)value) {
return false; return false;
} }
@ -1015,7 +1015,7 @@ static void tcg_out_movi(TCGContext *s, TCGType type,
} }
/* Try a 7 byte pc-relative lea before the 10 byte movq. */ /* Try a 7 byte pc-relative lea before the 10 byte movq. */
diff = arg - ((uintptr_t)s->code_ptr + 7); diff = tcg_pcrel_diff(s, (const void *)arg) - 7;
if (diff == (int32_t)diff) { if (diff == (int32_t)diff) {
tcg_out_opc(s, OPC_LEA | P_REXW, ret, 0, 0); tcg_out_opc(s, OPC_LEA | P_REXW, ret, 0, 0);
tcg_out8(s, (LOWREGMASK(ret) << 3) | 5); tcg_out8(s, (LOWREGMASK(ret) << 3) | 5);
@ -1624,7 +1624,7 @@ static inline void tcg_out_call(TCGContext *s, const tcg_insn_unit *dest)
tcg_out_branch(s, 1, dest); tcg_out_branch(s, 1, dest);
} }
static void tcg_out_jmp(TCGContext *s, tcg_insn_unit *dest) static void tcg_out_jmp(TCGContext *s, const tcg_insn_unit *dest)
{ {
tcg_out_branch(s, 0, dest); tcg_out_branch(s, 0, dest);
} }
@ -1795,7 +1795,8 @@ static void add_qemu_ldst_label(TCGContext *s, bool is_ld, bool is_64,
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[0]; label->label_ptr[0] = label_ptr[0];
if (TARGET_LONG_BITS > TCG_TARGET_REG_BITS) { if (TARGET_LONG_BITS > TCG_TARGET_REG_BITS) {
label->label_ptr[1] = label_ptr[1]; label->label_ptr[1] = label_ptr[1];
@ -2253,7 +2254,7 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
/* jump displacement must be aligned for atomic patching; /* jump displacement must be aligned for atomic patching;
* see if we need to add extra nops before jump * see if we need to add extra nops before jump
*/ */
gap = tcg_pcrel_diff(s, QEMU_ALIGN_PTR_UP(s->code_ptr + 1, 4)); gap = QEMU_ALIGN_PTR_UP(s->code_ptr + 1, 4) - s->code_ptr;
if (gap != 1) { if (gap != 1) {
tcg_out_nopn(s, gap - 1); tcg_out_nopn(s, gap - 1);
} }
@ -3803,11 +3804,12 @@ 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_REG, TCG_REG_EAX, 0); tcg_out_movi(s, TCG_TYPE_REG, TCG_REG_EAX, 0);
/* TB epilogue */ /* TB epilogue */
tb_ret_addr = s->code_ptr; tb_ret_addr = tcg_splitwx_to_rx(s->code_ptr);
tcg_out_addi(s, TCG_REG_CALL_STACK, stack_addend); tcg_out_addi(s, TCG_REG_CALL_STACK, stack_addend);

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

@ -235,6 +235,6 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx,
#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