[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/14] tcg-sparc: Fix and enable direct TB chaining.
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 13/14] tcg-sparc: Fix and enable direct TB chaining. |
Date: |
Fri, 21 Sep 2012 19:05:06 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
exec-all.h | 9 ++++++---
tcg/sparc/tcg-target.c | 21 ++++++++++++++++++---
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/exec-all.h b/exec-all.h
index dba9609..6516da0 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -132,9 +132,10 @@ static inline void tlb_flush(CPUArchState *env, int
flush_global)
#define CODE_GEN_AVG_BLOCK_SIZE 64
#endif
-#if defined(_ARCH_PPC) || defined(__x86_64__) || defined(__arm__) ||
defined(__i386__)
-#define USE_DIRECT_JUMP
-#elif defined(CONFIG_TCG_INTERPRETER)
+#if defined(__arm__) || defined(_ARCH_PPC) \
+ || defined(__x86_64__) || defined(__i386__) \
+ || defined(__sparc__) \
+ || defined(CONFIG_TCG_INTERPRETER)
#define USE_DIRECT_JUMP
#endif
@@ -244,6 +245,8 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr,
uintptr_t addr)
__asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" (_flg));
#endif
}
+#elif defined(__sparc__)
+void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr);
#else
#error tb_set_jmp_target1 is missing
#endif
diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c
index 03c385a..1db0c9d 100644
--- a/tcg/sparc/tcg-target.c
+++ b/tcg/sparc/tcg-target.c
@@ -1072,10 +1072,10 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode
opc, const TCGArg *args,
case INDEX_op_goto_tb:
if (s->tb_jmp_offset) {
/* direct jump method */
- tcg_out_sethi(s, TCG_REG_T1, args[0] & 0xffffe000);
- tcg_out32(s, JMPL | INSN_RD(TCG_REG_G0) | INSN_RS1(TCG_REG_T1) |
- INSN_IMM13((args[0] & 0x1fff)));
+ uint32_t old_insn = *(uint32_t *)s->code_ptr;
s->tb_jmp_offset[args[0]] = s->code_ptr - s->code_buf;
+ /* Make sure to preserve links during retranslation. */
+ tcg_out32(s, CALL | (old_insn & ~INSN_OP(-1)));
} else {
/* indirect jump method */
tcg_out_ld_ptr(s, TCG_REG_T1,
@@ -1595,3 +1595,18 @@ void tcg_register_jit(void *buf, size_t buf_size)
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
+
+void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr)
+{
+ uint32_t *ptr = (uint32_t *)jmp_addr;
+ tcg_target_long disp = (tcg_target_long)(addr - jmp_addr) >> 2;
+
+ /* We can reach the entire address space for 32-bit. For 64-bit
+ the code_gen_buffer can't be larger than 2GB. */
+ if (TCG_TARGET_REG_BITS == 64 && !check_fit_tl(disp, 30)) {
+ tcg_abort();
+ }
+
+ *ptr = CALL | (disp & 0x3fffffff);
+ flush_icache_range(jmp_addr, jmp_addr + 4);
+}
--
1.7.11.4
- [Qemu-devel] [PATCH 04/14] tcg-sparc: Don't MAP_FIXED on top of the program, (continued)
- [Qemu-devel] [PATCH 04/14] tcg-sparc: Don't MAP_FIXED on top of the program, Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 01/14] linux-user: Use memcpy in get_user/put_user., Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 02/14] tcg-sparc: Hack in qemu_ld/st64 for 32-bit., Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 05/14] tcg-sparc: Assume v9 cpu always, i.e. force v8plus in 32-bit mode., Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 08/14] tcg-sparc: Change AREG0 in generated code to %i0., Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 07/14] tcg-sparc: Support GUEST_BASE., Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 09/14] tcg-sparc: Clean up cruft stemming from attempts to use global registers., Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 06/14] tcg-sparc: Fix qemu_ld/st to handle 32-bit host., Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 10/14] tcg-sparc: Mask shift immediates to avoid illegal insns., Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 12/14] tcg-sparc: Add %g/%o registers to alloc_order, Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 13/14] tcg-sparc: Fix and enable direct TB chaining.,
Richard Henderson <=
- [Qemu-devel] [PATCH 14/14] tcg-sparc: Preserve branch destinations during retranslation, Richard Henderson, 2012/09/21
- [Qemu-devel] [PATCH 11/14] tcg-sparc: Use defines for temporaries., Richard Henderson, 2012/09/21
- Re: [Qemu-devel] [PATCH v3 00/14] Sparc TCG cleanup, Blue Swirl, 2012/09/22