From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v4 06/43] tcg: Move tcg epilogue pointer out of TCGContext
Date: Mon, 14 Dec 2020 08:02:37 -0600 [thread overview]
Message-ID: <20201214140314.18544-7-richard.henderson@linaro.org> (raw)
In-Reply-To: <20201214140314.18544-1-richard.henderson@linaro.org>
This value is constant across all thread-local copies of TCGContext,
so we might as well move it out of thread-local storage.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/tcg/tcg.h | 2 +-
accel/tcg/tcg-runtime.c | 2 +-
tcg/tcg.c | 3 ++-
tcg/aarch64/tcg-target.c.inc | 4 ++--
tcg/arm/tcg-target.c.inc | 2 +-
tcg/i386/tcg-target.c.inc | 4 ++--
tcg/mips/tcg-target.c.inc | 2 +-
tcg/ppc/tcg-target.c.inc | 2 +-
tcg/riscv/tcg-target.c.inc | 4 ++--
tcg/s390/tcg-target.c.inc | 4 ++--
tcg/sparc/tcg-target.c.inc | 2 +-
11 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index 9cc412f90c..bb1e97b13b 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -621,7 +621,6 @@ struct TCGContext {
here, because there's too much arithmetic throughout that relies
on addition and subtraction working on bytes. Rely on the GCC
extension that allows arithmetic on void*. */
- void *code_gen_epilogue;
void *code_gen_buffer;
size_t code_gen_buffer_size;
void *code_gen_ptr;
@@ -678,6 +677,7 @@ struct TCGContext {
extern TCGContext tcg_init_ctx;
extern __thread TCGContext *tcg_ctx;
+extern void *tcg_code_gen_epilogue;
extern TCGv_env cpu_env;
static inline size_t temp_idx(TCGTemp *ts)
diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c
index 446465a09a..f85dfefeab 100644
--- a/accel/tcg/tcg-runtime.c
+++ b/accel/tcg/tcg-runtime.c
@@ -154,7 +154,7 @@ void *HELPER(lookup_tb_ptr)(CPUArchState *env)
tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags, curr_cflags());
if (tb == NULL) {
- return tcg_ctx->code_gen_epilogue;
+ return tcg_code_gen_epilogue;
}
qemu_log_mask_and_addr(CPU_LOG_EXEC, pc,
"Chain %d: %p ["
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 67065c2ede..588686617d 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -161,6 +161,7 @@ static int tcg_out_ldst_finalize(TCGContext *s);
static TCGContext **tcg_ctxs;
static unsigned int n_tcg_ctxs;
TCGv_env cpu_env = 0;
+void *tcg_code_gen_epilogue;
#ifndef CONFIG_TCG_INTERPRETER
tcg_prologue_fn *tcg_qemu_tb_exec;
@@ -1133,7 +1134,7 @@ void tcg_prologue_init(TCGContext *s)
/* Assert that goto_ptr is implemented completely. */
if (TCG_TARGET_HAS_goto_ptr) {
- tcg_debug_assert(s->code_gen_epilogue != NULL);
+ tcg_debug_assert(tcg_code_gen_epilogue != NULL);
}
}
diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
index 83af3108a4..76f8ae48ad 100644
--- a/tcg/aarch64/tcg-target.c.inc
+++ b/tcg/aarch64/tcg-target.c.inc
@@ -1873,7 +1873,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
case INDEX_op_exit_tb:
/* Reuse the zeroing that exists for goto_ptr. */
if (a0 == 0) {
- tcg_out_goto_long(s, s->code_gen_epilogue);
+ tcg_out_goto_long(s, tcg_code_gen_epilogue);
} else {
tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_X0, a0);
tcg_out_goto_long(s, tb_ret_addr);
@@ -2894,7 +2894,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
* 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_code_gen_epilogue = s->code_ptr;
tcg_out_movi(s, TCG_TYPE_REG, TCG_REG_X0, 0);
/* TB epilogue */
diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc
index 62c37a954b..1e32bf42b8 100644
--- a/tcg/arm/tcg-target.c.inc
+++ b/tcg/arm/tcg-target.c.inc
@@ -2297,7 +2297,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
* 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_code_gen_epilogue = s->code_ptr;
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R0, 0);
tcg_out_epilogue(s);
}
diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc
index d8797ed398..424dd1cdcf 100644
--- a/tcg/i386/tcg-target.c.inc
+++ b/tcg/i386/tcg-target.c.inc
@@ -2267,7 +2267,7 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
case INDEX_op_exit_tb:
/* Reuse the zeroing that exists for goto_ptr. */
if (a0 == 0) {
- tcg_out_jmp(s, s->code_gen_epilogue);
+ tcg_out_jmp(s, tcg_code_gen_epilogue);
} else {
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_EAX, a0);
tcg_out_jmp(s, tb_ret_addr);
@@ -3825,7 +3825,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
* 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_code_gen_epilogue = s->code_ptr;
tcg_out_movi(s, TCG_TYPE_REG, TCG_REG_EAX, 0);
/* TB epilogue */
diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc
index c255ecb444..f641105f9a 100644
--- a/tcg/mips/tcg-target.c.inc
+++ b/tcg/mips/tcg-target.c.inc
@@ -2483,7 +2483,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
* 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_code_gen_epilogue = s->code_ptr;
tcg_out_mov(s, TCG_TYPE_REG, TCG_REG_V0, TCG_REG_ZERO);
/* TB epilogue */
diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
index b756281042..15d5c78798 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -2341,7 +2341,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
tcg_out32(s, BCCTR | BO_ALWAYS);
/* Epilogue */
- s->code_gen_epilogue = tb_ret_addr = s->code_ptr;
+ tcg_code_gen_epilogue = tb_ret_addr = s->code_ptr;
tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_R0, TCG_REG_R1, FRAME_SIZE+LR_OFFSET);
for (i = 0; i < ARRAY_SIZE(tcg_target_callee_save_regs); ++i) {
diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc
index d536f3ccc1..ab08af7457 100644
--- a/tcg/riscv/tcg-target.c.inc
+++ b/tcg/riscv/tcg-target.c.inc
@@ -1288,7 +1288,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,
case INDEX_op_exit_tb:
/* Reuse the zeroing that exists for goto_ptr. */
if (a0 == 0) {
- tcg_out_call_int(s, s->code_gen_epilogue, true);
+ tcg_out_call_int(s, tcg_code_gen_epilogue, true);
} else {
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_A0, a0);
tcg_out_call_int(s, tb_ret_addr, true);
@@ -1822,7 +1822,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
tcg_out_opc_imm(s, OPC_JALR, TCG_REG_ZERO, tcg_target_call_iarg_regs[1], 0);
/* Return path for goto_ptr. Set return value to 0 */
- s->code_gen_epilogue = s->code_ptr;
+ tcg_code_gen_epilogue = s->code_ptr;
tcg_out_mov(s, TCG_TYPE_REG, TCG_REG_A0, TCG_REG_ZERO);
/* TB epilogue */
diff --git a/tcg/s390/tcg-target.c.inc b/tcg/s390/tcg-target.c.inc
index c5e096449b..ac99ccea73 100644
--- a/tcg/s390/tcg-target.c.inc
+++ b/tcg/s390/tcg-target.c.inc
@@ -1756,7 +1756,7 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
/* Reuse the zeroing that exists for goto_ptr. */
a0 = args[0];
if (a0 == 0) {
- tgen_gotoi(s, S390_CC_ALWAYS, s->code_gen_epilogue);
+ tgen_gotoi(s, S390_CC_ALWAYS, tcg_code_gen_epilogue);
} else {
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R2, a0);
tgen_gotoi(s, S390_CC_ALWAYS, tb_ret_addr);
@@ -2561,7 +2561,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
* 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_code_gen_epilogue = s->code_ptr;
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R2, 0);
/* TB epilogue */
diff --git a/tcg/sparc/tcg-target.c.inc b/tcg/sparc/tcg-target.c.inc
index 6e2d755f6a..5b3bc91b05 100644
--- a/tcg/sparc/tcg-target.c.inc
+++ b/tcg/sparc/tcg-target.c.inc
@@ -1038,7 +1038,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
tcg_out_nop(s);
/* Epilogue for goto_ptr. */
- s->code_gen_epilogue = s->code_ptr;
+ tcg_code_gen_epilogue = s->code_ptr;
tcg_out_arithi(s, TCG_REG_G0, TCG_REG_I7, 8, RETURN);
/* delay slot */
tcg_out_movi_imm13(s, TCG_REG_O0, 0);
--
2.25.1
next prev parent reply other threads:[~2020-12-14 14:12 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 14:02 [PATCH v4 00/43] Mirror map JIT memory for TCG Richard Henderson
2020-12-14 14:02 ` [PATCH v4 01/43] tcg: Do not flush icache for interpreter Richard Henderson
2020-12-14 21:17 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 02/43] util: Extract flush_icache_range to cacheflush.c Richard Henderson
2020-12-14 21:59 ` Philippe Mathieu-Daudé
2020-12-15 1:41 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 03/43] util: Enhance flush_icache_range with separate data pointer Richard Henderson
2020-12-15 1:43 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 04/43] util: Specialize flush_idcache_range for aarch64 Richard Henderson
2020-12-15 1:46 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 05/43] tcg: Move tcg prologue pointer out of TCGContext Richard Henderson
2020-12-14 22:01 ` Philippe Mathieu-Daudé
2020-12-15 1:48 ` Joelle van Dyne
2020-12-14 14:02 ` Richard Henderson [this message]
2020-12-15 1:54 ` [PATCH v4 06/43] tcg: Move tcg epilogue " Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 07/43] tcg: Add in_code_gen_buffer Richard Henderson
2020-12-14 22:09 ` Philippe Mathieu-Daudé
2020-12-15 22:43 ` Richard Henderson
2020-12-15 23:15 ` Philippe Mathieu-Daudé
2020-12-14 14:02 ` [PATCH v4 08/43] tcg: Introduce tcg_splitwx_to_{rx,rw} Richard Henderson
2021-01-02 20:00 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 09/43] tcg: Adjust TCGLabel for const Richard Henderson
2021-01-02 20:01 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 10/43] tcg: Adjust tcg_out_call " Richard Henderson
2020-12-14 22:16 ` Philippe Mathieu-Daudé
2021-01-02 20:02 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 11/43] tcg: Adjust tcg_out_label " Richard Henderson
2020-12-14 22:18 ` Philippe Mathieu-Daudé
2021-01-02 20:03 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 12/43] tcg: Adjust tcg_register_jit " Richard Henderson
2021-01-02 20:03 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 13/43] tcg: Adjust tb_target_set_jmp_target for split-wx Richard Henderson
2021-01-02 20:05 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 14/43] tcg: Make DisasContextBase.tb const Richard Henderson
2020-12-14 22:14 ` Philippe Mathieu-Daudé
2021-01-02 20:05 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 15/43] tcg: Make tb arg to synchronize_from_tb const Richard Henderson
2020-12-14 22:15 ` Philippe Mathieu-Daudé
2021-01-02 20:06 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 16/43] tcg: Use Error with alloc_code_gen_buffer Richard Henderson
2021-01-02 20:09 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 17/43] tcg: Add --accel tcg,split-wx property Richard Henderson
2020-12-15 2:05 ` Joelle van Dyne
2020-12-15 22:50 ` Richard Henderson
2020-12-14 14:02 ` [PATCH v4 18/43] accel/tcg: Support split-wx for linux with memfd Richard Henderson
2021-01-02 20:11 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 19/43] accel/tcg: Support split-wx for darwin/iOS with vm_remap Richard Henderson
2021-01-05 6:02 ` Joelle van Dyne
2021-01-05 16:57 ` Richard Henderson
2020-12-14 14:02 ` [PATCH v4 20/43] tcg: Return the TB pointer from the rx region from exit_tb Richard Henderson
2021-01-02 20:14 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 21/43] tcg/i386: Support split-wx code generation Richard Henderson
2021-01-02 20:15 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 22/43] tcg/aarch64: Use B not BL for tcg_out_goto_long Richard Henderson
2021-01-02 20:15 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 23/43] tcg/aarch64: Support split-wx code generation Richard Henderson
2021-01-02 20:16 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 24/43] disas: Push const down through host disasassembly Richard Henderson
2020-12-14 22:13 ` Philippe Mathieu-Daudé
2021-01-02 20:18 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 25/43] tcg/tci: Push const down through bytecode reading Richard Henderson
2021-01-02 20:19 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 26/43] tcg: Introduce tcg_tbrel_diff Richard Henderson
2021-01-02 20:19 ` Joelle van Dyne
2020-12-14 14:02 ` [PATCH v4 27/43] tcg/ppc: Use tcg_tbrel_diff Richard Henderson
2020-12-14 14:02 ` [PATCH v4 28/43] tcg/ppc: Use tcg_out_mem_long to reset TCG_REG_TB Richard Henderson
2020-12-14 14:03 ` [PATCH v4 29/43] tcg/ppc: Support split-wx code generation Richard Henderson
2020-12-14 14:03 ` [PATCH v4 30/43] tcg/sparc: Use tcg_tbrel_diff Richard Henderson
2020-12-14 14:03 ` [PATCH v4 31/43] tcg/sparc: Support split-wx code generation Richard Henderson
2020-12-14 14:03 ` [PATCH v4 32/43] tcg/s390: Use tcg_tbrel_diff Richard Henderson
2020-12-14 14:03 ` [PATCH v4 33/43] tcg/s390: Support split-wx code generation Richard Henderson
2020-12-14 14:03 ` [PATCH v4 34/43] tcg/riscv: Fix branch range checks Richard Henderson
2020-12-15 17:29 ` Alistair Francis
2020-12-14 14:03 ` [PATCH v4 35/43] tcg/riscv: Remove branch-over-branch fallback Richard Henderson
2020-12-15 17:30 ` Alistair Francis
2020-12-14 14:03 ` [PATCH v4 36/43] tcg/riscv: Support split-wx code generation Richard Henderson
2020-12-15 17:31 ` Alistair Francis
2020-12-14 14:03 ` [PATCH v4 37/43] accel/tcg: Add mips support to alloc_code_gen_buffer_splitwx_memfd Richard Henderson
2020-12-14 14:03 ` [PATCH v4 38/43] tcg/mips: Do not assert on relocation overflow Richard Henderson
2020-12-14 14:03 ` [PATCH v4 39/43] tcg/mips: Support split-wx code generation Richard Henderson
2020-12-14 14:03 ` [PATCH v4 40/43] tcg/arm: " Richard Henderson
2020-12-14 14:03 ` [PATCH v4 41/43] tcg: Remove TCG_TARGET_SUPPORT_MIRROR Richard Henderson
2021-01-02 20:22 ` Joelle van Dyne
2020-12-14 14:03 ` [PATCH v4 42/43] tcg: Constify tcg_code_gen_epilogue Richard Henderson
2021-01-02 20:23 ` Joelle van Dyne
2020-12-14 14:03 ` [PATCH v4 43/43] tcg: Constify TCGLabelQemuLdst.raddr Richard Henderson
2021-01-02 20:24 ` Joelle van Dyne
2020-12-14 21:01 ` [PATCH v4 00/43] Mirror map JIT memory for TCG no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201214140314.18544-7-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).