1 From 1338a6f18ff9b651c12ee1f7edd1d2b7684bd6aa Mon Sep 17 00:00:00 2001
2 From: Richard Henderson <rth@twiddle.net>
3 Date: Fri, 21 Sep 2012 10:48:51 -0700
4 Subject: [PATCH] tcg-sparc: Fix and enable direct TB chaining.
6 Signed-off-by: Richard Henderson <rth@twiddle.net>
7 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
9 exec-all.h | 9 ++++++---
10 tcg/sparc/tcg-target.c | 21 ++++++++++++++++++---
11 2 files changed, 24 insertions(+), 6 deletions(-)
13 diff --git a/exec-all.h b/exec-all.h
14 index c5d3a13..1f81da7 100644
17 @@ -132,9 +132,10 @@ static inline void tlb_flush(CPUArchState *env, int flush_global)
18 #define CODE_GEN_AVG_BLOCK_SIZE 64
21 -#if defined(_ARCH_PPC) || defined(__x86_64__) || defined(__arm__) || defined(__i386__)
22 -#define USE_DIRECT_JUMP
23 -#elif defined(CONFIG_TCG_INTERPRETER)
24 +#if defined(__arm__) || defined(_ARCH_PPC) \
25 + || defined(__x86_64__) || defined(__i386__) \
26 + || defined(__sparc__) \
27 + || defined(CONFIG_TCG_INTERPRETER)
28 #define USE_DIRECT_JUMP
31 @@ -244,6 +245,8 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr)
32 __asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" (_flg));
35 +#elif defined(__sparc__)
36 +void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr);
38 #error tb_set_jmp_target1 is missing
40 diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
41 index 03c385a..1db0c9d 100644
42 --- a/tcg/sparc/tcg-target.c
43 +++ b/tcg/sparc/tcg-target.c
44 @@ -1072,10 +1072,10 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args,
45 case INDEX_op_goto_tb:
46 if (s->tb_jmp_offset) {
47 /* direct jump method */
48 - tcg_out_sethi(s, TCG_REG_T1, args[0] & 0xffffe000);
49 - tcg_out32(s, JMPL | INSN_RD(TCG_REG_G0) | INSN_RS1(TCG_REG_T1) |
50 - INSN_IMM13((args[0] & 0x1fff)));
51 + uint32_t old_insn = *(uint32_t *)s->code_ptr;
52 s->tb_jmp_offset[args[0]] = s->code_ptr - s->code_buf;
53 + /* Make sure to preserve links during retranslation. */
54 + tcg_out32(s, CALL | (old_insn & ~INSN_OP(-1)));
56 /* indirect jump method */
57 tcg_out_ld_ptr(s, TCG_REG_T1,
58 @@ -1595,3 +1595,18 @@ void tcg_register_jit(void *buf, size_t buf_size)
60 tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
63 +void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr)
65 + uint32_t *ptr = (uint32_t *)jmp_addr;
66 + tcg_target_long disp = (tcg_target_long)(addr - jmp_addr) >> 2;
68 + /* We can reach the entire address space for 32-bit. For 64-bit
69 + the code_gen_buffer can't be larger than 2GB. */
70 + if (TCG_TARGET_REG_BITS == 64 && !check_fit_tl(disp, 30)) {
74 + *ptr = CALL | (disp & 0x3fffffff);
75 + flush_icache_range(jmp_addr, jmp_addr + 4);