Commit db61a615c3 for qemu.org

commit db61a615c3b078f9dc3ef1abf8a95d8485a602c7
Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Date:   Mon Oct 19 21:20:25 2026 +0000

    target/loongarch: define and call helpers using HELPER macro

    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 <pierrick.bouvier@oss.qualcomm.com>
    Acked-by: Yonggang Luo <luoyonggang@gmail.com>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
    Reviewed-by: Anton Johansson <anjo@rev.ng>
    Message-ID: <20261019212046.149572-7-pierrick.bouvier@oss.qualcomm.com>
    Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>

diff --git a/target/loongarch/tcg/csr_helper.c b/target/loongarch/tcg/csr_helper.c
index 1a6919417f..7cba8035df 100644
--- a/target/loongarch/tcg/csr_helper.c
+++ b/target/loongarch/tcg/csr_helper.c
@@ -18,7 +18,7 @@
 #include "cpu-csr.h"
 #include "cpu-mmu.h"

-target_ulong helper_csrwr_stlbps(CPULoongArchState *env, target_ulong val)
+target_ulong HELPER(csrwr_stlbps)(CPULoongArchState *env, target_ulong val)
 {
     CPUSysState *sys = env_sys(env);
     int64_t old_v = sys->CSR_STLBPS;
@@ -40,7 +40,7 @@ target_ulong helper_csrwr_stlbps(CPULoongArchState *env, target_ulong val)
     return old_v;
 }

-target_ulong helper_csrrd_pgd(CPULoongArchState *env)
+target_ulong HELPER(csrrd_pgd)(CPULoongArchState *env)
 {
     int64_t v;
     CPUSysState *sys = env_sys(env);
@@ -60,7 +60,7 @@ target_ulong helper_csrrd_pgd(CPULoongArchState *env)
     return v;
 }

-target_ulong helper_csrrd_cpuid(CPULoongArchState *env)
+target_ulong HELPER(csrrd_cpuid)(CPULoongArchState *env)
 {
     LoongArchCPU *lac = env_archcpu(env);
     CPUSysState *sys = env_sys(env);
@@ -70,12 +70,12 @@ target_ulong helper_csrrd_cpuid(CPULoongArchState *env)
     return sys->CSR_CPUID;
 }

-target_ulong helper_csrrd_tval(CPULoongArchState *env)
+target_ulong HELPER(csrrd_tval)(CPULoongArchState *env)
 {
     return cpu_loongarch_get_timer_ticks(env_timer(env));
 }

-target_ulong helper_csrrd_msgir(CPULoongArchState *env)
+target_ulong HELPER(csrrd_msgir)(CPULoongArchState *env)
 {
     int irq, new;
     CPUSysState *sys = env_sys(env);
@@ -97,7 +97,7 @@ target_ulong helper_csrrd_msgir(CPULoongArchState *env)
     return irq;
 }

-target_ulong helper_csrwr_estat(CPULoongArchState *env, target_ulong val)
+target_ulong HELPER(csrwr_estat)(CPULoongArchState *env, target_ulong val)
 {
     CPUSysState *sys = env_sys(env);
     int64_t old_v = sys->CSR_ESTAT;
@@ -118,7 +118,7 @@ target_ulong helper_csrwr_estat(CPULoongArchState *env, target_ulong val)
     return old_v;
 }

-target_ulong helper_csrwr_asid(CPULoongArchState *env, target_ulong val)
+target_ulong HELPER(csrwr_asid)(CPULoongArchState *env, target_ulong val)
 {
     CPUSysState *sys = env_sys(env);
     int64_t old_v = sys->CSR_ASID;
@@ -131,7 +131,7 @@ target_ulong helper_csrwr_asid(CPULoongArchState *env, target_ulong val)
     return old_v;
 }

-target_ulong helper_csrwr_tcfg(CPULoongArchState *env, target_ulong val)
+target_ulong HELPER(csrwr_tcfg)(CPULoongArchState *env, target_ulong val)
 {
     CPUTimerState *timer = env_timer(env);
     CPUSysState *sys = container_of(timer, CPUSysState, timer_state);
@@ -142,7 +142,7 @@ target_ulong helper_csrwr_tcfg(CPULoongArchState *env, target_ulong val)
     return old_v;
 }

