OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/ppc: Update float_invalid_op_div for new flags 

Now that vxidi, vxzdz, 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-11-richard.henderson@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Richard Henderson 2021-12-17 17:57:14 +01:00 committed by Cédric Le Goater
parent 4edf55698f
commit c07f82416c
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
target/ppc/fpu_helper.c
View File

@ -557,17 +557,14 @@ float64 helper_fmul(CPUPPCState *env, float64 arg1, float64 arg2)
return ret; return ret;
} }
static void float_invalid_op_div(CPUPPCState *env, bool set_fprc, static void float_invalid_op_div(CPUPPCState *env, int flags,
uintptr_t retaddr, int classes) bool set_fprc, uintptr_t retaddr)
{ {
classes &= ~is_neg; if (flags & float_flag_invalid_idi) {
if (classes == is_inf) {
/* Division of infinity by infinity */
float_invalid_op_vxidi(env, set_fprc, retaddr); float_invalid_op_vxidi(env, set_fprc, retaddr);
} else if (classes == is_zero) { } else if (flags & float_flag_invalid_zdz) {
/* Division of zero by zero */
float_invalid_op_vxzdz(env, set_fprc, retaddr); float_invalid_op_vxzdz(env, set_fprc, retaddr);
} else if (classes & is_snan) { } else if (flags & float_flag_invalid_snan) {
float_invalid_op_vxsnan(env, retaddr); float_invalid_op_vxsnan(env, retaddr);
} }
} }
@ -576,17 +573,13 @@ static void float_invalid_op_div(CPUPPCState *env, bool set_fprc,
float64 helper_fdiv(CPUPPCState *env, float64 arg1, float64 arg2) float64 helper_fdiv(CPUPPCState *env, float64 arg1, float64 arg2)
{ {
float64 ret = float64_div(arg1, arg2, &env->fp_status); float64 ret = float64_div(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)) { if (unlikely(flags & float_flag_invalid)) {
if (status & float_flag_invalid) { float_invalid_op_div(env, flags, 1, GETPC());
float_invalid_op_div(env, 1, GETPC(), }
float64_classify(arg1) | if (unlikely(flags & float_flag_divbyzero)) {
float64_classify(arg2)); float_zero_divide_excp(env, GETPC());
}
if (status & float_flag_divbyzero) {
float_zero_divide_excp(env, GETPC());
}
} }
return ret; return ret;
@ -1803,9 +1796,8 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, \
env->fp_status.float_exception_flags |= tstat.float_exception_flags; \ env->fp_status.float_exception_flags |= tstat.float_exception_flags; \
\ \
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { \ if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { \
float_invalid_op_div(env, sfprf, GETPC(), \ float_invalid_op_div(env, tstat.float_exception_flags, \
tp##_classify(xa->fld) | \ sfprf, GETPC()); \
tp##_classify(xb->fld)); \
} \ } \
if (unlikely(tstat.float_exception_flags & float_flag_divbyzero)) { \ if (unlikely(tstat.float_exception_flags & float_flag_divbyzero)) { \
float_zero_divide_excp(env, GETPC()); \ float_zero_divide_excp(env, GETPC()); \
@ -1846,9 +1838,7 @@ void helper_xsdivqp(CPUPPCState *env, uint32_t opcode,
env->fp_status.float_exception_flags |= tstat.float_exception_flags; env->fp_status.float_exception_flags |= tstat.float_exception_flags;
if (unlikely(tstat.float_exception_flags & float_flag_invalid)) { if (unlikely(tstat.float_exception_flags & float_flag_invalid)) {
float_invalid_op_div(env, 1, GETPC(), float_invalid_op_div(env, tstat.float_exception_flags, 1, GETPC());
float128_classify(xa->f128) |
float128_classify(xb->f128));
} }
if (unlikely(tstat.float_exception_flags & float_flag_divbyzero)) { if (unlikely(tstat.float_exception_flags & float_flag_divbyzero)) {
float_zero_divide_excp(env, GETPC()); float_zero_divide_excp(env, GETPC());