From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [PULL v2 09/12] exec: Cache TARGET_PAGE_MASK for TARGET_PAGE_BITS_VARY
Date: Mon, 28 Oct 2019 15:59:34 +0100 [thread overview]
Message-ID: <20191028145937.10914-10-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191028145937.10914-1-richard.henderson@linaro.org>
This eliminates a set of runtime shifts. It turns out that we
require TARGET_PAGE_MASK more often than TARGET_PAGE_SIZE, so
redefine TARGET_PAGE_SIZE based on TARGET_PAGE_MASK instead of
the other way around.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu-all.h | 8 ++++++--
exec-vary.c | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 0543359d0f..e96781a455 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -213,6 +213,7 @@ static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val
typedef struct {
bool decided;
int bits;
+ target_long mask;
} TargetPageBits;
#if defined(CONFIG_ATTRIBUTE_ALIAS) || !defined(IN_EXEC_VARY)
extern const TargetPageBits target_page;
@@ -221,15 +222,18 @@ extern TargetPageBits target_page;
#endif
#ifdef CONFIG_DEBUG_TCG
#define TARGET_PAGE_BITS ({ assert(target_page.decided); target_page.bits; })
+#define TARGET_PAGE_MASK ({ assert(target_page.decided); target_page.mask; })
#else
#define TARGET_PAGE_BITS target_page.bits
+#define TARGET_PAGE_MASK target_page.mask
#endif
+#define TARGET_PAGE_SIZE (-(int)TARGET_PAGE_MASK)
#else
#define TARGET_PAGE_BITS_MIN TARGET_PAGE_BITS
+#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)
+#define TARGET_PAGE_MASK ((target_long)-1 << TARGET_PAGE_BITS)
#endif
-#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)
-#define TARGET_PAGE_MASK ((target_long)-1 << TARGET_PAGE_BITS)
#define TARGET_PAGE_ALIGN(addr) ROUND_UP((addr), TARGET_PAGE_SIZE)
/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
diff --git a/exec-vary.c b/exec-vary.c
index 8725fd0285..ff905f2a8f 100644
--- a/exec-vary.c
+++ b/exec-vary.c
@@ -96,6 +96,7 @@ void finalize_target_page_bits(void)
if (init_target_page.bits == 0) {
init_target_page.bits = TARGET_PAGE_BITS_MIN;
}
+ init_target_page.mask = (target_long)-1 << init_target_page.bits;
init_target_page.decided = true;
/*
--
2.17.1
next prev parent reply other threads:[~2019-10-28 15:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 14:59 [PULL v2 00/12] tcg patch queue Richard Henderson
2019-10-28 14:59 ` [PULL v2 01/12] tci: Add implementation for INDEX_op_ld16u_i64 Richard Henderson
2019-10-28 14:59 ` [PULL v2 02/12] cputlb: ensure _cmmu helper functions follow the naming standard Richard Henderson
2019-10-28 14:59 ` [PULL v2 03/12] cpu: use ROUND_UP() to define xxx_PAGE_ALIGN Richard Henderson
2019-10-28 14:59 ` [PULL v2 04/12] exec: Split out variable page size support to exec-vary.c Richard Henderson
2019-10-28 14:59 ` [PULL v2 05/12] configure: Detect compiler support for __attribute__((alias)) Richard Henderson
2019-10-28 14:59 ` [PULL v2 06/12] exec: Use const alias for TARGET_PAGE_BITS_VARY Richard Henderson
2019-10-28 14:59 ` [PULL v2 07/12] exec: Restrict TARGET_PAGE_BITS_VARY assert to CONFIG_DEBUG_TCG Richard Henderson
2019-10-28 14:59 ` [PULL v2 08/12] exec: Promote TARGET_PAGE_MASK to target_long Richard Henderson
2019-10-28 14:59 ` Richard Henderson [this message]
2019-10-28 14:59 ` [PULL v2 10/12] cputlb: Fix tlb_vaddr_to_host Richard Henderson
2019-10-28 14:59 ` [PULL v2 11/12] translate-all: fix uninitialized tb->orig_tb Richard Henderson
2019-10-28 14:59 ` [PULL v2 12/12] translate-all: Remove tb_alloc Richard Henderson
2019-10-28 17:20 ` [PULL v2 00/12] tcg patch queue no-reply
2019-10-29 15:32 ` Peter Maydell
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=20191028145937.10914-10-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@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).