-target_ulong helper_csrwr_ticlr(CPULoongArchState *env, target_ulong val)
+target_ulong HELPER(csrwr_ticlr)(CPULoongArchState *env, target_ulong val)
 {
     CPUTimerState *timer = env_timer(env);
     int64_t old_v = 0;
@@ -155,7 +155,7 @@ target_ulong helper_csrwr_ticlr(CPULoongArchState *env, target_ulong val)
     return old_v;
 }

-target_ulong helper_csrwr_pwcl(CPULoongArchState *env, target_ulong val)
+target_ulong HELPER(csrwr_pwcl)(CPULoongArchState *env, target_ulong val)
 {
     uint8_t shift, ptbase;
     CPUSysState *sys = env_sys(env);
@@ -180,7 +180,7 @@ target_ulong helper_csrwr_pwcl(CPULoongArchState *env, target_ulong val)
     return old_v;
 }

-target_ulong helper_csrwr_pwch(CPULoongArchState *env, target_ulong val)
+target_ulong HELPER(csrwr_pwch)(CPULoongArchState *env, target_ulong val)
 {
     uint8_t has_ptw;
     CPUSysState *sys = env_sys(env);
diff --git a/target/loongarch/tcg/fpu_helper.c b/target/loongarch/tcg/fpu_helper.c
index fc9c64c20a..cf7c77b1b0 100644
--- a/target/loongarch/tcg/fpu_helper.c
+++ b/target/loongarch/tcg/fpu_helper.c
@@ -90,7 +90,7 @@ static void update_fcsr0(CPULoongArchState *env, uintptr_t pc)
     update_fcsr0_mask(env, pc, 0);
 }

-uint64_t helper_fadd_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fadd_s)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -99,7 +99,7 @@ uint64_t helper_fadd_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fadd_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fadd_d)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -108,7 +108,7 @@ uint64_t helper_fadd_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fsub_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fsub_s)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -117,7 +117,7 @@ uint64_t helper_fsub_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fsub_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fsub_d)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -126,7 +126,7 @@ uint64_t helper_fsub_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmul_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmul_s)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -135,7 +135,7 @@ uint64_t helper_fmul_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmul_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmul_d)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -144,7 +144,7 @@ uint64_t helper_fmul_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fdiv_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fdiv_s)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -153,7 +153,7 @@ uint64_t helper_fdiv_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fdiv_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fdiv_d)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -162,7 +162,7 @@ uint64_t helper_fdiv_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmax_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmax_s)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -171,7 +171,7 @@ uint64_t helper_fmax_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmax_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmax_d)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -180,7 +180,7 @@ uint64_t helper_fmax_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmin_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmin_s)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -189,7 +189,7 @@ uint64_t helper_fmin_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmin_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmin_d)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -198,7 +198,7 @@ uint64_t helper_fmin_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmaxa_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmaxa_s)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -208,7 +208,7 @@ uint64_t helper_fmaxa_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmaxa_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmaxa_d)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -217,7 +217,7 @@ uint64_t helper_fmaxa_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmina_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmina_s)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -227,7 +227,7 @@ uint64_t helper_fmina_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fmina_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fmina_d)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;

@@ -236,7 +236,7 @@ uint64_t helper_fmina_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fscaleb_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fscaleb_s)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;
     int32_t n = (int32_t)fk;
