From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk,
alex.bennee@linaro.org, f4bug@amsat.org
Subject: [PATCH for-6.1 v5 06/15] accel/tcg: Handle -singlestep in curr_cflags
Date: Mon, 19 Jul 2021 15:17:51 -1000 [thread overview]
Message-ID: <20210720011800.483966-7-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210720011800.483966-1-richard.henderson@linaro.org>
Exchange the test in translator_use_goto_tb for CF_NO_GOTO_TB,
and the test in tb_gen_code for setting CF_COUNT_MASK to 1.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210717221851.2124573-6-richard.henderson@linaro.org>
---
accel/tcg/cpu-exec.c | 8 +++++++-
accel/tcg/translate-all.c | 2 +-
accel/tcg/translator.c | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 70ea3c7d68..2206c463f5 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -149,7 +149,13 @@ uint32_t curr_cflags(CPUState *cpu)
{
uint32_t cflags = cpu->tcg_cflags;
- if (qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) {
+ /*
+ * For singlestep and -d nochain, suppress goto_tb so that
+ * we can log -d cpu,exec after every TB.
+ */
+ if (singlestep) {
+ cflags |= CF_NO_GOTO_TB | 1;
+ } else if (qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) {
cflags |= CF_NO_GOTO_TB;
}
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 5cc01d693b..bf82c15aab 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -1432,7 +1432,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
}
QEMU_BUILD_BUG_ON(CF_COUNT_MASK + 1 != TCG_MAX_INSNS);
- if (cpu->singlestep_enabled || singlestep) {
+ if (cpu->singlestep_enabled) {
max_insns = 1;
}
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 2ea5a74f30..a59eb7c11b 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -39,7 +39,7 @@ bool translator_use_goto_tb(DisasContextBase *db, target_ulong dest)
}
/* Suppress goto_tb in the case of single-steping. */
- if (db->singlestep_enabled || singlestep) {
+ if (db->singlestep_enabled) {
return false;
}
--
2.25.1
next prev parent reply other threads:[~2021-07-20 1:21 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 1:17 [PATCH for-6.1 v5 00/15] tcg: breakpoint reorg Richard Henderson
2021-07-20 1:17 ` [PATCH for-6.1 v5 01/15] accel/tcg: Reduce CF_COUNT_MASK to match TCG_MAX_INSNS Richard Henderson
2021-07-20 1:17 ` [PATCH for-6.1 v5 02/15] accel/tcg: Move curr_cflags into cpu-exec.c Richard Henderson
2021-07-20 1:17 ` [PATCH for-6.1 v5 03/15] target/alpha: Drop goto_tb path in gen_call_pal Richard Henderson
2021-07-20 11:55 ` Philippe Mathieu-Daudé
2021-07-20 1:17 ` [PATCH for-6.1 v5 04/15] accel/tcg: Add CF_NO_GOTO_TB and CF_NO_GOTO_PTR Richard Henderson
2021-07-20 1:17 ` [PATCH for-6.1 v5 05/15] accel/tcg: Drop CF_NO_GOTO_PTR from -d nochain Richard Henderson
2021-07-20 1:17 ` Richard Henderson [this message]
2021-07-20 1:17 ` [PATCH for-6.1 v5 07/15] accel/tcg: Use CF_NO_GOTO_{TB, PTR} in cpu_exec_step_atomic Richard Henderson
2021-07-20 1:17 ` [PATCH for-6.1 v5 08/15] hw/core: Introduce TCGCPUOps.debug_check_breakpoint Richard Henderson
2021-07-20 11:52 ` Philippe Mathieu-Daudé
2021-07-20 1:17 ` [PATCH for-6.1 v5 09/15] target/arm: Implement debug_check_breakpoint Richard Henderson
2021-07-20 11:52 ` Philippe Mathieu-Daudé
2021-07-20 1:17 ` [PATCH for-6.1 v5 10/15] target/i386: " Richard Henderson
2021-07-20 13:06 ` Alex Bennée
2021-07-20 1:17 ` [PATCH for-6.1 v5 11/15] accel/tcg: Merge tb_find into its only caller Richard Henderson
2021-07-20 13:15 ` Alex Bennée
2021-07-20 1:17 ` [PATCH for-6.1 v5 12/15] accel/tcg: Move breakpoint recognition outside translation Richard Henderson
2021-07-20 13:16 ` Alex Bennée
2021-07-20 16:12 ` Alex Bennée
2021-07-20 1:17 ` [PATCH for-6.1 v5 13/15] accel/tcg: Remove TranslatorOps.breakpoint_check Richard Henderson
2021-07-20 1:17 ` [PATCH for-6.1 v5 14/15] accel/tcg: Hoist tb_cflags to a local in translator_loop Richard Henderson
2021-07-20 11:54 ` Philippe Mathieu-Daudé
2021-07-20 1:18 ` [PATCH for-6.1 v5 15/15] accel/tcg: Record singlestep_enabled in tb->cflags Richard Henderson
2021-07-20 2:04 ` [PATCH for-6.1 v5 00/15] tcg: breakpoint reorg Richard Henderson
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=20210720011800.483966-7-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=mark.cave-ayland@ilande.co.uk \
--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).