[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/11] tcg-s390: Implement direct chaining of TBs
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 11/11] tcg-s390: Implement direct chaining of TBs |
Date: |
Thu, 15 May 2014 09:39:43 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
include/exec/exec-all.h | 9 +++++++++
tcg/s390/tcg-target.c | 4 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 444b4d9..8bc2eb6 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -131,6 +131,7 @@ static inline void tlb_flush(CPUState *cpu, int
flush_global)
#if defined(__arm__) || defined(_ARCH_PPC) \
|| defined(__x86_64__) || defined(__i386__) \
|| defined(__sparc__) || defined(__aarch64__) \
+ || defined(__s390x__) \
|| defined(CONFIG_TCG_INTERPRETER)
#define USE_DIRECT_JUMP
#endif
@@ -232,6 +233,14 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr,
uintptr_t addr)
stl_le_p((void*)jmp_addr, addr - (jmp_addr + 4));
/* no need to flush icache explicitly */
}
+#elif defined(__s390x__)
+static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr)
+{
+ /* patch the branch destination */
+ intptr_t disp = addr - (jmp_addr - 2);
+ stl_be_p((void*)jmp_addr, disp / 2);
+ /* no need to flush icache explicitly */
+}
#elif defined(__aarch64__)
void aarch64_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr);
#define tb_set_jmp_target1 aarch64_tb_set_jmp_target
diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c
index e235130..07164e5 100644
--- a/tcg/s390/tcg-target.c
+++ b/tcg/s390/tcg-target.c
@@ -1703,7 +1703,9 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode
opc,
case INDEX_op_goto_tb:
if (s->tb_jmp_offset) {
- tcg_abort();
+ tcg_out16(s, RIL_BRCL | (S390_CC_ALWAYS << 4));
+ s->tb_jmp_offset[args[0]] = tcg_current_code_size(s);
+ s->code_ptr += 2;
} else {
/* load address stored at s->tb_next + args[0] */
tcg_out_ld_abs(s, TCG_TYPE_PTR, TCG_TMP0, s->tb_next + args[0]);
--
1.9.0
- [Qemu-devel] [PULL 00/12] tcg s390 updates, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 01/11] tcg-s390: Fix off-by-one in wraparound andi, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 02/11] tcg-s390: Convert to TCGMemOp, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 03/11] tcg-s390: Integrate endianness into TCGMemOp, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 04/11] tcg-s390: Convert to new ldst opcodes, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 05/11] tcg-s390: Move ldst helpers out of line, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 06/11] tcg-s390: Use more risbg in the tlb sequence, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 07/11] tcg-s390: Implement tcg_register_jit, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 08/11] tcg-s390: Allow immediate operands to add2 and sub2, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 11/11] tcg-s390: Implement direct chaining of TBs,
Richard Henderson <=
- [Qemu-devel] [PULL 09/11] tcg-s390: Improve setcond, Richard Henderson, 2014/05/15
- [Qemu-devel] [PULL 10/11] tcg-s390: Don't force -march=z990, Richard Henderson, 2014/05/15
- Re: [Qemu-devel] [PULL 00/12] tcg s390 updates, Peter Maydell, 2014/05/15