commit 669fd6151337fdc81e34f7eb4940ba2f20d89957
author Richard Henderson <richard.henderson@linaro.org> Tue Aug 29 11:29:09 2023 -0700
committer Richard Henderson <richard.henderson@linaro.org> Tue Aug 29 11:30:33 2023 -0700
tree 15e1d06992a22b55b8c8e9a9d305080d9c65fdc3
parent dad2f2f5afbaf58d6056f31dfd4b9edd0854b8ab

Revert "include/exec: typedef abi_ptr to vaddr in softmmu"

This reverts commit fc15bfb6a6bda8d4d01f1383579d385acae17c0f.

This patch caused a regression for tricore-softmmu,
./tests/tcg/tricore-softmmu/test_boot_to_main.c.tst.

Reported-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

include/exec/cpu_ldst.h

diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index f3ce4eb..da10ba1 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -121,8 +121,8 @@
     h2g_nocheck(x); \
 })
 #else
-typedef vaddr abi_ptr;
-#define TARGET_ABI_FMT_ptr "%016" VADDR_PRIx
+typedef target_ulong abi_ptr;
+#define TARGET_ABI_FMT_ptr TARGET_FMT_lx
 #endif
 
 uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr);