[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 18/20] util: move qemu_real_host_page_size/mask to
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL v2 18/20] util: move qemu_real_host_page_size/mask to osdep.h |
Date: |
Tue, 10 Oct 2017 12:30:01 -0700 |
From: "Emilio G. Cota" <address@hidden>
These only depend on the host and therefore belong in the common
osdep, not in a target-dependent object.
While at it, query the host during an init constructor, which guarantees
the page size will be well-defined throughout the execution of the program.
Suggested-by: Richard Henderson <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
include/exec/cpu-all.h | 2 --
include/qemu/osdep.h | 6 ++++++
exec.c | 4 ----
util/pagesize.c | 18 ++++++++++++++++++
util/Makefile.objs | 1 +
5 files changed, 25 insertions(+), 6 deletions(-)
create mode 100644 util/pagesize.c
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index ffe43d5654..778031c3d7 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -229,8 +229,6 @@ extern int target_page_bits;
/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
* when intptr_t is 32-bit and we are aligning a long long.
*/
-extern uintptr_t qemu_real_host_page_size;
-extern intptr_t qemu_real_host_page_mask;
extern uintptr_t qemu_host_page_size;
extern intptr_t qemu_host_page_mask;
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 9dd318a7dd..826650c58a 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -505,6 +505,12 @@ char *qemu_get_pid_name(pid_t pid);
*/
pid_t qemu_fork(Error **errp);
+/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
+ * when intptr_t is 32-bit and we are aligning a long long.
+ */
+extern uintptr_t qemu_real_host_page_size;
+extern intptr_t qemu_real_host_page_mask;
+
extern int qemu_icache_linesize;
extern int qemu_dcache_linesize;
diff --git a/exec.c b/exec.c
index 7a80460725..6378714a2b 100644
--- a/exec.c
+++ b/exec.c
@@ -120,8 +120,6 @@ int use_icount;
uintptr_t qemu_host_page_size;
intptr_t qemu_host_page_mask;
-uintptr_t qemu_real_host_page_size;
-intptr_t qemu_real_host_page_mask;
bool set_preferred_target_page_bits(int bits)
{
@@ -3606,8 +3604,6 @@ void page_size_init(void)
{
/* NOTE: we can always suppose that qemu_host_page_size >=
TARGET_PAGE_SIZE */
- qemu_real_host_page_size = getpagesize();
- qemu_real_host_page_mask = -(intptr_t)qemu_real_host_page_size;
if (qemu_host_page_size == 0) {
qemu_host_page_size = qemu_real_host_page_size;
}
diff --git a/util/pagesize.c b/util/pagesize.c
new file mode 100644
index 0000000000..998632cf6e
--- /dev/null
+++ b/util/pagesize.c
@@ -0,0 +1,18 @@
+/*
+ * pagesize.c - query the host about its page size
+ *
+ * Copyright (C) 2017, Emilio G. Cota <address@hidden>
+ * License: GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+
+uintptr_t qemu_real_host_page_size;
+intptr_t qemu_real_host_page_mask;
+
+static void __attribute__((constructor)) init_real_host_page_size(void)
+{
+ qemu_real_host_page_size = getpagesize();
+ qemu_real_host_page_mask = -(intptr_t)qemu_real_host_page_size;
+}
diff --git a/util/Makefile.objs b/util/Makefile.objs
index 50a55ecc75..2973b0a323 100644
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -40,6 +40,7 @@ util-obj-y += buffer.o
util-obj-y += timed-average.o
util-obj-y += base64.o
util-obj-y += log.o
+util-obj-y += pagesize.o
util-obj-y += qdist.o
util-obj-y += qht.o
util-obj-y += range.o
--
2.13.6
- [Qemu-devel] [PULL v2 06/20] tcg/i386: constify tcg_target_callee_save_regs, (continued)
- [Qemu-devel] [PULL v2 06/20] tcg/i386: constify tcg_target_callee_save_regs, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 07/20] tcg/mips: constify tcg_target_callee_save_regs, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 13/20] translate-all: define and use DEBUG_TB_INVALIDATE_GATE, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 10/20] exec-all: bring tb->invalid into tb->cflags, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 09/20] tcg: consolidate TB lookups in tb_lookup__cpu_state, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 11/20] translate-all: define and use DEBUG_TB_FLUSH_GATE, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 08/20] tcg: remove addr argument from lookup_tb_ptr, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 14/20] translate-all: define and use DEBUG_TB_CHECK_GATE, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 17/20] tcg: take .helpers out of TCGContext, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 12/20] exec-all: introduce TB_PAGE_ADDR_FMT, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 18/20] util: move qemu_real_host_page_size/mask to osdep.h,
Richard Henderson <=
- [Qemu-devel] [PULL v2 16/20] tci: move tci_regs to tcg_qemu_tb_exec's stack, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 20/20] tcg/mips: delete commented out extern keyword., Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 15/20] exec-all: extract tb->tc_* into a separate struct tc_tb, Richard Henderson, 2017/10/10
- [Qemu-devel] [PULL v2 19/20] tcg: define TCG_HIGHWATER, Richard Henderson, 2017/10/10
- Re: [Qemu-devel] [PULL v2 00/20] Queued TCG patches, no-reply, 2017/10/10
- Re: [Qemu-devel] [PULL v2 00/20] Queued TCG patches, Peter Maydell, 2017/10/11