From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org
Subject: [PATCH 05/26] target/arm: Use translator_use_goto_tb
Date: Sun, 20 Jun 2021 18:34:18 -0700 [thread overview]
Message-ID: <20210621013439.1791385-6-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210621013439.1791385-1-richard.henderson@linaro.org>
Put a wrapper in translate.h, which also checks for ss_active.
The ss_active test was incorrectly missing from the a32 version.
Cc: qemu-arm@nongnu.org
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/translate.h | 13 +++++++++++++
target/arm/translate-a64.c | 22 +---------------------
target/arm/translate.c | 10 ----------
3 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/target/arm/translate.h b/target/arm/translate.h
index 2821b325e3..3a62f50faf 100644
--- a/target/arm/translate.h
+++ b/target/arm/translate.h
@@ -116,6 +116,19 @@ typedef struct DisasContext {
TCGv_i64 tmp_a64[TMP_A64_MAX];
} DisasContext;
+static inline bool use_goto_tb(DisasContext *s, target_ulong dest)
+{
+ /*
+ * No direct tb linking with singlestep.
+ * This handles the ARM debug architecture kind; the QEMU kind
+ * is handled inside translator_use_goto_tb.
+ */
+ if (s->ss_active) {
+ return false;
+ }
+ return translator_use_goto_tb(&s->base, dest);
+}
+
typedef struct DisasCompare {
TCGCond cond;
TCGv_i32 value;
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index 7f74d0e81a..ac58a86e59 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -386,32 +386,12 @@ static void gen_step_complete_exception(DisasContext *s)
s->base.is_jmp = DISAS_NORETURN;
}
-static inline bool use_goto_tb(DisasContext *s, int n, uint64_t dest)
-{
- /* No direct tb linking with singlestep (either QEMU's or the ARM
- * debug architecture kind) or deterministic io
- */
- if (s->base.singlestep_enabled || s->ss_active ||
- (tb_cflags(s->base.tb) & CF_LAST_IO)) {
- return false;
- }
-
-#ifndef CONFIG_USER_ONLY
- /* Only link tbs from inside the same guest page */
- if ((s->base.tb->pc & TARGET_PAGE_MASK) != (dest & TARGET_PAGE_MASK)) {
- return false;
- }
-#endif
-
- return true;
-}
-
static inline void gen_goto_tb(DisasContext *s, int n, uint64_t dest)
{
const TranslationBlock *tb;
tb = s->base.tb;
- if (use_goto_tb(s, n, dest)) {
+ if (use_goto_tb(s, dest)) {
tcg_gen_goto_tb(n);
gen_a64_set_pc_im(dest);
tcg_gen_exit_tb(tb, n);
diff --git a/target/arm/translate.c b/target/arm/translate.c
index 9e2cca7707..3ac7943d86 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -2511,16 +2511,6 @@ static int disas_dsp_insn(DisasContext *s, uint32_t insn)
return 1;
}
-static inline bool use_goto_tb(DisasContext *s, target_ulong dest)
-{
-#ifndef CONFIG_USER_ONLY
- return (s->base.tb->pc & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK) ||
- ((s->base.pc_next - 1) & TARGET_PAGE_MASK) == (dest & TARGET_PAGE_MASK);
-#else
- return true;
-#endif
-}
-
static void gen_goto_ptr(void)
{
tcg_gen_lookup_and_goto_ptr();
--
2.25.1
next prev parent reply other threads:[~2021-06-21 1:41 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 1:34 [PATCH 00/26] accel/tcg: Introduce translator_use_goto_tb Richard Henderson
2021-06-21 1:34 ` [PATCH 01/26] " Richard Henderson
2021-06-21 6:24 ` Max Filippov
2021-06-21 12:50 ` Philippe Mathieu-Daudé
2021-06-21 13:47 ` Richard Henderson
2021-06-21 15:03 ` Philippe Mathieu-Daudé
2021-06-21 13:45 ` Luis Fernando Fujita Pires
2021-06-21 1:34 ` [PATCH 02/26] target/alpha: Remove use_exit_tb Richard Henderson
2021-06-21 1:34 ` [PATCH 03/26] target/alpha: Remove in_superpage Richard Henderson
2021-06-21 1:34 ` [PATCH 04/26] target/alpha: Use translator_use_goto_tb Richard Henderson
2021-06-21 1:34 ` Richard Henderson [this message]
2021-06-21 10:20 ` [PATCH 05/26] target/arm: " Peter Maydell
2021-06-21 1:34 ` [PATCH 06/26] target/avr: " Richard Henderson
2021-06-21 1:34 ` [PATCH 07/26] target/avr: Mark some helpers noreturn Richard Henderson
2021-06-21 5:39 ` Michael Rolnik
2021-06-21 12:31 ` Philippe Mathieu-Daudé
2021-06-21 1:34 ` [PATCH 08/26] target/cris: Use translator_use_goto_tb Richard Henderson
2021-06-21 1:34 ` [PATCH 09/26] target/hppa: " Richard Henderson
2021-06-21 1:34 ` [PATCH 10/26] target/i386: " Richard Henderson
2021-06-21 1:34 ` [PATCH 11/26] target/m68k: " Richard Henderson
2021-06-21 7:35 ` Laurent Vivier
2021-06-21 1:34 ` [PATCH 12/26] target/microblaze: " Richard Henderson
2021-06-21 1:34 ` [PATCH 13/26] target/mips: " Richard Henderson
2021-06-21 1:34 ` [PATCH 14/26] target/mips: Fix missing else in gen_goto_tb Richard Henderson
2021-06-21 12:25 ` Philippe Mathieu-Daudé
2021-06-21 1:34 ` [PATCH 15/26] target/nios2: Use translator_use_goto_tb Richard Henderson
2021-06-21 1:34 ` [PATCH 16/26] target/openrisc: " Richard Henderson
2021-06-21 1:34 ` [PATCH 17/26] target/ppc: " Richard Henderson
2021-06-21 13:45 ` Luis Fernando Fujita Pires
2021-06-21 1:34 ` [PATCH 18/26] target/riscv: " Richard Henderson
2021-06-21 22:22 ` Alistair Francis
2021-06-21 1:34 ` [PATCH 19/26] target/rx: " Richard Henderson
2021-06-21 1:34 ` [PATCH 20/26] target/s390x: " Richard Henderson
2021-06-21 1:34 ` [PATCH 21/26] target/s390x: Remove use_exit_tb Richard Henderson
2021-06-21 1:34 ` [PATCH 22/26] target/sh4: Use translator_use_goto_tb Richard Henderson
2021-06-21 1:34 ` [PATCH 23/26] target/sparc: " Richard Henderson
2021-06-21 9:09 ` Mark Cave-Ayland
2021-06-21 1:34 ` [PATCH 24/26] target/tricore: " Richard Henderson
2021-06-21 14:27 ` Bastian Koppelmann
2021-06-21 1:34 ` [PATCH 25/26] target/tricore: Use tcg_gen_lookup_and_goto_ptr Richard Henderson
2021-06-21 14:32 ` Bastian Koppelmann
2021-06-21 1:34 ` [PATCH 26/26] target/xtensa: Use translator_use_goto_tb Richard Henderson
2021-06-21 6:24 ` Max Filippov
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=20210621013439.1791385-6-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-arm@nongnu.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).