[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 40/41] tcg: Constify tcg_code_gen_epilogue
From: |
Richard Henderson |
Subject: |
[PATCH v3 40/41] tcg: Constify tcg_code_gen_epilogue |
Date: |
Thu, 5 Nov 2020 19:29:20 -0800 |
Now that all native tcg hosts support splitwx,
make this pointer const.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/tcg/tcg.h | 2 +-
tcg/tcg.c | 2 +-
tcg/aarch64/tcg-target.c.inc | 3 +--
tcg/arm/tcg-target.c.inc | 3 +--
tcg/i386/tcg-target.c.inc | 3 +--
tcg/mips/tcg-target.c.inc | 3 +--
tcg/ppc/tcg-target.c.inc | 3 +--
tcg/riscv/tcg-target.c.inc | 3 +--
tcg/s390/tcg-target.c.inc | 3 +--
tcg/sparc/tcg-target.c.inc | 3 +--
10 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index 90ec7c1445..477919aeb6 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -677,7 +677,7 @@ struct TCGContext {
extern TCGContext tcg_init_ctx;
extern __thread TCGContext *tcg_ctx;
-extern void *tcg_code_gen_epilogue;
+extern const void *tcg_code_gen_epilogue;
extern uintptr_t tcg_splitwx_diff;
extern TCGv_env cpu_env;
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 07a4bd2c57..5c19b1e6b3 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -160,7 +160,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;
+const void *tcg_code_gen_epilogue;
uintptr_t tcg_splitwx_diff;
#ifndef CONFIG_TCG_INTERPRETER
diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
index e398913c0c..32a60eba5e 100644
--- a/tcg/aarch64/tcg-target.c.inc
+++ b/tcg/aarch64/tcg-target.c.inc
@@ -2900,8 +2900,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.
*/
- /* TODO: Cast goes away when all hosts converted */
- tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr);
+ tcg_code_gen_epilogue = tcg_splitwx_to_rx(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 3d2717aeb0..d6cb19ca9f 100644
--- a/tcg/arm/tcg-target.c.inc
+++ b/tcg/arm/tcg-target.c.inc
@@ -2301,8 +2301,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.
*/
- /* TODO: Cast goes away when all hosts converted */
- tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr);
+ tcg_code_gen_epilogue = tcg_splitwx_to_rx(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 23c7a8a383..be57d2330a 100644
--- a/tcg/i386/tcg-target.c.inc
+++ b/tcg/i386/tcg-target.c.inc
@@ -3826,8 +3826,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.
*/
- /* TODO: Cast goes away when all hosts converted */
- tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr);
+ tcg_code_gen_epilogue = tcg_splitwx_to_rx(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 a2201bd1dd..18fd474593 100644
--- a/tcg/mips/tcg-target.c.inc
+++ b/tcg/mips/tcg-target.c.inc
@@ -2473,8 +2473,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.
*/
- /* TODO: Cast goes away when all hosts converted */
- tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr);
+ tcg_code_gen_epilogue = tcg_splitwx_to_rx(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 fe33687787..3580bbabc1 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -2346,8 +2346,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
tcg_out32(s, BCCTR | BO_ALWAYS);
/* Epilogue */
- /* TODO: Cast goes away when all hosts converted */
- tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr);
+ tcg_code_gen_epilogue = tcg_splitwx_to_rx(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 5c1e0f8fc1..7b4ee4a084 100644
--- a/tcg/riscv/tcg-target.c.inc
+++ b/tcg/riscv/tcg-target.c.inc
@@ -1784,8 +1784,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 */
- /* TODO: Cast goes away when all hosts converted */
- tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr);
+ tcg_code_gen_epilogue = tcg_splitwx_to_rx(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 582a8ef941..b3660ffedf 100644
--- a/tcg/s390/tcg-target.c.inc
+++ b/tcg/s390/tcg-target.c.inc
@@ -2551,8 +2551,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.
*/
- /* TODO: Cast goes away when all hosts converted */
- tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr);
+ tcg_code_gen_epilogue = tcg_splitwx_to_rx(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 182124b96c..922ae96481 100644
--- a/tcg/sparc/tcg-target.c.inc
+++ b/tcg/sparc/tcg-target.c.inc
@@ -1039,8 +1039,7 @@ static void tcg_target_qemu_prologue(TCGContext *s)
tcg_out_nop(s);
/* Epilogue for goto_ptr. */
- /* TODO: Cast goes away when all hosts converted */
- tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr);
+ tcg_code_gen_epilogue = tcg_splitwx_to_rx(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
- [PATCH v3 27/41] tcg/ppc: Support split-wx code generation, (continued)
- [PATCH v3 27/41] tcg/ppc: Support split-wx code generation, Richard Henderson, 2020/11/05
- [PATCH v3 29/41] tcg/sparc: Support split-wx code generation, Richard Henderson, 2020/11/05
- [PATCH v3 35/41] accel/tcg: Add mips support to alloc_code_gen_buffer_splitwx_memfd, Richard Henderson, 2020/11/05
- [PATCH v3 32/41] tcg/riscv: Fix branch range checks, Richard Henderson, 2020/11/05
- [PATCH v3 31/41] tcg/s390: Support split-wx code generation, Richard Henderson, 2020/11/05
- [PATCH v3 36/41] tcg/mips: Do not assert on relocation overflow, Richard Henderson, 2020/11/05
- [PATCH v3 37/41] tcg/mips: Support split-wx code generation, Richard Henderson, 2020/11/05
- [PATCH v3 33/41] tcg/riscv: Remove branch-over-branch fallback, Richard Henderson, 2020/11/05
- [PATCH v3 28/41] tcg/sparc: Use tcg_tbrel_diff, Richard Henderson, 2020/11/05
- [PATCH v3 30/41] tcg/s390: Use tcg_tbrel_diff, Richard Henderson, 2020/11/05
- [PATCH v3 40/41] tcg: Constify tcg_code_gen_epilogue,
Richard Henderson <=
- [PATCH v3 41/41] tcg: Constify TCGLabelQemuLdst.raddr, Richard Henderson, 2020/11/05
- [PATCH v3 34/41] tcg/riscv: Support split-wx code generation, Richard Henderson, 2020/11/05
- [PATCH v3 38/41] tcg/arm: Support split-wx code generation, Richard Henderson, 2020/11/05
- [PATCH v3 39/41] tcg: Remove TCG_TARGET_SUPPORT_MIRROR, Richard Henderson, 2020/11/05
- Re: [PATCH v3 00/41] Mirror map JIT memory for TCG, no-reply, 2020/11/05
- Re: [PATCH v3 00/41] Mirror map JIT memory for TCG, Joelle van Dyne, 2020/11/07
- Re: [PATCH v3 00/41] Mirror map JIT memory for TCG, Joelle van Dyne, 2020/11/16