target/arm: Replace target_ulong -> vaddr in guarded_page_br()
Following commit 15500df3b3b ("target/arm/tcg/translate.h: replace target_ulong with vaddr") change, adapt guarded_page_br(). Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20260401143456.79843-1-philmd@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Philippe Mathieu-Daudé committed
Apr 23, 2026 at 10:24 UTC
df16f5dd18e3236dbee1a4cbb2b34ba05ce55cba
2 files changed
+3
-3
target/arm/tcg/helper-a64-defs.h
+1
-1
@@ -131,7 +131,7 @@ DEF_HELPER_4(cpyfm, void, env, i32, i32, i32)
131
DEF_HELPER_4(cpyfe, void, env, i32, i32, i32)
132
133
DEF_HELPER_FLAGS_1(guarded_page_check, TCG_CALL_NO_WG, void, env)
134
-DEF_HELPER_FLAGS_2(guarded_page_br, TCG_CALL_NO_RWG, void, env, tl)
134
+DEF_HELPER_FLAGS_2(guarded_page_br, TCG_CALL_NO_RWG, void, env, vaddr)
135
136
DEF_HELPER_FLAGS_5(gvec_fdiv_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32)
137
DEF_HELPER_FLAGS_5(gvec_fdiv_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32)
target/arm/tcg/helper-a64.c
+2
-2
@@ -1735,7 +1735,7 @@ void HELPER(cpyfe)(CPUARMState *env, uint32_t syndrome, uint32_t wdesc,
1735
do_cpye(env, syndrome, wdesc, rdesc, false, GETPC());
1736
}
1737
1738
-static bool is_guarded_page(CPUARMState *env, target_ulong addr, uintptr_t ra)
1738
+static bool is_guarded_page(CPUARMState *env, vaddr addr, uintptr_t ra)
1739
{
1740
#ifdef CONFIG_USER_ONLY
1741
return page_get_flags(addr) & PAGE_BTI;
@@ -1765,7 +1765,7 @@ void HELPER(guarded_page_check)(CPUARMState *env)
1765
}
1766
}
1767
1768
-void HELPER(guarded_page_br)(CPUARMState *env, target_ulong pc)
1768
+void HELPER(guarded_page_br)(CPUARMState *env, vaddr pc)
1769
{
1770
/*
1771
* We have already checked for branch via x16 and x17.