mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 01:28:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

tcg/arm: Use indirect branch for goto_tb

Browse source 
Backports commit 3fb53fb4d12f2e7833bd1659e6013237b130ef20 from qemu
This commit is contained in:
Richard Henderson 2018-03-03 17:10:40 -05:00 committed by Lioncash
parent 9a85cb0a26
commit 68275ba6f3
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qemu/include/exec/exec-all.h
View file

@ -204,7 +204,7 @@ static inline void tlb_flush_by_mmuidx(CPUState *cpu, uint16_t idxmap)
#define CODE_GEN_AVG_BLOCK_SIZE 150 #define CODE_GEN_AVG_BLOCK_SIZE 150
#endif #endif
#if defined(__arm__) || defined(_ARCH_PPC) \ #if defined(_ARCH_PPC) \
|| defined(__x86_64__) || defined(__i386__) \ || defined(__x86_64__) || defined(__i386__) \
|| defined(__sparc__) || defined(__aarch64__) \ || defined(__sparc__) || defined(__aarch64__) \
|| defined(__s390x__) || defined(__mips__) \ || defined(__s390x__) || defined(__mips__) \
@ -307,9 +307,6 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr)
#elif defined(__aarch64__) #elif defined(__aarch64__)
void aarch64_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr); void aarch64_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr);
#define tb_set_jmp_target1 aarch64_tb_set_jmp_target #define tb_set_jmp_target1 aarch64_tb_set_jmp_target
#elif defined(__arm__)
void arm_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr);
#define tb_set_jmp_target1 arm_tb_set_jmp_target
#elif defined(__sparc__) || defined(__mips__) #elif defined(__sparc__) || defined(__mips__)
void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr); void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr);
#else #else

17
qemu/tcg/arm/tcg-target.inc.c
View file

@ -1035,16 +1035,6 @@ static void tcg_out_call(TCGContext *s, tcg_insn_unit *addr)
} }
} }
void arm_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr)
{
tcg_insn_unit *code_ptr = (tcg_insn_unit *)jmp_addr;
tcg_insn_unit *target = (tcg_insn_unit *)addr;
/* we could use a ldr pc, [pc, #-4] kind of branch and avoid the flush */
reloc_pc24_atomic(code_ptr, target);
flush_icache_range(jmp_addr, jmp_addr + 4);
}
static inline void tcg_out_goto_label(TCGContext *s, int cond, TCGLabel *l) static inline void tcg_out_goto_label(TCGContext *s, int cond, TCGLabel *l)
{ {
if (l->has_value) { if (l->has_value) {
@ -1674,11 +1664,8 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
} }
break; break;
case INDEX_op_goto_tb: case INDEX_op_goto_tb:
if (s->tb_jmp_insn_offset) { tcg_debug_assert(s->tb_jmp_insn_offset == 0);
/* Direct jump method */ {
s->tb_jmp_insn_offset[args[0]] = tcg_current_code_size(s);
tcg_out_b_noaddr(s, COND_AL);
} else {
/* Indirect jump method */ /* Indirect jump method */
intptr_t ptr = (intptr_t)(s->tb_jmp_target_addr + args[0]); intptr_t ptr = (intptr_t)(s->tb_jmp_target_addr + args[0]);
tcg_out_movi32(s, COND_AL, TCG_REG_R0, ptr & ~0xfff); tcg_out_movi32(s, COND_AL, TCG_REG_R0, ptr & ~0xfff);