yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 22:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg/i386: Store out-of-range call targets in constant pool

Browse source 
Already it saves 2 bytes per call, but also the constant pool
entry may well be shared across multiple calls.

Backports commit 4e45f23943c0bb91588627de3801826546155ad8 from qemu
This commit is contained in:
Richard Henderson 2018-03-04 22:19:25 -05:00 committed by Lioncash
parent e9d8cef430
commit b96f53e8a3
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qemu/tcg/i386/tcg-target.h
View file

@ -189,5 +189,6 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr,
#ifdef CONFIG_SOFTMMU #ifdef CONFIG_SOFTMMU
#define TCG_TARGET_NEED_LDST_LABELS #define TCG_TARGET_NEED_LDST_LABELS
#endif #endif
#define TCG_TARGET_NEED_POOL_LABELS
#endif #endif

18
qemu/tcg/i386/tcg-target.inc.c
View file

@ -22,6 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "tcg-pool.inc.c"
#ifdef CONFIG_DEBUG_TCG #ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
#if TCG_TARGET_REG_BITS == 64 #if TCG_TARGET_REG_BITS == 64
@ -1212,9 +1214,14 @@ static void tcg_out_branch(TCGContext *s, int call, tcg_insn_unit *dest)
tcg_out_opc(s, call ? OPC_CALL_Jz : OPC_JMP_long, 0, 0, 0); tcg_out_opc(s, call ? OPC_CALL_Jz : OPC_JMP_long, 0, 0, 0);
tcg_out32(s, disp); tcg_out32(s, disp);
} else { } else {
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R10, (uintptr_t)dest); /* rip-relative addressing into the constant pool.
tcg_out_modrm(s, OPC_GRP5, This is 6 + 8 = 14 bytes, as compared to using an
call ? EXT5_CALLN_Ev : EXT5_JMPN_Ev, TCG_REG_R10); an immediate load 10 + 6 = 16 bytes, plus we may
be able to re-use the pool constant for more calls. */
tcg_out_opc(s, OPC_GRP5, 0, 0, 0);
tcg_out8(s, (call ? EXT5_CALLN_Ev : EXT5_JMPN_Ev) << 3 | 5);
new_pool_label(s, (uintptr_t)dest, R_386_PC32, s->code_ptr, -4);
tcg_out32(s, 0);
} }
} }
@ -2691,6 +2698,11 @@ static void tcg_target_qemu_prologue(TCGContext *s)
#endif #endif
} }
static void tcg_out_nop_fill(tcg_insn_unit *p, int count)
{
memset(p, 0x90, count);
}
static void tcg_target_init(TCGContext *s) static void tcg_target_init(TCGContext *s)
{ {
#ifdef CONFIG_CPUID_H #ifdef CONFIG_CPUID_H

2
qemu/tcg/tcg-pool.inc.c
View file

@ -32,7 +32,7 @@ typedef struct TCGLabelPoolData {
static void new_pool_label(TCGContext *s, tcg_target_ulong data, int type, static void new_pool_label(TCGContext *s, tcg_target_ulong data, int type,
tcg_insn_unit *label, intptr_t addend) tcg_insn_unit *label, intptr_t addend)
{ {
TCGLabelPoolData *n = tcg_malloc(sizeof(*n)); TCGLabelPoolData *n = tcg_malloc(s, sizeof(*n));
TCGLabelPoolData *i, **pp; TCGLabelPoolData *i, **pp;
n->data = data; n->data = data;