From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 7/7] accel/tcg: Use CPUState.get_pc in cpu_io_recompile
Date: Fri, 29 Mar 2024 12:20:37 -1000 [thread overview]
Message-ID: <20240329222037.1735350-8-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240329222037.1735350-1-richard.henderson@linaro.org>
Using log_pc produces the pc at the beginning of TB,
not the actual pc installed by cpu_restore_state_from_tb,
which could be any of the guest instructions within TB.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/translate-all.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index c1f57e894a..83cc14fbde 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -634,7 +634,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr)
cpu->cflags_next_tb = curr_cflags(cpu) | CF_MEMI_ONLY | n;
if (qemu_loglevel_mask(CPU_LOG_EXEC)) {
- vaddr pc = log_pc(cpu, tb);
+ vaddr pc = cpu->cc->get_pc(cpu);
if (qemu_log_in_addr_range(pc)) {
qemu_log("cpu_io_recompile: rewound execution of TB to %016"
VADDR_PRIx "\n", pc);
--
2.34.1
next prev parent reply other threads:[~2024-03-29 22:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 22:20 [PULL 0/7] tcg + linux-user patch queue Richard Henderson
2024-03-29 22:20 ` [PULL 1/7] linux-user: Fix semctl() strace Richard Henderson
2024-03-29 22:20 ` [PULL 2/7] linux-user: Fix shmat() strace Richard Henderson
2024-03-29 22:20 ` [PULL 3/7] linux-user: Fix shmat(NULL) for h != g Richard Henderson
2024-03-29 22:20 ` [PULL 4/7] tests/tcg: Test shmat(NULL) Richard Henderson
2024-03-29 22:20 ` [PULL 5/7] tcg/optimize: Fix sign_mask for logical right-shift Richard Henderson
2024-03-29 22:20 ` [PULL 6/7] disas: Show opcodes for target_disas and monitor_disas Richard Henderson
2024-03-29 22:20 ` Richard Henderson [this message]
2024-03-31 15:42 ` [PULL 0/7] tcg + linux-user patch queue 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=20240329222037.1735350-8-richard.henderson@linaro.org \
--to=richard.henderson@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).