[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 20/28] tcg: Move in_code_gen_buffer and tests to region.c
From: |
Richard Henderson |
Subject: |
[PATCH v3 20/28] tcg: Move in_code_gen_buffer and tests to region.c |
Date: |
Sun, 2 May 2021 16:18:36 -0700 |
Shortly, the full code_gen_buffer will only be visible
to region.c, so move in_code_gen_buffer out-of-line.
Move the debugging versions of tcg_splitwx_to_{rx,rw}
to region.c as well, so that the compiler gets to see
the implementation of in_code_gen_buffer.
This leaves exactly one use of in_code_gen_buffer outside
of region.c, in cpu_restore_state. Which, being on the
exception path, is not performance critical.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/tcg/tcg.h | 11 +----------
tcg/region.c | 34 ++++++++++++++++++++++++++++++++++
tcg/tcg.c | 23 -----------------------
3 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index a0122c0dd3..a19deb529f 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -696,16 +696,7 @@ extern const void *tcg_code_gen_epilogue;
extern uintptr_t tcg_splitwx_diff;
extern TCGv_env cpu_env;
-static inline bool in_code_gen_buffer(const void *p)
-{
- const TCGContext *s = &tcg_init_ctx;
- /*
- * Much like it is valid to have a pointer to the byte past the
- * end of an array (so long as you don't dereference it), allow
- * a pointer to the byte past the end of the code gen buffer.
- */
- return (size_t)(p - s->code_gen_buffer) <= s->code_gen_buffer_size;
-}
+bool in_code_gen_buffer(const void *p);
#ifdef CONFIG_DEBUG_TCG
const void *tcg_splitwx_to_rx(void *rw);
diff --git a/tcg/region.c b/tcg/region.c
index 652f328d2c..893256f9f4 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -68,6 +68,40 @@ static struct tcg_region_state region;
static void *region_trees;
static size_t tree_size;
+bool in_code_gen_buffer(const void *p)
+{
+ const TCGContext *s = &tcg_init_ctx;
+ /*
+ * Much like it is valid to have a pointer to the byte past the
+ * end of an array (so long as you don't dereference it), allow
+ * a pointer to the byte past the end of the code gen buffer.
+ */
+ return (size_t)(p - s->code_gen_buffer) <= s->code_gen_buffer_size;
+}
+
+#ifdef CONFIG_DEBUG_TCG
+const void *tcg_splitwx_to_rx(void *rw)
+{
+ /* Pass NULL pointers unchanged. */
+ if (rw) {
+ g_assert(in_code_gen_buffer(rw));
+ rw += tcg_splitwx_diff;
+ }
+ return rw;
+}
+
+void *tcg_splitwx_to_rw(const void *rx)
+{
+ /* Pass NULL pointers unchanged. */
+ if (rx) {
+ rx -= tcg_splitwx_diff;
+ /* Assert that we end with a pointer in the rw region. */
+ g_assert(in_code_gen_buffer(rx));
+ }
+ return (void *)rx;
+}
+#endif /* CONFIG_DEBUG_TCG */
+
/* compare a pointer @ptr and a tb_tc @s */
static int ptr_cmp_tb_tc(const void *ptr, const struct tb_tc *s)
{
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 0926454845..212df31622 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -419,29 +419,6 @@ static const TCGTargetOpDef constraint_sets[] = {
#include "tcg-target.c.inc"
-#ifdef CONFIG_DEBUG_TCG
-const void *tcg_splitwx_to_rx(void *rw)
-{
- /* Pass NULL pointers unchanged. */
- if (rw) {
- g_assert(in_code_gen_buffer(rw));
- rw += tcg_splitwx_diff;
- }
- return rw;
-}
-
-void *tcg_splitwx_to_rw(const void *rx)
-{
- /* Pass NULL pointers unchanged. */
- if (rx) {
- rx -= tcg_splitwx_diff;
- /* Assert that we end with a pointer in the rw region. */
- g_assert(in_code_gen_buffer(rx));
- }
- return (void *)rx;
-}
-#endif /* CONFIG_DEBUG_TCG */
-
static void alloc_tcg_plugin_context(TCGContext *s)
{
#ifdef CONFIG_PLUGIN
--
2.25.1
- [PATCH v3 10/28] accel/tcg: Rename tcg_init to tcg_init_machine, (continued)
- [PATCH v3 10/28] accel/tcg: Rename tcg_init to tcg_init_machine, Richard Henderson, 2021/05/02
- [PATCH v3 07/28] tcg: Split out region.c, Richard Henderson, 2021/05/02
- [PATCH v3 15/28] tcg: Move MAX_CODE_GEN_BUFFER_SIZE to tcg-target.h, Richard Henderson, 2021/05/02
- [PATCH v3 11/28] tcg: Create tcg_init, Richard Henderson, 2021/05/02
- [PATCH v3 18/28] tcg: Tidy tcg_n_regions, Richard Henderson, 2021/05/02
- [PATCH v3 16/28] tcg: Replace region.end with region.total_size, Richard Henderson, 2021/05/02
- [PATCH v3 24/28] util/osdep: Add qemu_mprotect_rw, Richard Henderson, 2021/05/02
- [PATCH v3 17/28] tcg: Rename region.start to region.after_prologue, Richard Henderson, 2021/05/02
- [PATCH v3 22/28] tcg: Return the map protection from alloc_code_gen_buffer, Richard Henderson, 2021/05/02
- [PATCH v3 21/28] tcg: Allocate code_gen_buffer into struct tcg_region_state, Richard Henderson, 2021/05/02
- [PATCH v3 20/28] tcg: Move in_code_gen_buffer and tests to region.c,
Richard Henderson <=
- [PATCH v3 23/28] tcg: Sink qemu_madvise call to common code, Richard Henderson, 2021/05/02
- [PATCH v3 27/28] tcg: When allocating for !splitwx, begin with PROT_NONE, Richard Henderson, 2021/05/02
- [PATCH v3 28/28] tcg: Move tcg_init_ctx and tcg_ctx from accel/tcg/, Richard Henderson, 2021/05/02
- [PATCH v3 19/28] tcg: Tidy split_cross_256mb, Richard Henderson, 2021/05/02
- [PATCH v3 26/28] tcg: Merge buffer protection and guard page protection, Richard Henderson, 2021/05/02
- [PATCH v3 09/28] accel/tcg: Move alloc_code_gen_buffer to tcg/region.c, Richard Henderson, 2021/05/02
- [PATCH v3 12/28] accel/tcg: Merge tcg_exec_init into tcg_init_machine, Richard Henderson, 2021/05/02
- [PATCH v3 13/28] accel/tcg: Pass down max_cpus to tcg_init, Richard Henderson, 2021/05/02
- [PATCH v3 14/28] tcg: Introduce tcg_max_ctxs, Richard Henderson, 2021/05/02
- [PATCH v3 25/28] tcg: Round the tb_size default from qemu_get_host_physmem, Richard Henderson, 2021/05/02