@@ -249,7 +249,7 @@ uint64_t helper_fscaleb_s(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fscaleb_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
+uint64_t HELPER(fscaleb_d)(CPULoongArchState *env, uint64_t fj, uint64_t fk)
 {
     uint64_t fd;
     int64_t n = (int64_t)fk;
@@ -262,7 +262,7 @@ uint64_t helper_fscaleb_d(CPULoongArchState *env, uint64_t fj, uint64_t fk)
     return fd;
 }

-uint64_t helper_fsqrt_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(fsqrt_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -271,7 +271,7 @@ uint64_t helper_fsqrt_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_fsqrt_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(fsqrt_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -280,7 +280,7 @@ uint64_t helper_fsqrt_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_frecip_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(frecip_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -289,7 +289,7 @@ uint64_t helper_frecip_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_frecip_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(frecip_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -298,7 +298,7 @@ uint64_t helper_frecip_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_frsqrt_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(frsqrt_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     uint32_t fp;
@@ -309,7 +309,7 @@ uint64_t helper_frsqrt_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_frsqrt_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(frsqrt_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fp, fd;

@@ -319,7 +319,7 @@ uint64_t helper_frsqrt_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_flogb_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(flogb_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     uint32_t fp;
@@ -334,7 +334,7 @@ uint64_t helper_flogb_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_flogb_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(flogb_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     float_status *status = &env->fp_status;
@@ -348,7 +348,7 @@ uint64_t helper_flogb_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_fclass_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(fclass_s)(CPULoongArchState *env, uint64_t fj)
 {
     float32 f = fj;
     bool sign = float32_is_neg(f);
@@ -366,7 +366,7 @@ uint64_t helper_fclass_s(CPULoongArchState *env, uint64_t fj)
     }
 }

-uint64_t helper_fclass_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(fclass_d)(CPULoongArchState *env, uint64_t fj)
 {
     float64 f = fj;
     bool sign = float64_is_neg(f);
@@ -384,7 +384,7 @@ uint64_t helper_fclass_d(CPULoongArchState *env, uint64_t fj)
     }
 }

-uint64_t helper_fmuladd_s(CPULoongArchState *env, uint64_t fj,
+uint64_t HELPER(fmuladd_s)(CPULoongArchState *env, uint64_t fj,
                           uint64_t fk, uint64_t fa, uint32_t flag)
 {
     uint64_t fd;
@@ -395,7 +395,7 @@ uint64_t helper_fmuladd_s(CPULoongArchState *env, uint64_t fj,
     return fd;
 }

-uint64_t helper_fmuladd_d(CPULoongArchState *env, uint64_t fj,
+uint64_t HELPER(fmuladd_d)(CPULoongArchState *env, uint64_t fj,
                           uint64_t fk, uint64_t fa, uint32_t flag)
 {
     uint64_t fd;
@@ -432,7 +432,7 @@ static uint64_t fcmp_common(CPULoongArchState *env, FloatRelation cmp,
 }

 /* fcmp_cXXX_s */
-uint64_t helper_fcmp_c_s(CPULoongArchState *env, uint64_t fj,
+uint64_t HELPER(fcmp_c_s)(CPULoongArchState *env, uint64_t fj,
                          uint64_t fk, uint32_t flags)
 {
     FloatRelation cmp = float32_compare_quiet((uint32_t)fj,
@@ -441,7 +441,7 @@ uint64_t helper_fcmp_c_s(CPULoongArchState *env, uint64_t fj,
 }

 /* fcmp_sXXX_s */
-uint64_t helper_fcmp_s_s(CPULoongArchState *env, uint64_t fj,
+uint64_t HELPER(fcmp_s_s)(CPULoongArchState *env, uint64_t fj,
                          uint64_t fk, uint32_t flags)
 {
     FloatRelation cmp = float32_compare((uint32_t)fj,
@@ -450,7 +450,7 @@ uint64_t helper_fcmp_s_s(CPULoongArchState *env, uint64_t fj,
 }

 /* fcmp_cXXX_d */
-uint64_t helper_fcmp_c_d(CPULoongArchState *env, uint64_t fj,
+uint64_t HELPER(fcmp_c_d)(CPULoongArchState *env, uint64_t fj,
                          uint64_t fk, uint32_t flags)
 {
     FloatRelation cmp = float64_compare_quiet(fj, fk, &env->fp_status);
@@ -458,7 +458,7 @@ uint64_t helper_fcmp_c_d(CPULoongArchState *env, uint64_t fj,
 }

 /* fcmp_sXXX_d */
-uint64_t helper_fcmp_s_d(CPULoongArchState *env, uint64_t fj,
+uint64_t HELPER(fcmp_s_d)(CPULoongArchState *env, uint64_t fj,
                          uint64_t fk, uint32_t flags)
 {
     FloatRelation cmp = float64_compare(fj, fk, &env->fp_status);
@@ -466,7 +466,7 @@ uint64_t helper_fcmp_s_d(CPULoongArchState *env, uint64_t fj,
 }

 /* floating point conversion */
-uint64_t helper_fcvt_s_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(fcvt_s_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -475,7 +475,7 @@ uint64_t helper_fcvt_s_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_fcvt_d_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(fcvt_d_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -484,7 +484,7 @@ uint64_t helper_fcvt_d_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ffint_s_w(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ffint_s_w)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -493,7 +493,7 @@ uint64_t helper_ffint_s_w(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ffint_s_l(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ffint_s_l)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -502,7 +502,7 @@ uint64_t helper_ffint_s_l(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ffint_d_w(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ffint_d_w)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -511,7 +511,7 @@ uint64_t helper_ffint_d_w(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ffint_d_l(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ffint_d_l)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -520,7 +520,7 @@ uint64_t helper_ffint_d_l(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_frint_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(frint_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -529,7 +529,7 @@ uint64_t helper_frint_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_frint_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(frint_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -538,7 +538,7 @@ uint64_t helper_frint_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrm_l_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrm_l_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -556,7 +556,7 @@ uint64_t helper_ftintrm_l_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrm_l_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrm_l_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -574,7 +574,7 @@ uint64_t helper_ftintrm_l_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrm_w_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrm_w_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -592,7 +592,7 @@ uint64_t helper_ftintrm_w_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrm_w_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrm_w_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -610,7 +610,7 @@ uint64_t helper_ftintrm_w_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrp_l_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrp_l_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -628,7 +628,7 @@ uint64_t helper_ftintrp_l_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrp_l_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrp_l_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -646,7 +646,7 @@ uint64_t helper_ftintrp_l_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrp_w_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrp_w_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -664,7 +664,7 @@ uint64_t helper_ftintrp_w_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrp_w_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrp_w_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -682,7 +682,7 @@ uint64_t helper_ftintrp_w_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrz_l_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrz_l_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -699,7 +699,7 @@ uint64_t helper_ftintrz_l_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrz_l_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrz_l_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -716,7 +716,7 @@ uint64_t helper_ftintrz_l_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrz_w_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrz_w_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -733,7 +733,7 @@ uint64_t helper_ftintrz_w_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrz_w_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrz_w_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint32_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -750,7 +750,7 @@ uint64_t helper_ftintrz_w_s(CPULoongArchState *env, uint64_t fj)
     return (uint64_t)fd;
 }

-uint64_t helper_ftintrne_l_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrne_l_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -768,7 +768,7 @@ uint64_t helper_ftintrne_l_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrne_l_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrne_l_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -786,7 +786,7 @@ uint64_t helper_ftintrne_l_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrne_w_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrne_w_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -804,7 +804,7 @@ uint64_t helper_ftintrne_w_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftintrne_w_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftintrne_w_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint32_t fd;
     FloatRoundMode old_mode = get_float_rounding_mode(&env->fp_status);
@@ -822,7 +822,7 @@ uint64_t helper_ftintrne_w_s(CPULoongArchState *env, uint64_t fj)
     return (uint64_t)fd;
 }

-uint64_t helper_ftint_l_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftint_l_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -836,7 +836,7 @@ uint64_t helper_ftint_l_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftint_l_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftint_l_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -850,7 +850,7 @@ uint64_t helper_ftint_l_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftint_w_s(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftint_w_s)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -864,7 +864,7 @@ uint64_t helper_ftint_w_s(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-uint64_t helper_ftint_w_d(CPULoongArchState *env, uint64_t fj)
+uint64_t HELPER(ftint_w_d)(CPULoongArchState *env, uint64_t fj)
 {
     uint64_t fd;

@@ -878,7 +878,7 @@ uint64_t helper_ftint_w_d(CPULoongArchState *env, uint64_t fj)
     return fd;
 }

-void helper_set_rounding_mode(CPULoongArchState *env)
+void HELPER(set_rounding_mode)(CPULoongArchState *env)
 {
     set_float_rounding_mode(ieee_rm[(env->fcsr0 >> FCSR0_RM) & 0x3],
                             &env->fp_status);
diff --git a/target/loongarch/tcg/iocsr_helper.c b/target/loongarch/tcg/iocsr_helper.c
index b0f171608b..be705cebbb 100644
--- a/target/loongarch/tcg/iocsr_helper.c
+++ b/target/loongarch/tcg/iocsr_helper.c
@@ -14,52 +14,52 @@
 #define GET_MEMTXATTRS(cas) \
         ((MemTxAttrs){.requester_id = env_cpu(cas)->cpu_index})

-uint64_t helper_iocsrrd_b(CPULoongArchState *env, target_ulong r_addr)
+uint64_t HELPER(iocsrrd_b)(CPULoongArchState *env, target_ulong r_addr)
 {
     return address_space_ldub(env->address_space_iocsr, r_addr,
                               GET_MEMTXATTRS(env), NULL);
 }

-uint64_t helper_iocsrrd_h(CPULoongArchState *env, target_ulong r_addr)
+uint64_t HELPER(iocsrrd_h)(CPULoongArchState *env, target_ulong r_addr)
 {
     return address_space_lduw_le(env->address_space_iocsr, r_addr,
                                  GET_MEMTXATTRS(env), NULL);
 }

-uint64_t helper_iocsrrd_w(CPULoongArchState *env, target_ulong r_addr)
+uint64_t HELPER(iocsrrd_w)(CPULoongArchState *env, target_ulong r_addr)
 {
     return address_space_ldl_le(env->address_space_iocsr, r_addr,
                                 GET_MEMTXATTRS(env), NULL);
 }

-uint64_t helper_iocsrrd_d(CPULoongArchState *env, target_ulong r_addr)
+uint64_t HELPER(iocsrrd_d)(CPULoongArchState *env, target_ulong r_addr)
 {
     return address_space_ldq_le(env->address_space_iocsr, r_addr,
                                 GET_MEMTXATTRS(env), NULL);
 }

-void helper_iocsrwr_b(CPULoongArchState *env, target_ulong w_addr,
+void HELPER(iocsrwr_b)(CPULoongArchState *env, target_ulong w_addr,
                       target_ulong val)
 {
     address_space_stb(env->address_space_iocsr, w_addr,
                       val, GET_MEMTXATTRS(env), NULL);
 }

-void helper_iocsrwr_h(CPULoongArchState *env, target_ulong w_addr,
+void HELPER(iocsrwr_h)(CPULoongArchState *env, target_ulong w_addr,
                       target_ulong val)
 {
     address_space_stw_le(env->address_space_iocsr, w_addr,
                          val, GET_MEMTXATTRS(env), NULL);
 }

-void helper_iocsrwr_w(CPULoongArchState *env, target_ulong w_addr,
+void HELPER(iocsrwr_w)(CPULoongArchState *env, target_ulong w_addr,
                       target_ulong val)
 {
     address_space_stl_le(env->address_space_iocsr, w_addr,
                          val, GET_MEMTXATTRS(env), NULL);
 }

-void helper_iocsrwr_d(CPULoongArchState *env, target_ulong w_addr,
+void HELPER(iocsrwr_d)(CPULoongArchState *env, target_ulong w_addr,
                       target_ulong val)
 {
     address_space_stq_le(env->address_space_iocsr, w_addr,
diff --git a/target/loongarch/tcg/op_helper.c b/target/loongarch/tcg/op_helper.c
index f98fe4d4a1..44772d03a4 100644
--- a/target/loongarch/tcg/op_helper.c
+++ b/target/loongarch/tcg/op_helper.c
@@ -17,13 +17,13 @@
 #include "cpu-csr.h"

 /* Exceptions helpers */
-void helper_raise_exception(CPULoongArchState *env, uint32_t exception)
+void HELPER(raise_exception)(CPULoongArchState *env, uint32_t exception)
 {
     do_raise_exception(env, exception, GETPC());
 }

 /* loongarch assert op */
-void helper_asrtle_d(CPULoongArchState *env, target_ulong rj, target_ulong rk)
+void HELPER(asrtle_d)(CPULoongArchState *env, target_ulong rj, target_ulong rk)
 {
     CPUSysState *sys = env_sys(env);

@@ -33,7 +33,7 @@ void helper_asrtle_d(CPULoongArchState *env, target_ulong rj, target_ulong rk)
     }
 }

-void helper_asrtgt_d(CPULoongArchState *env, target_ulong rj, target_ulong rk)
+void HELPER(asrtgt_d)(CPULoongArchState *env, target_ulong rj, target_ulong rk)
 {
     CPUSysState *sys = env_sys(env);

@@ -43,7 +43,7 @@ void helper_asrtgt_d(CPULoongArchState *env, target_ulong rj, target_ulong rk)
     }
 }

-target_ulong helper_crc32(target_ulong val, target_ulong m, uint64_t sz)
+target_ulong HELPER(crc32)(target_ulong val, target_ulong m, uint64_t sz)
 {
     uint8_t buf[8];
     target_ulong mask = ((sz * 8) == 64) ? -1ULL : ((1ULL << (sz * 8)) - 1);
@@ -53,7 +53,7 @@ target_ulong helper_crc32(target_ulong val, target_ulong m, uint64_t sz)
     return (int32_t) (crc32(val ^ 0xffffffff, buf, sz) ^ 0xffffffff);
 }

-target_ulong helper_crc32c(target_ulong val, target_ulong m, uint64_t sz)
+target_ulong HELPER(crc32c)(target_ulong val, target_ulong m, uint64_t sz)
 {
     uint8_t buf[8];
     target_ulong mask = ((sz * 8) == 64) ? -1ULL : ((1ULL << (sz * 8)) - 1);
@@ -62,12 +62,12 @@ target_ulong helper_crc32c(target_ulong val, target_ulong m, uint64_t sz)
     return (int32_t) (crc32c(val, buf, sz) ^ 0xffffffff);
 }

-target_ulong helper_cpucfg(CPULoongArchState *env, target_ulong rj)
+target_ulong HELPER(cpucfg)(CPULoongArchState *env, target_ulong rj)
 {
     return rj >= ARRAY_SIZE(env->cpucfg) ? 0 : env->cpucfg[rj];
 }

-uint64_t helper_rdtime_d(CPULoongArchState *env)
+uint64_t HELPER(rdtime_d)(CPULoongArchState *env)
 {
 #ifdef CONFIG_USER_ONLY
     return cpu_get_host_ticks();
@@ -86,7 +86,7 @@ uint64_t helper_rdtime_d(CPULoongArchState *env)
 }

 #ifndef CONFIG_USER_ONLY
-void helper_ertn(CPULoongArchState *env)
+void HELPER(ertn)(CPULoongArchState *env)
 {
     uint64_t csr_pplv, csr_pie;
     CPUSysState *sys = env_sys(env);
@@ -115,7 +115,7 @@ void helper_ertn(CPULoongArchState *env)
     env->lladdr = 1;
 }

-void helper_idle(CPULoongArchState *env)
+void HELPER(idle)(CPULoongArchState *env)
 {
     CPUState *cs = env_cpu(env);

diff --git a/target/loongarch/tcg/tlb_helper.c b/target/loongarch/tcg/tlb_helper.c
index f5b4dc5c58..a707de9876 100644
--- a/target/loongarch/tcg/tlb_helper.c
+++ b/target/loongarch/tcg/tlb_helper.c
@@ -309,7 +309,7 @@ static bool loongarch_tlb_search(CPULoongArchState *env, vaddr vaddr,
     return false;
 }

-void helper_tlbsrch(CPULoongArchState *env)
+void HELPER(tlbsrch)(CPULoongArchState *env)
 {
     int index, match;
     CPUSysState *sys = env_sys(env);
@@ -329,7 +329,7 @@ void helper_tlbsrch(CPULoongArchState *env)
     sys->CSR_TLBIDX = FIELD_DP64(sys->CSR_TLBIDX, CSR_TLBIDX, NE, 1);
 }

-void helper_tlbrd(CPULoongArchState *env)
+void HELPER(tlbrd)(CPULoongArchState *env)
 {
     LoongArchTLB *tlb;
     int index;
@@ -388,7 +388,7 @@ static void update_tlb_index(CPULoongArchState *env, MMUContext *context,
     *old = new;
 }

-void helper_tlbwr(CPULoongArchState *env)
+void HELPER(tlbwr)(CPULoongArchState *env)
 {
     CPUSysState *sys = env_sys(env);
     int index = FIELD_EX64(sys->CSR_TLBIDX, CSR_TLBIDX, INDEX);
@@ -468,7 +468,7 @@ static int get_tlb_random_index(CPULoongArchState *env, vaddr addr,
     return index;
 }

-void helper_tlbfill(CPULoongArchState *env)
+void HELPER(tlbfill)(CPULoongArchState *env)
 {
     vaddr entryhi;
     int index, pagesize;
@@ -491,7 +491,7 @@ void helper_tlbfill(CPULoongArchState *env)
     fill_tlb_entry(env, env->tlb + index, &context);
 }

-void helper_tlbclr(CPULoongArchState *env)
+void HELPER(tlbclr)(CPULoongArchState *env)
 {
     LoongArchTLB *tlb;
     int i, index;
@@ -526,7 +526,7 @@ void helper_tlbclr(CPULoongArchState *env)
     tlb_flush(env_cpu(env));
 }

-void helper_tlbflush(CPULoongArchState *env)
+void HELPER(tlbflush)(CPULoongArchState *env)
 {
     int i, index;
     CPUSysState *sys = env_sys(env);
@@ -551,7 +551,7 @@ void helper_tlbflush(CPULoongArchState *env)
     tlb_flush(env_cpu(env));
 }

-void helper_invtlb_all(CPULoongArchState *env)
+void HELPER(invtlb_all)(CPULoongArchState *env)
 {
     for (int i = 0; i < LOONGARCH_TLB_MAX; i++) {
         env->tlb[i].tlb_misc = FIELD_DP64(env->tlb[i].tlb_misc,
@@ -560,7 +560,7 @@ void helper_invtlb_all(CPULoongArchState *env)
     tlb_flush(env_cpu(env));
 }

-void helper_invtlb_all_g(CPULoongArchState *env, uint32_t g)
+void HELPER(invtlb_all_g)(CPULoongArchState *env, uint32_t g)
 {
     for (int i = 0; i < LOONGARCH_TLB_MAX; i++) {
         LoongArchTLB *tlb = &env->tlb[i];
@@ -573,7 +573,7 @@ void helper_invtlb_all_g(CPULoongArchState *env, uint32_t g)
     tlb_flush(env_cpu(env));
 }

-void helper_invtlb_all_asid(CPULoongArchState *env, target_ulong info)
+void HELPER(invtlb_all_asid)(CPULoongArchState *env, target_ulong info)
 {
     uint16_t asid = info & R_CSR_ASID_ASID_MASK;

@@ -589,7 +589,7 @@ void helper_invtlb_all_asid(CPULoongArchState *env, target_ulong info)
     tlb_flush(env_cpu(env));
 }

-void helper_invtlb_page_asid(CPULoongArchState *env, target_ulong info,
+void HELPER(invtlb_page_asid)(CPULoongArchState *env, target_ulong info,
                              target_ulong addr)
 {
     int asid = info & 0x3ff;
@@ -603,7 +603,7 @@ void helper_invtlb_page_asid(CPULoongArchState *env, target_ulong info,
     }
 }

-void helper_invtlb_page_asid_or_g(CPULoongArchState *env,
+void HELPER(invtlb_page_asid_or_g)(CPULoongArchState *env,
                                   target_ulong info, target_ulong addr)
 {
     int asid = info & 0x3ff;
@@ -721,7 +721,7 @@ static inline uint64_t loongarch_sanitize_hw_pte(CPULoongArchState *env,
     return (pte & ~ppn_mask) | ((pte & ppn_mask) & palen_mask);
 }

-target_ulong helper_lddir(CPULoongArchState *env, target_ulong base,
+target_ulong HELPER(lddir)(CPULoongArchState *env, target_ulong base,
                           uint32_t level, uint32_t mem_idx)
 {
     uint64_t badvaddr;
@@ -761,7 +761,7 @@ target_ulong helper_lddir(CPULoongArchState *env, target_ulong base,
     return val & palen_mask;
 }

-void helper_ldpte(CPULoongArchState *env, target_ulong base, target_ulong odd,
+void HELPER(ldpte)(CPULoongArchState *env, target_ulong base, target_ulong odd,
                   uint32_t mem_idx)
 {
     hwaddr phys, tmp0, ptindex, ptoffset0, ptoffset1;
diff --git a/target/loongarch/tcg/vec_helper.c b/target/loongarch/tcg/vec_helper.c
index a270998e63..3ada636cd9 100644
--- a/target/loongarch/tcg/vec_helper.c
+++ b/target/loongarch/tcg/vec_helper.c
@@ -2511,8 +2511,8 @@ void HELPER(NAME)(void *vd, void *vj,                    \
     }                                                    \
 }

-FCLASS(vfclass_s, 32, UW, helper_fclass_s)
-FCLASS(vfclass_d, 64, UD, helper_fclass_d)
+FCLASS(vfclass_s, 32, UW, HELPER(fclass_s))
+FCLASS(vfclass_d, 64, UD, HELPER(fclass_d))

 #define FSQRT(BIT, T)                                  \
 static T do_fsqrt_## BIT(CPULoongArchState *env, T fj) \