mirror of
https://github.com/qemu/qemu.git
synced 2024-12-14 06:53:43 +08:00
target/ppc: Update float_invalid_op_addsub for new flags
Now that vxisi and vxsnan are computed directly by softfloat, we don't need to recompute it via classes. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20211119160502.17432-9-richard.henderson@linaro.org> Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
parent
e706d4455b
commit
941298ecd7
@ -498,13 +498,12 @@ void helper_reset_fpstatus(CPUPPCState *env)
|
||||
set_float_exception_flags(0, &env->fp_status);
|
||||
}
|
||||
|
||||
static void float_invalid_op_addsub(CPUPPCState *env, bool set_fpcc,
|
||||
uintptr_t retaddr, int classes)
|
||||
static void float_invalid_op_addsub(CPUPPCState *env, int flags,
|
||||
bool set_fpcc, uintptr_t retaddr)
|
||||
{
|
||||
if ((classes & ~is_neg) == is_inf) {
|
||||
/* Magnitude subtraction of infinities */
|
||||
if (flags & float_flag_invalid_isi) {
|
||||
float_invalid_op_vxisi(env, set_fpcc, retaddr);
|
||||
} else if (classes & is_snan) {
|
||||
} else if (flags & float_flag_invalid_snan) {
|
||||
float_invalid_op_vxsnan(env, retaddr);
|
||||
}
|
||||
}
|
||||
@ -513,12 +512,10 @@ static void float_invalid_op_addsub(CPUPPCState *env, bool set_fpcc,
|
||||
float64 helper_fadd(CPUPPCState *env, float64 arg1, float64 arg2)
|
||||
{
|
||||
float64 ret = float64_add(arg1, arg2, &env->fp_status);
|
||||
int status = get_float_exception_flags(&env->fp_status);
|
||||
int flags = get_float_exception_flags(&env->fp_status);
|
||||
|
||||
if (unlikely(status & float_flag_invalid)) {
|
||||
float_invalid_op_addsub(env, 1, GETPC(),
|
||||
float64_classify(arg1) |
|
||||
float64_classify(arg2));
|
||||
if (unlikely(flags & float_flag_invalid)) {
|
||||
float_invalid_op_addsub(env, flags, 1, GETPC());
|
||||
}
|
||||
|
||||
return ret;
|
||||
@ -528,12 +525,10 @@ float64 helper_fadd(CPUPPCState *env, float64 arg1, float64 arg2)
|
||||
float64 helper_fsub(CPUPPCState *env, float64 arg1, float64 arg2)
|
||||
{
|
||||
float64 ret = float64_sub(arg1, arg2, &env->fp_status);
|
||||
int status = get_float_exception_flags(&env->fp_status);
|
||||
int flags = get_float_exception_flags(&env->fp_status);
|
||||
|
||||
if (unlikely(status & float_flag_invalid)) {
|
||||
float_invalid_op_addsub(env, 1, GETPC(),
|
||||
float64_classify(arg1) |
|
||||
float64_classify(arg2));
|
||||
if (unlikely(flags & float_flag_invalid)) {
|
||||
float_invalid_op_addsub(env, flags, 1, GETPC());
|
||||
}
|
||||
|
||||
return ret;
|
||||
@ -1664,9 +1659,8 @@ void helper_##name(CPUPPCState *env, ppc_vsr_t *xt, \
|
||||
env->fp_status.float_exception_flags |= tstat.float_exception_flags; \
|
||||
\
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { \
|
||||
float_invalid_op_addsub(env, sfprf, GETPC(), \
|
||||
tp##_classify(xa->fld) | \
|
||||
tp##_classify(xb->fld)); \
|
||||
float_invalid_op_addsub(env, tstat.float_exception_flags, \
|
||||
sfprf, GETPC()); \
|
||||
} \
|
||||
\
|
||||
if (r2sp) { \
|
||||
@ -1708,9 +1702,7 @@ void helper_xsaddqp(CPUPPCState *env, uint32_t opcode,
|
||||
env->fp_status.float_exception_flags |= tstat.float_exception_flags;
|
||||
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) {
|
||||
float_invalid_op_addsub(env, 1, GETPC(),
|
||||
float128_classify(xa->f128) |
|
||||
float128_classify(xb->f128));
|
||||
float_invalid_op_addsub(env, tstat.float_exception_flags, 1, GETPC());
|
||||
}
|
||||
|
||||
helper_compute_fprf_float128(env, t.f128);
|
||||
@ -3326,9 +3318,7 @@ void helper_xssubqp(CPUPPCState *env, uint32_t opcode,
|
||||
env->fp_status.float_exception_flags |= tstat.float_exception_flags;
|
||||
|
||||
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) {
|
||||
float_invalid_op_addsub(env, 1, GETPC(),
|
||||
float128_classify(xa->f128) |
|
||||
float128_classify(xb->f128));
|
||||
float_invalid_op_addsub(env, tstat.float_exception_flags, 1, GETPC());
|
||||
}
|
||||
|
||||
helper_compute_fprf_float128(env, t.f128);
|
||||
|
Loading…
Reference in New Issue
Block a user