From: Richard Henderson <richard.henderson@linaro.org>
Date: Thu, 28 Mar 2024 03:21:59 +0000 (-1000)
Subject: accel/tcg: Use CPUState.get_pc in cpu_io_recompile
X-Git-Tag: v9.0.0-rc2~9^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dafa0ecc97850c325fe85cd87dc0b536858d171a;p=thirdparty%2Fqemu.git

accel/tcg: Use CPUState.get_pc in cpu_io_recompile

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>
---

diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index c1f57e894a0..83cc14fbde4 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);