Commit e3cc72cca1 for qemu.org
commit e3cc72cca1d603392ec9f64f6d7ed9884a46b1dd
Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Date: Mon Oct 19 21:20:20 2026 +0000
target/alpha: 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-2-pierrick.bouvier@oss.qualcomm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
diff --git a/target/alpha/clk_helper.c b/target/alpha/clk_helper.c
index 26ffc231cd..36674221a6 100644
--- a/target/alpha/clk_helper.c
+++ b/target/alpha/clk_helper.c
@@ -11,7 +11,7 @@
#include "exec/helper-proto.h"
#include "cpu.h"
-uint64_t helper_load_pcc(CPUAlphaState *env)
+uint64_t HELPER(load_pcc)(CPUAlphaState *env)
{
#ifndef CONFIG_USER_ONLY
/*
diff --git a/target/alpha/fpu_helper.c b/target/alpha/fpu_helper.c
index 529eadca9f..61166396f6 100644
--- a/target/alpha/fpu_helper.c
+++ b/target/alpha/fpu_helper.c
@@ -25,12 +25,12 @@
#define FP_STATUS (env->fp_status)
-void helper_setroundmode(CPUAlphaState *env, uint32_t val)
+void HELPER(setroundmode)(CPUAlphaState *env, uint32_t val)
{
set_float_rounding_mode(val, &FP_STATUS);
}
-void helper_setflushzero(CPUAlphaState *env, uint32_t val)
+void HELPER(setflushzero)(CPUAlphaState *env, uint32_t val)
{
set_flush_to_zero(val, &FP_STATUS);
}
@@ -71,7 +71,7 @@ static void fp_exc_raise1(CPUAlphaState *env, uintptr_t retaddr,
/* Raise exceptions for ieee fp insns without software completion.
In that case there are no exceptions that don't trap; the mask
doesn't apply. */
-void helper_fp_exc_raise(CPUAlphaState *env, uint32_t ignore, uint32_t regno)
+void HELPER(fp_exc_raise)(CPUAlphaState *env, uint32_t ignore, uint32_t regno)
{
uint32_t exc = env->error_code;
if (exc) {
@@ -84,7 +84,7 @@ void helper_fp_exc_raise(CPUAlphaState *env, uint32_t ignore, uint32_t regno)
}
/* Raise exceptions for ieee fp insns with software completion. */
-void helper_fp_exc_raise_s(CPUAlphaState *env, uint32_t ignore, uint32_t regno)
+void HELPER(fp_exc_raise_s)(CPUAlphaState *env, uint32_t ignore, uint32_t regno)
{
uint32_t exc = env->error_code & ~ignore;
if (exc) {
@@ -107,7 +107,7 @@ void helper_fp_exc_raise_s(CPUAlphaState *env, uint32_t ignore, uint32_t regno)
/* Input handing without software completion. Trap for all
non-finite numbers. */
-void helper_ieee_input(CPUAlphaState *env, uint64_t val)
+void HELPER(ieee_input)(CPUAlphaState *env, uint64_t val)
{
uint32_t exp = (uint32_t)(val >> 52) & 0x7ff;
uint64_t frac = val & 0xfffffffffffffull;
@@ -125,7 +125,7 @@ void helper_ieee_input(CPUAlphaState *env, uint64_t val)
}
/* Similar, but does not trap for infinities. Used for comparisons. */
-void helper_ieee_input_cmp(CPUAlphaState *env, uint64_t val)
+void HELPER(ieee_input_cmp)(CPUAlphaState *env, uint64_t val)
{
uint32_t exp = (uint32_t)(val >> 52) & 0x7ff;
uint64_t frac = val & 0xfffffffffffffull;
@@ -148,7 +148,7 @@ void helper_ieee_input_cmp(CPUAlphaState *env, uint64_t val)
then the code downstream of that will need to cope with denorms sans
flush_input_to_zero. Most of it should work sanely, but there's
nothing to compare with. */
-void helper_ieee_input_s(CPUAlphaState *env, uint64_t val)
+void HELPER(ieee_input_s)(CPUAlphaState *env, uint64_t val)
{
if (unlikely(2 * val - 1 < 0x1fffffffffffffull)
&& !get_flush_inputs_to_zero(&env->fp_status)) {
@@ -202,17 +202,17 @@ static inline float32 s_to_float32(uint64_t a)
return r.f;
}
-uint32_t helper_s_to_memory(uint64_t a)
+uint32_t HELPER(s_to_memory)(uint64_t a)
{
return s_to_float32_int(a);
}
-uint64_t helper_memory_to_s(uint32_t a)
+uint64_t HELPER(memory_to_s)(uint32_t a)
{
return float32_to_s_int(a);
}
-uint64_t helper_adds(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(adds)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float32 fa, fb, fr;
@@ -224,7 +224,7 @@ uint64_t helper_adds(CPUAlphaState *env, uint64_t a, uint64_t b)
return float32_to_s(fr);
}
-uint64_t helper_subs(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(subs)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float32 fa, fb, fr;
@@ -236,7 +236,7 @@ uint64_t helper_subs(CPUAlphaState *env, uint64_t a, uint64_t b)
return float32_to_s(fr);
}
-uint64_t helper_muls(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(muls)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float32 fa, fb, fr;
@@ -248,7 +248,7 @@ uint64_t helper_muls(CPUAlphaState *env, uint64_t a, uint64_t b)
return float32_to_s(fr);
}
-uint64_t helper_alpha_divs(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(alpha_divs)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float32 fa, fb, fr;
@@ -260,7 +260,7 @@ uint64_t helper_alpha_divs(CPUAlphaState *env, uint64_t a, uint64_t b)
return float32_to_s(fr);
}
-uint64_t helper_sqrts(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(sqrts)(CPUAlphaState *env, uint64_t a)
{
float32 fa, fr;
@@ -289,7 +289,7 @@ static inline uint64_t float64_to_t(float64 fa)
return r.ll;
}
-uint64_t helper_addt(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(addt)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb, fr;
@@ -301,7 +301,7 @@ uint64_t helper_addt(CPUAlphaState *env, uint64_t a, uint64_t b)
return float64_to_t(fr);
}
-uint64_t helper_subt(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(subt)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb, fr;
@@ -313,7 +313,7 @@ uint64_t helper_subt(CPUAlphaState *env, uint64_t a, uint64_t b)
return float64_to_t(fr);
}
-uint64_t helper_mult(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(mult)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb, fr;
@@ -325,7 +325,7 @@ uint64_t helper_mult(CPUAlphaState *env, uint64_t a, uint64_t b)
return float64_to_t(fr);
}
-uint64_t helper_divt(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(divt)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb, fr;
@@ -337,7 +337,7 @@ uint64_t helper_divt(CPUAlphaState *env, uint64_t a, uint64_t b)
return float64_to_t(fr);
}
-uint64_t helper_sqrtt(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(sqrtt)(CPUAlphaState *env, uint64_t a)
{
float64 fa, fr;
@@ -349,7 +349,7 @@ uint64_t helper_sqrtt(CPUAlphaState *env, uint64_t a)
}
/* Comparisons */
-uint64_t helper_cmptun(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(cmptun)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb;
uint64_t ret = 0;
@@ -365,7 +365,7 @@ uint64_t helper_cmptun(CPUAlphaState *env, uint64_t a, uint64_t b)
return ret;
}
-uint64_t helper_cmpteq(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(cmpteq)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb;
uint64_t ret = 0;
@@ -381,7 +381,7 @@ uint64_t helper_cmpteq(CPUAlphaState *env, uint64_t a, uint64_t b)
return ret;
}
-uint64_t helper_cmptle(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(cmptle)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb;
uint64_t ret = 0;
@@ -397,7 +397,7 @@ uint64_t helper_cmptle(CPUAlphaState *env, uint64_t a, uint64_t b)
return ret;
}
-uint64_t helper_cmptlt(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(cmptlt)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb;
uint64_t ret = 0;
@@ -414,7 +414,7 @@ uint64_t helper_cmptlt(CPUAlphaState *env, uint64_t a, uint64_t b)
}
/* Floating point format conversion */
-uint64_t helper_cvtts(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvtts)(CPUAlphaState *env, uint64_t a)
{
float64 fa;
float32 fr;
@@ -426,7 +426,7 @@ uint64_t helper_cvtts(CPUAlphaState *env, uint64_t a)
return float32_to_s(fr);
}
-uint64_t helper_cvtst(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvtst)(CPUAlphaState *env, uint64_t a)
{
float32 fa;
float64 fr;
@@ -438,7 +438,7 @@ uint64_t helper_cvtst(CPUAlphaState *env, uint64_t a)
return float64_to_t(fr);
}
-uint64_t helper_cvtqs(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvtqs)(CPUAlphaState *env, uint64_t a)
{
float32 fr = int64_to_float32(a, &FP_STATUS);
env->error_code = soft_to_fpcr_exc(env);
@@ -483,24 +483,24 @@ static uint64_t do_cvttq(CPUAlphaState *env, uint64_t a, int roundmode)
return ret;
}
-uint64_t helper_cvttq(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvttq)(CPUAlphaState *env, uint64_t a)
{
return do_cvttq(env, a, get_float_rounding_mode(&FP_STATUS));
}
-uint64_t helper_cvttq_c(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvttq_c)(CPUAlphaState *env, uint64_t a)
{
return do_cvttq(env, a, float_round_to_zero);
}
-uint64_t helper_cvtqt(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvtqt)(CPUAlphaState *env, uint64_t a)
{
float64 fr = int64_to_float64(a, &FP_STATUS);
env->error_code = soft_to_fpcr_exc(env);
return float64_to_t(fr);
}
-uint64_t helper_cvtql(CPUAlphaState *env, uint64_t val)
+uint64_t HELPER(cvtql)(CPUAlphaState *env, uint64_t val)
{
uint32_t exc = 0;
if (val != (int32_t)val) {
diff --git a/target/alpha/helper.c b/target/alpha/helper.c
index d59ecc0d4a..55c7782b4d 100644
--- a/target/alpha/helper.c
+++ b/target/alpha/helper.c
@@ -111,12 +111,12 @@ void cpu_alpha_store_fpcr(CPUAlphaState *env, uint64_t val)
env->fpcr_flush_to_zero = t;
}
-uint64_t helper_load_fpcr(CPUAlphaState *env)
+uint64_t HELPER(load_fpcr)(CPUAlphaState *env)
{
return cpu_alpha_load_fpcr(env);
}
-void helper_store_fpcr(CPUAlphaState *env, uint64_t val)
+void HELPER(store_fpcr)(CPUAlphaState *env, uint64_t val)
{
cpu_alpha_store_fpcr(env, val);
}
@@ -531,7 +531,7 @@ void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags)
/* This should only be called from translate, via gen_excp.
We expect that ENV->PC has already been updated. */
-G_NORETURN void helper_excp(CPUAlphaState *env, int excp, int error)
+G_NORETURN void HELPER(excp)(CPUAlphaState *env, int excp, int error)
{
CPUState *cs = env_cpu(env);
diff --git a/target/alpha/int_helper.c b/target/alpha/int_helper.c
index 6bfe63500e..11b0af82bc 100644
--- a/target/alpha/int_helper.c
+++ b/target/alpha/int_helper.c
@@ -23,7 +23,7 @@
#include "qemu/host-utils.h"
-uint64_t helper_zapnot(uint64_t val, uint64_t mskb)
+uint64_t HELPER(zapnot)(uint64_t val, uint64_t mskb)
{
uint64_t mask;
@@ -39,12 +39,12 @@ uint64_t helper_zapnot(uint64_t val, uint64_t mskb)
return val & mask;
}
-uint64_t helper_zap(uint64_t val, uint64_t mask)
+uint64_t HELPER(zap)(uint64_t val, uint64_t mask)
{
- return helper_zapnot(val, ~mask);
+ return HELPER(zapnot)(val, ~mask);
}
-uint64_t helper_cmpbe0(uint64_t a)
+uint64_t HELPER(cmpbe0)(uint64_t a)
{
uint64_t m = 0x7f7f7f7f7f7f7f7fULL;
uint64_t c = ~(((a & m) + m) | a | m);
@@ -58,7 +58,7 @@ uint64_t helper_cmpbe0(uint64_t a)
return c >> 56;
}
-uint64_t helper_cmpbge(uint64_t a, uint64_t b)
+uint64_t HELPER(cmpbge)(uint64_t a, uint64_t b)
{
uint64_t mask = 0x00ff00ff00ff00ffULL;
uint64_t test = 0x0100010001000100ULL;
@@ -87,7 +87,7 @@ uint64_t helper_cmpbge(uint64_t a, uint64_t b)
return cl >> 50;
}
-uint64_t helper_minub8(uint64_t op1, uint64_t op2)
+uint64_t HELPER(minub8)(uint64_t op1, uint64_t op2)
{
uint64_t res = 0;
uint8_t opa, opb, opr;
@@ -102,7 +102,7 @@ uint64_t helper_minub8(uint64_t op1, uint64_t op2)
return res;
}
-uint64_t helper_minsb8(uint64_t op1, uint64_t op2)
+uint64_t HELPER(minsb8)(uint64_t op1, uint64_t op2)
{
uint64_t res = 0;
int8_t opa, opb;
@@ -118,7 +118,7 @@ uint64_t helper_minsb8(uint64_t op1, uint64_t op2)
return res;
}
-uint64_t helper_minuw4(uint64_t op1, uint64_t op2)
+uint64_t HELPER(minuw4)(uint64_t op1, uint64_t op2)
{
uint64_t res = 0;
uint16_t opa, opb, opr;
@@ -133,7 +133,7 @@ uint64_t helper_minuw4(uint64_t op1, uint64_t op2)
return res;
}
-uint64_t helper_minsw4(uint64_t op1, uint64_t op2)
+uint64_t HELPER(minsw4)(uint64_t op1, uint64_t op2)
{
uint64_t res = 0;
int16_t opa, opb;
@@ -149,7 +149,7 @@ uint64_t helper_minsw4(uint64_t op1, uint64_t op2)
return res;
}
-uint64_t helper_maxub8(uint64_t op1, uint64_t op2)
+uint64_t HELPER(maxub8)(uint64_t op1, uint64_t op2)
{
uint64_t res = 0;
uint8_t opa, opb, opr;
@@ -164,7 +164,7 @@ uint64_t helper_maxub8(uint64_t op1, uint64_t op2)
return res;
}
-uint64_t helper_maxsb8(uint64_t op1, uint64_t op2)
+uint64_t HELPER(maxsb8)(uint64_t op1, uint64_t op2)
{
uint64_t res = 0;
int8_t opa, opb;
@@ -180,7 +180,7 @@ uint64_t helper_maxsb8(uint64_t op1, uint64_t op2)
return res;
}
-uint64_t helper_maxuw4(uint64_t op1, uint64_t op2)
+uint64_t HELPER(maxuw4)(uint64_t op1, uint64_t op2)
{
uint64_t res = 0;
uint16_t opa, opb, opr;
@@ -195,7 +195,7 @@ uint64_t helper_maxuw4(uint64_t op1, uint64_t op2)
return res;
}
-uint64_t helper_maxsw4(uint64_t op1, uint64_t op2)
+uint64_t HELPER(maxsw4)(uint64_t op1, uint64_t op2)
{
uint64_t res = 0;
int16_t opa, opb;
@@ -211,7 +211,7 @@ uint64_t helper_maxsw4(uint64_t op1, uint64_t op2)
return res;
}
-uint64_t helper_perr(uint64_t op1, uint64_t op2)
+uint64_t HELPER(perr)(uint64_t op1, uint64_t op2)
{
uint64_t res = 0;
uint8_t opa, opb, opr;
@@ -230,12 +230,12 @@ uint64_t helper_perr(uint64_t op1, uint64_t op2)
return res;
}
-uint64_t helper_pklb(uint64_t op1)
+uint64_t HELPER(pklb)(uint64_t op1)
{
return (op1 & 0xff) | ((op1 >> 24) & 0xff00);
}
-uint64_t helper_pkwb(uint64_t op1)
+uint64_t HELPER(pkwb)(uint64_t op1)
{
return ((op1 & 0xff)
| ((op1 >> 8) & 0xff00)
@@ -243,12 +243,12 @@ uint64_t helper_pkwb(uint64_t op1)
| ((op1 >> 24) & 0xff000000));
}
-uint64_t helper_unpkbl(uint64_t op1)
+uint64_t HELPER(unpkbl)(uint64_t op1)
{
return (op1 & 0xff) | ((op1 & 0xff00) << 24);
}
-uint64_t helper_unpkbw(uint64_t op1)
+uint64_t HELPER(unpkbw)(uint64_t op1)
{
return ((op1 & 0xff)
| ((op1 & 0xff00) << 8)
@@ -256,7 +256,7 @@ uint64_t helper_unpkbw(uint64_t op1)
| ((op1 & 0xff000000) << 24));
}
-void helper_check_overflow(CPUAlphaState *env, uint64_t op1, uint64_t op2)
+void HELPER(check_overflow)(CPUAlphaState *env, uint64_t op1, uint64_t op2)
{
if (unlikely(op1 != op2)) {
arith_excp(env, GETPC(), EXC_M_IOV, 0);
diff --git a/target/alpha/sys_helper.c b/target/alpha/sys_helper.c
index 0e0a619975..95613e97f2 100644
--- a/target/alpha/sys_helper.c
+++ b/target/alpha/sys_helper.c
@@ -27,17 +27,17 @@
/* PALcode support special instructions */
-void helper_tbia(CPUAlphaState *env)
+void HELPER(tbia)(CPUAlphaState *env)
{
tlb_flush(env_cpu(env));
}
-void helper_tbis(CPUAlphaState *env, uint64_t p)
+void HELPER(tbis)(CPUAlphaState *env, uint64_t p)
{
tlb_flush_page(env_cpu(env), p);
}
-void helper_halt(uint64_t restart)
+void HELPER(halt)(uint64_t restart)
{
if (restart) {
qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
@@ -46,17 +46,17 @@ void helper_halt(uint64_t restart)
}
}
-uint64_t helper_get_vmtime(void)
+uint64_t HELPER(get_vmtime)(void)
{
return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
}
-uint64_t helper_get_walltime(void)
+uint64_t HELPER(get_walltime)(void)
{
return qemu_clock_get_ns(rtc_clock);
}
-void helper_set_alarm(CPUAlphaState *env, uint64_t expire)
+void HELPER(set_alarm)(CPUAlphaState *env, uint64_t expire)
{
AlphaCPU *cpu = env_archcpu(env);
diff --git a/target/alpha/vax_helper.c b/target/alpha/vax_helper.c
index c1d201e7b4..01c1253849 100644
--- a/target/alpha/vax_helper.c
+++ b/target/alpha/vax_helper.c
@@ -82,7 +82,7 @@ static float32 f_to_float32(CPUAlphaState *env, uintptr_t retaddr, uint64_t a)
return r.f;
}
-uint32_t helper_f_to_memory(uint64_t a)
+uint32_t HELPER(f_to_memory)(uint64_t a)
{
uint32_t r;
r = (a & 0x00001fffe0000000ull) >> 13;
@@ -91,7 +91,7 @@ uint32_t helper_f_to_memory(uint64_t a)
return r;
}
-uint64_t helper_memory_to_f(uint32_t a)
+uint64_t HELPER(memory_to_f)(uint32_t a)
{
uint64_t r;
r = ((uint64_t)(a & 0x0000c000)) << 48;
@@ -106,7 +106,7 @@ uint64_t helper_memory_to_f(uint32_t a)
/* ??? Emulating VAX arithmetic with IEEE arithmetic is wrong. We should
either implement VAX arithmetic properly or just signal invalid opcode. */
-uint64_t helper_addf(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(addf)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float32 fa, fb, fr;
@@ -116,7 +116,7 @@ uint64_t helper_addf(CPUAlphaState *env, uint64_t a, uint64_t b)
return float32_to_f(fr);
}
-uint64_t helper_subf(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(subf)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float32 fa, fb, fr;
@@ -126,7 +126,7 @@ uint64_t helper_subf(CPUAlphaState *env, uint64_t a, uint64_t b)
return float32_to_f(fr);
}
-uint64_t helper_mulf(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(mulf)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float32 fa, fb, fr;
@@ -136,7 +136,7 @@ uint64_t helper_mulf(CPUAlphaState *env, uint64_t a, uint64_t b)
return float32_to_f(fr);
}
-uint64_t helper_divf(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(divf)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float32 fa, fb, fr;
@@ -146,7 +146,7 @@ uint64_t helper_divf(CPUAlphaState *env, uint64_t a, uint64_t b)
return float32_to_f(fr);
}
-uint64_t helper_sqrtf(CPUAlphaState *env, uint64_t t)
+uint64_t HELPER(sqrtf)(CPUAlphaState *env, uint64_t t)
{
float32 ft, fr;
@@ -213,7 +213,7 @@ static float64 g_to_float64(CPUAlphaState *env, uintptr_t retaddr, uint64_t a)
return r.d;
}
-uint64_t helper_g_to_memory(uint64_t a)
+uint64_t HELPER(g_to_memory)(uint64_t a)
{
uint64_t r;
r = (a & 0x000000000000ffffull) << 48;
@@ -223,7 +223,7 @@ uint64_t helper_g_to_memory(uint64_t a)
return r;
}
-uint64_t helper_memory_to_g(uint64_t a)
+uint64_t HELPER(memory_to_g)(uint64_t a)
{
uint64_t r;
r = (a & 0x000000000000ffffull) << 48;
@@ -233,7 +233,7 @@ uint64_t helper_memory_to_g(uint64_t a)
return r;
}
-uint64_t helper_addg(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(addg)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb, fr;
@@ -243,7 +243,7 @@ uint64_t helper_addg(CPUAlphaState *env, uint64_t a, uint64_t b)
return float64_to_g(fr);
}
-uint64_t helper_subg(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(subg)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb, fr;
@@ -253,7 +253,7 @@ uint64_t helper_subg(CPUAlphaState *env, uint64_t a, uint64_t b)
return float64_to_g(fr);
}
-uint64_t helper_mulg(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(mulg)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb, fr;
@@ -263,7 +263,7 @@ uint64_t helper_mulg(CPUAlphaState *env, uint64_t a, uint64_t b)
return float64_to_g(fr);
}
-uint64_t helper_divg(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(divg)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb, fr;
@@ -273,7 +273,7 @@ uint64_t helper_divg(CPUAlphaState *env, uint64_t a, uint64_t b)
return float64_to_g(fr);
}
-uint64_t helper_sqrtg(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(sqrtg)(CPUAlphaState *env, uint64_t a)
{
float64 fa, fr;
@@ -282,7 +282,7 @@ uint64_t helper_sqrtg(CPUAlphaState *env, uint64_t a)
return float64_to_g(fr);
}
-uint64_t helper_cmpgeq(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(cmpgeq)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb;
@@ -296,7 +296,7 @@ uint64_t helper_cmpgeq(CPUAlphaState *env, uint64_t a, uint64_t b)
}
}
-uint64_t helper_cmpgle(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(cmpgle)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb;
@@ -310,7 +310,7 @@ uint64_t helper_cmpgle(CPUAlphaState *env, uint64_t a, uint64_t b)
}
}
-uint64_t helper_cmpglt(CPUAlphaState *env, uint64_t a, uint64_t b)
+uint64_t HELPER(cmpglt)(CPUAlphaState *env, uint64_t a, uint64_t b)
{
float64 fa, fb;
@@ -324,13 +324,13 @@ uint64_t helper_cmpglt(CPUAlphaState *env, uint64_t a, uint64_t b)
}
}
-uint64_t helper_cvtqf(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvtqf)(CPUAlphaState *env, uint64_t a)
{
float32 fr = int64_to_float32(a, &FP_STATUS);
return float32_to_f(fr);
}
-uint64_t helper_cvtgf(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvtgf)(CPUAlphaState *env, uint64_t a)
{
float64 fa;
float32 fr;
@@ -340,13 +340,13 @@ uint64_t helper_cvtgf(CPUAlphaState *env, uint64_t a)
return float32_to_f(fr);
}
-uint64_t helper_cvtgq(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvtgq)(CPUAlphaState *env, uint64_t a)
{
float64 fa = g_to_float64(env, GETPC(), a);
return float64_to_int64_round_to_zero(fa, &FP_STATUS);
}
-uint64_t helper_cvtqg(CPUAlphaState *env, uint64_t a)
+uint64_t HELPER(cvtqg)(CPUAlphaState *env, uint64_t a)
{
float64 fr;
fr = int64_to_float64(a, &FP_STATUS);