Hi Matt,
On 18/7/23 03:35, Matt Borgerson wrote:
If CF_PCREL is enabled, generated host assembly logging (command line
option `-d out_asm`) may incorrectly report guest instruction virtual
addresses as page offsets instead of absolute addresses. This patch
corrects the reported guest address.
Signed-off-by: Matt Borgerson <cont...@mborgerson.com>
---
accel/tcg/translate-all.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index a1782db5dd..859db95cf7 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -283,6 +283,24 @@ static int setjmp_gen_code(CPUArchState *env,
TranslationBlock *tb,
return tcg_gen_code(tcg_ctx, tb, pc);
}
+static vaddr get_guest_insn_vaddr(TranslationBlock *tb, vaddr pc, size_t insn)
+{
+ g_assert(insn < tb->icount);
+
+ /* FIXME: This replicates the restore_state_to_opc() logic. */
Hmmm maybe we could have a public helper defined in accel/tcg/cpu-exec.c
so we cat re-use it in accel/tcg/perf.c::perf_report_code().
+ vaddr addr = tcg_ctx->gen_insn_data[insn * TARGET_INSN_START_WORDS];
+
+ if (tb_cflags(tb) & CF_PCREL) {
+ addr |= (pc & TARGET_PAGE_MASK);
+ } else {
+#if defined(TARGET_I386)
+ addr -= tb->cs_base;
+#endif
+ }
+
+ return addr;
+}
