[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 19/28] tcg: Tidy split_cross_256mb
From: |
Richard Henderson |
Subject: |
[PATCH v3 19/28] tcg: Tidy split_cross_256mb |
Date: |
Sun, 2 May 2021 16:18:35 -0700 |
Return output buffer and size via output pointer arguments,
rather than returning size via tcg_ctx->code_gen_buffer_size.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/region.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/tcg/region.c b/tcg/region.c
index b44246e1aa..652f328d2c 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -467,7 +467,8 @@ static inline bool cross_256mb(void *addr, size_t size)
/* We weren't able to allocate a buffer without crossing that boundary,
so make do with the larger portion of the buffer that doesn't cross.
Returns the new base of the buffer, and adjusts code_gen_buffer_size. */
-static inline void *split_cross_256mb(void *buf1, size_t size1)
+static inline void split_cross_256mb(void **obuf, size_t *osize,
+ void *buf1, size_t size1)
{
void *buf2 = (void *)(((uintptr_t)buf1 + size1) & ~0x0ffffffful);
size_t size2 = buf1 + size1 - buf2;
@@ -478,8 +479,8 @@ static inline void *split_cross_256mb(void *buf1, size_t
size1)
buf1 = buf2;
}
- tcg_ctx->code_gen_buffer_size = size1;
- return buf1;
+ *obuf = buf1;
+ *osize = size1;
}
#endif
@@ -509,12 +510,10 @@ static bool alloc_code_gen_buffer(size_t tb_size, int
splitwx, Error **errp)
if (size > tb_size) {
size = QEMU_ALIGN_DOWN(tb_size, qemu_real_host_page_size);
}
- tcg_ctx->code_gen_buffer_size = size;
#ifdef __mips__
if (cross_256mb(buf, size)) {
- buf = split_cross_256mb(buf, size);
- size = tcg_ctx->code_gen_buffer_size;
+ split_cross_256mb(&buf, &size, buf, size);
}
#endif
@@ -525,6 +524,7 @@ static bool alloc_code_gen_buffer(size_t tb_size, int
splitwx, Error **errp)
qemu_madvise(buf, size, QEMU_MADV_HUGEPAGE);
tcg_ctx->code_gen_buffer = buf;
+ tcg_ctx->code_gen_buffer_size = size;
return true;
}
#elif defined(_WIN32)
@@ -583,8 +583,7 @@ static bool alloc_code_gen_buffer_anon(size_t size, int
prot,
/* fallthru */
default:
/* Split the original buffer. Free the smaller half. */
- buf2 = split_cross_256mb(buf, size);
- size2 = tcg_ctx->code_gen_buffer_size;
+ split_cross_256mb(&buf2, &size2, buf, size);
if (buf == buf2) {
munmap(buf + size2, size - size2);
} else {
--
2.25.1
- [PATCH v3 18/28] tcg: Tidy tcg_n_regions, (continued)
- [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, 2021/05/02
- [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 <=
- [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
- Re: [PATCH v3 00/28] tcg: Clean up code_gen_buffer allocation, no-reply, 2021/05/02