From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v4 12/43] tcg: Adjust tcg_register_jit for const
Date: Mon, 14 Dec 2020 08:02:43 -0600 [thread overview]
Message-ID: <20201214140314.18544-13-richard.henderson@linaro.org> (raw)
In-Reply-To: <20201214140314.18544-1-richard.henderson@linaro.org>
We must change all targets at once, since all must match
the declaration in tcg.c.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/tcg/tcg.h | 2 +-
tcg/tcg.c | 10 +++++-----
tcg/aarch64/tcg-target.c.inc | 2 +-
tcg/arm/tcg-target.c.inc | 2 +-
tcg/i386/tcg-target.c.inc | 2 +-
tcg/mips/tcg-target.c.inc | 2 +-
tcg/ppc/tcg-target.c.inc | 2 +-
tcg/riscv/tcg-target.c.inc | 2 +-
tcg/s390/tcg-target.c.inc | 2 +-
tcg/sparc/tcg-target.c.inc | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index b2ba16ea8c..67d57695c2 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -1250,7 +1250,7 @@ typedef uintptr_t tcg_prologue_fn(CPUArchState *env, const void *tb_ptr);
extern tcg_prologue_fn *tcg_qemu_tb_exec;
#endif
-void tcg_register_jit(void *buf, size_t buf_size);
+void tcg_register_jit(const void *buf, size_t buf_size);
#if TCG_TARGET_MAYBE_vec
/* Return zero if the tuple (opc, type, vece) is unsupportable;
diff --git a/tcg/tcg.c b/tcg/tcg.c
index d94d38cc28..5f585c2ed2 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -97,7 +97,7 @@ typedef struct QEMU_PACKED {
DebugFrameFDEHeader fde;
} DebugFrameHeader;
-static void tcg_register_jit_int(void *buf, size_t size,
+static void tcg_register_jit_int(const void *buf, size_t size,
const void *debug_frame,
size_t debug_frame_size)
__attribute__((unused));
@@ -1137,7 +1137,7 @@ void tcg_prologue_init(TCGContext *s)
total_size -= prologue_size;
s->code_gen_buffer_size = total_size;
- tcg_register_jit(s->code_gen_buffer, total_size);
+ tcg_register_jit(tcg_splitwx_to_rx(s->code_gen_buffer), total_size);
#ifdef DEBUG_DISAS
if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM)) {
@@ -4507,7 +4507,7 @@ static int find_string(const char *strtab, const char *str)
}
}
-static void tcg_register_jit_int(void *buf_ptr, size_t buf_size,
+static void tcg_register_jit_int(const void *buf_ptr, size_t buf_size,
const void *debug_frame,
size_t debug_frame_size)
{
@@ -4709,13 +4709,13 @@ static void tcg_register_jit_int(void *buf_ptr, size_t buf_size,
/* No support for the feature. Provide the entry point expected by exec.c,
and implement the internal function we declared earlier. */
-static void tcg_register_jit_int(void *buf, size_t size,
+static void tcg_register_jit_int(const void *buf, size_t size,
const void *debug_frame,
size_t debug_frame_size)
{
}
-void tcg_register_jit(void *buf, size_t buf_size)
+void tcg_register_jit(const void *buf, size_t buf_size)
{
}
#endif /* ELF_HOST_MACHINE */
diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
index 6d8152c468..9ace859db3 100644
--- a/tcg/aarch64/tcg-target.c.inc
+++ b/tcg/aarch64/tcg-target.c.inc
@@ -2964,7 +2964,7 @@ static const DebugFrame debug_frame = {
}
};
-void tcg_register_jit(void *buf, size_t buf_size)
+void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc
index a197e6bc45..9b9400f164 100644
--- a/tcg/arm/tcg-target.c.inc
+++ b/tcg/arm/tcg-target.c.inc
@@ -2353,7 +2353,7 @@ static const DebugFrame debug_frame = {
}
};
-void tcg_register_jit(void *buf, size_t buf_size)
+void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc
index 0ac1ef3d82..7f74c77d7f 100644
--- a/tcg/i386/tcg-target.c.inc
+++ b/tcg/i386/tcg-target.c.inc
@@ -3998,7 +3998,7 @@ static const DebugFrame debug_frame = {
#endif
#if defined(ELF_HOST_MACHINE)
-void tcg_register_jit(void *buf, size_t buf_size)
+void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc
index 6d2c369a85..e9c8c24741 100644
--- a/tcg/mips/tcg-target.c.inc
+++ b/tcg/mips/tcg-target.c.inc
@@ -2703,7 +2703,7 @@ static const DebugFrame debug_frame = {
}
};
-void tcg_register_jit(void *buf, size_t buf_size)
+void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
index 38dabe40c4..a0a5bac13f 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -3847,7 +3847,7 @@ static DebugFrame debug_frame = {
}
};
-void tcg_register_jit(void *buf, size_t buf_size)
+void tcg_register_jit(const void *buf, size_t buf_size)
{
uint8_t *p = &debug_frame.fde_reg_ofs[3];
int i;
diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc
index 4416a93e1f..025e3cd0bb 100644
--- a/tcg/riscv/tcg-target.c.inc
+++ b/tcg/riscv/tcg-target.c.inc
@@ -1907,7 +1907,7 @@ static const DebugFrame debug_frame = {
}
};
-void tcg_register_jit(void *buf, size_t buf_size)
+void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
diff --git a/tcg/s390/tcg-target.c.inc b/tcg/s390/tcg-target.c.inc
index 37f4dc4cfd..1444914428 100644
--- a/tcg/s390/tcg-target.c.inc
+++ b/tcg/s390/tcg-target.c.inc
@@ -2620,7 +2620,7 @@ static const DebugFrame debug_frame = {
}
};
-void tcg_register_jit(void *buf, size_t buf_size)
+void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
diff --git a/tcg/sparc/tcg-target.c.inc b/tcg/sparc/tcg-target.c.inc
index 1a40911660..4c81d5f1c2 100644
--- a/tcg/sparc/tcg-target.c.inc
+++ b/tcg/sparc/tcg-target.c.inc
@@ -1816,7 +1816,7 @@ static const DebugFrame debug_frame = {
.fde_ret_save = { 9, 15, 31 }, /* DW_CFA_register o7, i7 */
};
-void tcg_register_jit(void *buf, size_t buf_size)
+void tcg_register_jit(const void *buf, size_t buf_size)
{
tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame));
}
--
2.25.1
next prev parent reply other threads:[~2020-12-14 14:06 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 ` [PATCH v4 06/43] tcg: Move tcg epilogue " Richard Henderson
2020-12-15 1:54 ` 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 ` Richard Henderson [this message]
2021-01-02 20:03 ` [PATCH v4 12/43] tcg: Adjust tcg_register_jit " 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-13-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).