Now that we have a generic mechanism to prefix all helpers, we can undo the recent changes that fixed conflicts between targets in multi-target set.
This reverts commit cd095f35b148f3fa0b2000a36af0c9efe2299806 "target/hppa: prefix helpers conflicting with other arch" Signed-off-by: Pierrick Bouvier <[email protected]> --- target/hppa/helper.h | 6 +++--- target/hppa/op_helper.c | 4 ++-- target/hppa/sys_helper.c | 8 ++++---- target/hppa/translate.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/target/hppa/helper.h b/target/hppa/helper.h index 8d7fa1ae348..8369855d78e 100644 --- a/target/hppa/helper.h +++ b/target/hppa/helper.h @@ -1,4 +1,4 @@ -DEF_HELPER_2(hppa_excp, noreturn, env, int) +DEF_HELPER_2(excp, noreturn, env, int) DEF_HELPER_FLAGS_3(stby_b, TCG_CALL_NO_WG, void, env, tl, tl) DEF_HELPER_FLAGS_3(stby_b_parallel, TCG_CALL_NO_WG, void, env, tl, tl) @@ -82,8 +82,8 @@ DEF_HELPER_FLAGS_4(fmpynfadd_d, TCG_CALL_NO_RWG, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_0(read_interval_timer, TCG_CALL_NO_RWG, tl) #ifndef CONFIG_USER_ONLY -DEF_HELPER_1(hppa_halt, noreturn, env) -DEF_HELPER_1(hppa_reset, noreturn, env) +DEF_HELPER_1(halt, noreturn, env) +DEF_HELPER_1(reset, noreturn, env) DEF_HELPER_1(rfi, void, env) DEF_HELPER_1(rfi_r, void, env) DEF_HELPER_FLAGS_2(b_gate_priv, TCG_CALL_NO_WG, i64, env, i64) diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index ea0680aa9eb..ec7f2a48e4d 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -30,7 +30,7 @@ #include "user/page-protection.h" #endif -G_NORETURN void HELPER(hppa_excp)(CPUHPPAState *env, int excp) +G_NORETURN void HELPER(excp)(CPUHPPAState *env, int excp) { CPUState *cs = env_cpu(env); @@ -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(excp)(env, excp); } return (want & prot) != 0; #endif diff --git a/target/hppa/sys_helper.c b/target/hppa/sys_helper.c index ccfc2b48816..4a8bbf32591 100644 --- a/target/hppa/sys_helper.c +++ b/target/hppa/sys_helper.c @@ -48,16 +48,16 @@ void HELPER(write_interval_timer)(CPUHPPAState *env, target_ulong val) timer_mod(cpu->alarm_timer, timeout); } -void HELPER(hppa_halt)(CPUHPPAState *env) +void HELPER(halt)(CPUHPPAState *env) { qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - HELPER(hppa_excp)(env, EXCP_HLT); + HELPER(excp)(env, EXCP_HLT); } -void HELPER(hppa_reset)(CPUHPPAState *env) +void HELPER(reset)(CPUHPPAState *env) { qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - HELPER(hppa_excp)(env, EXCP_HLT); + HELPER(excp)(env, EXCP_HLT); } target_ulong HELPER(swap_system_mask)(CPUHPPAState *env, target_ulong nsm) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index befdb58e9a6..41300c0dd73 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -726,7 +726,7 @@ static void install_link(DisasContext *ctx, unsigned link, bool with_sr0) static void gen_excp_1(int exception) { - gen_helper_hppa_excp(tcg_env, tcg_constant_i32(exception)); + gen_helper_excp(tcg_env, tcg_constant_i32(exception)); } static void gen_excp(DisasContext *ctx, int exception) @@ -2450,7 +2450,7 @@ static bool trans_halt(DisasContext *ctx, arg_halt *a) #ifndef CONFIG_USER_ONLY set_psw_xb(ctx, 0); nullify_over(ctx); - gen_helper_hppa_halt(tcg_env); + gen_helper_halt(tcg_env); ctx->base.is_jmp = DISAS_NORETURN; return nullify_end(ctx); #endif @@ -2462,7 +2462,7 @@ static bool trans_reset(DisasContext *ctx, arg_reset *a) #ifndef CONFIG_USER_ONLY set_psw_xb(ctx, 0); nullify_over(ctx); - gen_helper_hppa_reset(tcg_env); + gen_helper_reset(tcg_env); ctx->base.is_jmp = DISAS_NORETURN; return nullify_end(ctx); #endif -- 2.43.0
