f375e62ad9
Fix libvirt + seccomp combo (bz #855162) Fix scsi hotplug crash (bz #879657) Fix QOM refcount crash (bz #881486)
80 lines
2.9 KiB
Diff
80 lines
2.9 KiB
Diff
From 1338a6f18ff9b651c12ee1f7edd1d2b7684bd6aa Mon Sep 17 00:00:00 2001
|
|
From: Richard Henderson <rth@twiddle.net>
|
|
Date: Fri, 21 Sep 2012 10:48:51 -0700
|
|
Subject: [PATCH] tcg-sparc: Fix and enable direct TB chaining.
|
|
|
|
Signed-off-by: Richard Henderson <rth@twiddle.net>
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
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 c5d3a13..1f81da7 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.8.0.2
|
|
|