[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 15/26] tcg/s390: Implement goto_ptr
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v7 15/26] tcg/s390: Implement goto_ptr |
Date: |
Fri, 26 May 2017 14:16:27 -0700 |
Tested-by: Aurelien Jarno <address@hidden>
Reviewed-by: Aurelien Jarno <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
tcg/s390/tcg-target.h | 2 +-
tcg/s390/tcg-target.inc.c | 24 +++++++++++++++++++++---
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h
index 6b7bcfb..957f0c0 100644
--- a/tcg/s390/tcg-target.h
+++ b/tcg/s390/tcg-target.h
@@ -92,7 +92,7 @@ extern uint64_t s390_facilities;
#define TCG_TARGET_HAS_mulsh_i32 0
#define TCG_TARGET_HAS_extrl_i64_i32 0
#define TCG_TARGET_HAS_extrh_i64_i32 0
-#define TCG_TARGET_HAS_goto_ptr 0
+#define TCG_TARGET_HAS_goto_ptr 1
#define TCG_TARGET_HAS_div2_i64 1
#define TCG_TARGET_HAS_rot_i64 1
diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c
index a679280..5d7083e 100644
--- a/tcg/s390/tcg-target.inc.c
+++ b/tcg/s390/tcg-target.inc.c
@@ -1741,9 +1741,14 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode
opc,
switch (opc) {
case INDEX_op_exit_tb:
- /* return value */
- tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R2, args[0]);
- tgen_gotoi(s, S390_CC_ALWAYS, tb_ret_addr);
+ /* Reuse the zeroing that exists for goto_ptr. */
+ a0 = args[0];
+ if (a0 == 0) {
+ tgen_gotoi(s, S390_CC_ALWAYS, s->code_gen_epilogue);
+ } else {
+ tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R2, a0);
+ tgen_gotoi(s, S390_CC_ALWAYS, tb_ret_addr);
+ }
break;
case INDEX_op_goto_tb:
@@ -1767,6 +1772,10 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode
opc,
s->tb_jmp_reset_offset[args[0]] = tcg_current_code_size(s);
break;
+ case INDEX_op_goto_ptr:
+ tcg_out_insn(s, RR, BCR, S390_CC_ALWAYS, args[0]);
+ break;
+
OP_32_64(ld8u):
/* ??? LLC (RXY format) is only present with the extended-immediate
facility, whereas LLGC is always present. */
@@ -2241,6 +2250,7 @@ static const TCGTargetOpDef s390_op_defs[] = {
{ INDEX_op_exit_tb, { } },
{ INDEX_op_goto_tb, { } },
{ INDEX_op_br, { } },
+ { INDEX_op_goto_ptr, { "r" } },
{ INDEX_op_ld8u_i32, { "r", "r" } },
{ INDEX_op_ld8s_i32, { "r", "r" } },
@@ -2439,6 +2449,14 @@ static void tcg_target_qemu_prologue(TCGContext *s)
/* br %r3 (go to TB) */
tcg_out_insn(s, RR, BCR, S390_CC_ALWAYS, tcg_target_call_iarg_regs[1]);
+ /*
+ * Return path for goto_ptr. Set return value to 0, a-la exit_tb,
+ * and fall through to the rest of the epilogue.
+ */
+ s->code_gen_epilogue = s->code_ptr;
+ tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R2, 0);
+
+ /* TB epilogue */
tb_ret_addr = s->code_ptr;
/* lmg %r6,%r15,fs+48(%r15) (restore registers) */
--
2.9.4
- [Qemu-devel] [PATCH v7 03/26] qemu/atomic: Loosen restrictions for 64-bit ILP32 hosts, (continued)
- [Qemu-devel] [PATCH v7 03/26] qemu/atomic: Loosen restrictions for 64-bit ILP32 hosts, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 05/26] tcg/i386: implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 06/26] target/arm: optimize cross-page direct jumps in softmmu, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 04/26] tcg: Introduce goto_ptr opcode and tcg_gen_lookup_and_goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 07/26] target/arm: optimize indirect branches, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 08/26] target/i386: introduce gen_jr helper to generate lookup_and_goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 09/26] target/i386: optimize cross-page direct jumps in softmmu, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 10/26] target/i386: optimize indirect branches, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 12/26] tcg/ppc: Implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 11/26] tb-hash: improve tb_jmp_cache hash function in user mode, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 15/26] tcg/s390: Implement goto_ptr,
Richard Henderson <=
- [Qemu-devel] [PATCH v7 14/26] tcg/sparc: Implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 13/26] tcg/aarch64: Implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 17/26] tcg/arm: Implement goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 19/26] target/s390: Use tcg_gen_lookup_and_goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 16/26] tcg/arm: Clarify tcg_out_bx for arm4 host, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 20/26] target/hppa: Use tcg_gen_lookup_and_goto_ptr, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 21/26] target/aarch64: optimize cross-page direct jumps in softmmu, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 22/26] target/aarch64: optimize indirect branches, Richard Henderson, 2017/05/26
- [Qemu-devel] [PATCH v7 23/26] target/mips: optimize cross-page direct jumps in softmmu, Richard Henderson, 2017/05/26