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 086150a223a6dfeae85e8bb925c5df0ca3061ed5 "target/hexagon: prefix helpers conflicting with other arch" Signed-off-by: Pierrick Bouvier <[email protected]> --- target/hexagon/gen_tcg.h | 2 +- target/hexagon/gen_tcg_sys.h | 2 +- target/hexagon/helper.h | 4 ++-- target/hexagon/op_helper.c | 4 ++-- target/hexagon/translate.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/hexagon/gen_tcg.h b/target/hexagon/gen_tcg.h index ed05f97efed..80d8a7b6bac 100644 --- a/target/hexagon/gen_tcg.h +++ b/target/hexagon/gen_tcg.h @@ -1135,7 +1135,7 @@ #define fGEN_TCG_J2_pause(SHORTCODE) \ do { \ uiV = uiV; \ - gen_helper_hexagon_raise_exception(tcg_env, \ + gen_helper_raise_exception(tcg_env, \ tcg_constant_i32(EXCP_YIELD), \ tcg_constant_i32(ctx->next_PC)); \ } while (0) diff --git a/target/hexagon/gen_tcg_sys.h b/target/hexagon/gen_tcg_sys.h index 3760b671adf..413ccc97f7b 100644 --- a/target/hexagon/gen_tcg_sys.h +++ b/target/hexagon/gen_tcg_sys.h @@ -80,7 +80,7 @@ #define fGEN_TCG_Y2_wait(SHORTCODE) \ do { \ RsV = RsV; \ - gen_helper_hexagon_wait(tcg_env); \ + gen_helper_wait(tcg_env); \ } while (0) #define fGEN_TCG_Y2_resume(SHORTCODE) \ diff --git a/target/hexagon/helper.h b/target/hexagon/helper.h index 28591417040..47958c48ea9 100644 --- a/target/hexagon/helper.h +++ b/target/hexagon/helper.h @@ -18,7 +18,7 @@ #include "internal.h" #include "helper_protos_generated.h.inc" -DEF_HELPER_FLAGS_3(hexagon_raise_exception, TCG_CALL_NO_RETURN, noreturn, env, i32, i32) +DEF_HELPER_FLAGS_3(raise_exception, TCG_CALL_NO_RETURN, noreturn, env, i32, i32) DEF_HELPER_2(commit_store, void, env, int) DEF_HELPER_3(gather_store, void, env, i32, int) DEF_HELPER_1(commit_hvx_stores, void, env) @@ -138,7 +138,7 @@ DEF_HELPER_3(sreg_write_masked, void, env, i32, i32) DEF_HELPER_3(setprio, void, env, i32, i32) DEF_HELPER_2(start, void, env, i32) DEF_HELPER_1(stop, void, env) -DEF_HELPER_1(hexagon_wait, void, env) +DEF_HELPER_1(wait, void, env) DEF_HELPER_2(resume, void, env, i32) DEF_HELPER_1(resched, void, env) DEF_HELPER_3(modify_ssr, void, env, i32, i32) diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 9850dc07289..82d38dc0b08 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -93,7 +93,7 @@ G_NORETURN void hexagon_raise_exception_err(CPUHexagonState *env, do_raise_exception(env, exception, pc, 0); } -G_NORETURN void HELPER(hexagon_raise_exception)(CPUHexagonState *env, uint32_t excp, +G_NORETURN void HELPER(raise_exception)(CPUHexagonState *env, uint32_t excp, uint32_t PC) { hexagon_raise_exception_err(env, excp, PC); @@ -1839,7 +1839,7 @@ void HELPER(resched)(CPUHexagonState *env) resched(env); } -void HELPER(hexagon_wait)(CPUHexagonState *env) +void HELPER(wait)(CPUHexagonState *env) { BQL_LOCK_GUARD(); diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 2c18f5eebff..e2a5038a1a5 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -139,7 +139,7 @@ intptr_t ctx_tmp_vreg_off(DisasContext *ctx, int regnum, static void gen_precise_exception(int cause, uint32_t PC) { tcg_gen_movi_i32(hex_cause_code, cause); - gen_helper_hexagon_raise_exception(tcg_env, tcg_constant_i32(HEX_EVENT_PRECISE), + gen_helper_raise_exception(tcg_env, tcg_constant_i32(HEX_EVENT_PRECISE), tcg_constant_i32(PC)); } @@ -1146,7 +1146,7 @@ static void check_imprecise_exception(DisasContext *ctx) TCGLabel *label = gen_new_label(); tcg_gen_brcondi_tl(TCG_COND_EQ, hex_imprecise_exception, 0, label); - gen_helper_hexagon_raise_exception(tcg_env, hex_imprecise_exception, PC); + gen_helper_raise_exception(tcg_env, hex_imprecise_exception, PC); gen_set_label(label); } #endif -- 2.43.0
