target/ppc: Rename sfprf to sfifprf where it's also used as set fi flag
The bit FI fix used the sfprf flag as a flag for the set_fi parameter in do_float_check_status where applicable. Now, this patch rename this flag to sfifprf to state this dual usage. Signed-off-by: Víctor Colombo <victor.colombo@eldorado.org.br> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Rashmica Gupta <rashmica.g@gmail.com> Message-Id: <20220517161522.36132-4-victor.colombo@eldorado.org.br> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Víctor Colombo
Daniel Henrique Barboza
parent
c582a1dbc8
commit
dd657a35b4
|
|
@ -1693,9 +1693,9 @@ uint32_t helper_efdcmpeq(CPUPPCState *env, uint64_t op1, uint64_t op2)
|
|||
* nels - number of elements (1, 2 or 4)
|
||||
* tp - type (float32 or float64)
|
||||
* fld - vsr_t field (VsrD(*) or VsrW(*))
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_ADD_SUB(name, op, nels, tp, fld, sfprf, r2sp) \
|
||||
#define VSX_ADD_SUB(name, op, nels, tp, fld, sfifprf, r2sp) \
|
||||
void helper_##name(CPUPPCState *env, ppc_vsr_t *xt, \
|
||||
ppc_vsr_t *xa, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
|
|
@ -1712,19 +1712,19 @@ void helper_##name(CPUPPCState *env, ppc_vsr_t *xt, \
|
|||
\
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { \
|
||||
float_invalid_op_addsub(env, tstat.float_exception_flags, \
|
||||
sfprf, GETPC()); \
|
||||
sfifprf, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (r2sp) { \
|
||||
t.fld = do_frsp(env, t.fld, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_float64(env, t.fld); \
|
||||
} \
|
||||
} \
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_ADD_SUB(xsadddp, add, 1, float64, VsrD(0), 1, 0)
|
||||
|
|
@ -1769,9 +1769,9 @@ void helper_xsaddqp(CPUPPCState *env, uint32_t opcode,
|
|||
* nels - number of elements (1, 2 or 4)
|
||||
* tp - type (float32 or float64)
|
||||
* fld - vsr_t field (VsrD(*) or VsrW(*))
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_MUL(op, nels, tp, fld, sfprf, r2sp) \
|
||||
#define VSX_MUL(op, nels, tp, fld, sfifprf, r2sp) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, \
|
||||
ppc_vsr_t *xa, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
|
|
@ -1788,20 +1788,20 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, \
|
|||
\
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { \
|
||||
float_invalid_op_mul(env, tstat.float_exception_flags, \
|
||||
sfprf, GETPC()); \
|
||||
sfifprf, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (r2sp) { \
|
||||
t.fld = do_frsp(env, t.fld, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_float64(env, t.fld); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_MUL(xsmuldp, 1, float64, VsrD(0), 1, 0)
|
||||
|
|
@ -1840,9 +1840,9 @@ void helper_xsmulqp(CPUPPCState *env, uint32_t opcode,
|
|||
* nels - number of elements (1, 2 or 4)
|
||||
* tp - type (float32 or float64)
|
||||
* fld - vsr_t field (VsrD(*) or VsrW(*))
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_DIV(op, nels, tp, fld, sfprf, r2sp) \
|
||||
#define VSX_DIV(op, nels, tp, fld, sfifprf, r2sp) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, \
|
||||
ppc_vsr_t *xa, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
|
|
@ -1859,7 +1859,7 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, \
|
|||
\
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { \
|
||||
float_invalid_op_div(env, tstat.float_exception_flags, \
|
||||
sfprf, GETPC()); \
|
||||
sfifprf, GETPC()); \
|
||||
} \
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_divbyzero)) { \
|
||||
float_zero_divide_excp(env, GETPC()); \
|
||||
|
|
@ -1869,13 +1869,13 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, \
|
|||
t.fld = do_frsp(env, t.fld, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_float64(env, t.fld); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_DIV(xsdivdp, 1, float64, VsrD(0), 1, 0)
|
||||
|
|
@ -1917,9 +1917,9 @@ void helper_xsdivqp(CPUPPCState *env, uint32_t opcode,
|
|||
* nels - number of elements (1, 2 or 4)
|
||||
* tp - type (float32 or float64)
|
||||
* fld - vsr_t field (VsrD(*) or VsrW(*))
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_RE(op, nels, tp, fld, sfprf, r2sp) \
|
||||
#define VSX_RE(op, nels, tp, fld, sfifprf, r2sp) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
ppc_vsr_t t = { }; \
|
||||
|
|
@ -1937,13 +1937,13 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
|||
t.fld = do_frsp(env, t.fld, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_float64(env, t.fld); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_RE(xsredp, 1, float64, VsrD(0), 1, 0)
|
||||
|
|
@ -1957,9 +1957,9 @@ VSX_RE(xvresp, 4, float32, VsrW(i), 0, 0)
|
|||
* nels - number of elements (1, 2 or 4)
|
||||
* tp - type (float32 or float64)
|
||||
* fld - vsr_t field (VsrD(*) or VsrW(*))
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_SQRT(op, nels, tp, fld, sfprf, r2sp) \
|
||||
#define VSX_SQRT(op, nels, tp, fld, sfifprf, r2sp) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
ppc_vsr_t t = { }; \
|
||||
|
|
@ -1975,20 +1975,20 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
|||
\
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { \
|
||||
float_invalid_op_sqrt(env, tstat.float_exception_flags, \
|
||||
sfprf, GETPC()); \
|
||||
sfifprf, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (r2sp) { \
|
||||
t.fld = do_frsp(env, t.fld, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_float64(env, t.fld); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_SQRT(xssqrtdp, 1, float64, VsrD(0), 1, 0)
|
||||
|
|
@ -2002,9 +2002,9 @@ VSX_SQRT(xvsqrtsp, 4, float32, VsrW(i), 0, 0)
|
|||
* nels - number of elements (1, 2 or 4)
|
||||
* tp - type (float32 or float64)
|
||||
* fld - vsr_t field (VsrD(*) or VsrW(*))
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_RSQRTE(op, nels, tp, fld, sfprf, r2sp) \
|
||||
#define VSX_RSQRTE(op, nels, tp, fld, sfifprf, r2sp) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
ppc_vsr_t t = { }; \
|
||||
|
|
@ -2020,19 +2020,19 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
|||
env->fp_status.float_exception_flags |= tstat.float_exception_flags; \
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { \
|
||||
float_invalid_op_sqrt(env, tstat.float_exception_flags, \
|
||||
sfprf, GETPC()); \
|
||||
sfifprf, GETPC()); \
|
||||
} \
|
||||
if (r2sp) { \
|
||||
t.fld = do_frsp(env, t.fld, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_float64(env, t.fld); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_RSQRTE(xsrsqrtedp, 1, float64, VsrD(0), 1, 0)
|
||||
|
|
@ -2158,9 +2158,9 @@ VSX_TSQRT(xvtsqrtsp, 4, float32, VsrW(i), -126, 23)
|
|||
* fld - vsr_t field (VsrD(*) or VsrW(*))
|
||||
* maddflgs - flags for the float*muladd routine that control the
|
||||
* various forms (madd, msub, nmadd, nmsub)
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_MADD(op, nels, tp, fld, maddflgs, sfprf) \
|
||||
#define VSX_MADD(op, nels, tp, fld, maddflgs, sfifprf) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, \
|
||||
ppc_vsr_t *s1, ppc_vsr_t *s2, ppc_vsr_t *s3) \
|
||||
{ \
|
||||
|
|
@ -2177,15 +2177,15 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, \
|
|||
\
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { \
|
||||
float_invalid_op_madd(env, tstat.float_exception_flags, \
|
||||
sfprf, GETPC()); \
|
||||
sfifprf, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_float64(env, t.fld); \
|
||||
} \
|
||||
} \
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_MADD(XSMADDDP, 1, float64, VsrD(0), MADD_FLGS, 1)
|
||||
|
|
@ -2670,9 +2670,9 @@ VSX_CMP(xvcmpnesp, 4, float32, VsrW(i), eq, 0, 0)
|
|||
* ttp - target type (float32 or float64)
|
||||
* sfld - source vsr_t field
|
||||
* tfld - target vsr_t field (f32 or f64)
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_CVT_FP_TO_FP(op, nels, stp, ttp, sfld, tfld, sfprf) \
|
||||
#define VSX_CVT_FP_TO_FP(op, nels, stp, ttp, sfld, tfld, sfifprf) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
ppc_vsr_t t = { }; \
|
||||
|
|
@ -2685,19 +2685,19 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
|||
float_invalid_op_vxsnan(env, GETPC()); \
|
||||
t.tfld = ttp##_snan_to_qnan(t.tfld); \
|
||||
} \
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_##ttp(env, t.tfld); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_CVT_FP_TO_FP(xscvspdp, 1, float32, float64, VsrW(0), VsrD(0), 1)
|
||||
VSX_CVT_FP_TO_FP(xvcvspdp, 2, float32, float64, VsrW(2 * i), VsrD(i), 0)
|
||||
|
||||
#define VSX_CVT_FP_TO_FP2(op, nels, stp, ttp, sfprf) \
|
||||
#define VSX_CVT_FP_TO_FP2(op, nels, stp, ttp, sfifprf) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
ppc_vsr_t t = { }; \
|
||||
|
|
@ -2710,14 +2710,14 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
|||
float_invalid_op_vxsnan(env, GETPC()); \
|
||||
t.VsrW(2 * i) = ttp##_snan_to_qnan(t.VsrW(2 * i)); \
|
||||
} \
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_##ttp(env, t.VsrW(2 * i)); \
|
||||
} \
|
||||
t.VsrW(2 * i + 1) = t.VsrW(2 * i); \
|
||||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_CVT_FP_TO_FP2(xvcvdpsp, 2, float64, float32, 0)
|
||||
|
|
@ -2733,9 +2733,9 @@ VSX_CVT_FP_TO_FP2(xscvdpsp, 1, float64, float32, 1)
|
|||
* tfld - target vsr_t field (f32 or f64)
|
||||
* sfprf - set FPRF
|
||||
*/
|
||||
#define VSX_CVT_FP_TO_FP_VECTOR(op, nels, stp, ttp, sfld, tfld, sfprf) \
|
||||
void helper_##op(CPUPPCState *env, uint32_t opcode, \
|
||||
ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
#define VSX_CVT_FP_TO_FP_VECTOR(op, nels, stp, ttp, sfld, tfld, sfprf) \
|
||||
void helper_##op(CPUPPCState *env, uint32_t opcode, \
|
||||
ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
ppc_vsr_t t = *xt; \
|
||||
int i; \
|
||||
|
|
@ -2767,9 +2767,9 @@ VSX_CVT_FP_TO_FP_VECTOR(xscvdpqp, 1, float64, float128, VsrD(0), f128, 1)
|
|||
* ttp - target type
|
||||
* sfld - source vsr_t field
|
||||
* tfld - target vsr_t field
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_CVT_FP_TO_FP_HP(op, nels, stp, ttp, sfld, tfld, sfprf) \
|
||||
#define VSX_CVT_FP_TO_FP_HP(op, nels, stp, ttp, sfld, tfld, sfifprf) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
ppc_vsr_t t = { }; \
|
||||
|
|
@ -2782,13 +2782,13 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
|||
float_invalid_op_vxsnan(env, GETPC()); \
|
||||
t.tfld = ttp##_snan_to_qnan(t.tfld); \
|
||||
} \
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_##ttp(env, t.tfld); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_CVT_FP_TO_FP_HP(xscvdphp, 1, float64, float16, VsrD(0), VsrH(3), 1)
|
||||
|
|
@ -3035,9 +3035,9 @@ VSX_CVT_FP_TO_INT_VECTOR(xscvqpuwz, float128, uint32, f128, VsrD(0), 0x0ULL)
|
|||
* sfld - source vsr_t field
|
||||
* tfld - target vsr_t field
|
||||
* jdef - definition of the j index (i or 2*i)
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_CVT_INT_TO_FP(op, nels, stp, ttp, sfld, tfld, sfprf, r2sp) \
|
||||
#define VSX_CVT_INT_TO_FP(op, nels, stp, ttp, sfld, tfld, sfifprf, r2sp)\
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
ppc_vsr_t t = { }; \
|
||||
|
|
@ -3048,13 +3048,13 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
|||
if (r2sp) { \
|
||||
t.tfld = do_frsp(env, t.tfld, GETPC()); \
|
||||
} \
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_float64(env, t.tfld); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_CVT_INT_TO_FP(xscvsxddp, 1, int64, float64, VsrD(0), VsrD(0), 1, 0)
|
||||
|
|
@ -3136,9 +3136,9 @@ VSX_CVT_INT_TO_FP_VECTOR(xscvudqp, uint64, float128, VsrD(0), f128)
|
|||
* tp - type (float32 or float64)
|
||||
* fld - vsr_t field (VsrD(*) or VsrW(*))
|
||||
* rmode - rounding mode
|
||||
* sfprf - set FPRF
|
||||
* sfifprf - set FI and FPRF
|
||||
*/
|
||||
#define VSX_ROUND(op, nels, tp, fld, rmode, sfprf) \
|
||||
#define VSX_ROUND(op, nels, tp, fld, rmode, sfifprf) \
|
||||
void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
||||
{ \
|
||||
ppc_vsr_t t = { }; \
|
||||
|
|
@ -3158,7 +3158,7 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
|||
} else { \
|
||||
t.fld = tp##_round_to_int(xb->fld, &env->fp_status); \
|
||||
} \
|
||||
if (sfprf) { \
|
||||
if (sfifprf) { \
|
||||
helper_compute_fprf_float64(env, t.fld); \
|
||||
} \
|
||||
} \
|
||||
|
|
@ -3174,7 +3174,7 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
|
|||
} \
|
||||
\
|
||||
*xt = t; \
|
||||
do_float_check_status(env, sfprf, GETPC()); \
|
||||
do_float_check_status(env, sfifprf, GETPC()); \
|
||||
}
|
||||
|
||||
VSX_ROUND(xsrdpi, 1, float64, VsrD(0), float_round_ties_away, 1)
|
||||
|
|
|
|||
Loading…
Reference in New Issue