In a upcoming commit, we'll prefix all helpers and helper_info with target prefix, to disambiguate symbols between targets. As a first step, we need to make sure all usages are using the existing HELPER macro.
Signed-off-by: Pierrick Bouvier <[email protected]> --- target/hppa/fpu_helper.c | 2 +- target/hppa/op_helper.c | 2 +- target/hppa/sys_helper.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/hppa/fpu_helper.c b/target/hppa/fpu_helper.c index cdbebcfeb3a..a0c8c91ee54 100644 --- a/target/hppa/fpu_helper.c +++ b/target/hppa/fpu_helper.c @@ -82,7 +82,7 @@ void HELPER(loaded_fr0)(CPUHPPAState *env) void cpu_hppa_loaded_fr0(CPUHPPAState *env) { - helper_loaded_fr0(env); + HELPER(loaded_fr0)(env); } #define CONVERT_BIT(X, SRC, DST) \ diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 3542c275663..ea0680aa9eb 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -341,7 +341,7 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr, if (excp == EXCP_DTLB_MISS) { excp = EXCP_NA_DTLB_MISS; } - helper_hppa_excp(env, excp); + HELPER(hppa_excp)(env, excp); } return (want & prot) != 0; #endif diff --git a/target/hppa/sys_helper.c b/target/hppa/sys_helper.c index f7fd80b5830..ccfc2b48816 100644 --- a/target/hppa/sys_helper.c +++ b/target/hppa/sys_helper.c @@ -51,13 +51,13 @@ void HELPER(write_interval_timer)(CPUHPPAState *env, target_ulong val) void HELPER(hppa_halt)(CPUHPPAState *env) { qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - helper_hppa_excp(env, EXCP_HLT); + HELPER(hppa_excp)(env, EXCP_HLT); } void HELPER(hppa_reset)(CPUHPPAState *env) { qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - helper_hppa_excp(env, EXCP_HLT); + HELPER(hppa_excp)(env, EXCP_HLT); } target_ulong HELPER(swap_system_mask)(CPUHPPAState *env, target_ulong nsm) @@ -120,7 +120,7 @@ static void getshadowregs(CPUHPPAState *env) void HELPER(rfi_r)(CPUHPPAState *env) { getshadowregs(env); - helper_rfi(env); + HELPER(rfi)(env); } #ifndef CONFIG_USER_ONLY -- 2.43.0
