Commit 57483867 authored by Richard Henderson's avatar Richard Henderson Committed by David Gibson
Browse files

target/ppc: Split out float_invalid_op_addsub 



Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 0394d7a6

target/ppc/fpu_helper.c

+26 −34
Original line number Diff line number Diff line
@@ -648,6 +648,17 @@ 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)

{

    if ((classes & ~is_neg) == is_inf) {

        /* Magnitude subtraction of infinities */

        float_invalid_op_vxisi(env, set_fpcc, retaddr);

    } else if (classes & is_snan) {

        float_invalid_op_vxsnan(env, retaddr);

    }

}



/* fadd - fadd. */

float64 helper_fadd(CPUPPCState *env, float64 arg1, float64 arg2)

{
@@ -655,14 +666,9 @@ float64 helper_fadd(CPUPPCState *env, float64 arg1, float64 arg2) 
    int status = get_float_exception_flags(&env->fp_status);



    if (unlikely(status & float_flag_invalid)) {

        if (float64_is_infinity(arg1) && float64_is_infinity(arg2)) {

            /* Magnitude subtraction of infinities */

            float_invalid_op_vxisi(env, 1, GETPC());

        } else if (float64_is_signaling_nan(arg1, &env->fp_status) ||

                   float64_is_signaling_nan(arg2, &env->fp_status)) {

            /* sNaN addition */

            float_invalid_op_vxsnan(env, GETPC());

        }

        float_invalid_op_addsub(env, 1, GETPC(),

                                float64_classify(arg1) |

                                float64_classify(arg2));

    }



    return ret;
@@ -675,14 +681,9 @@ float64 helper_fsub(CPUPPCState *env, float64 arg1, float64 arg2) 
    int status = get_float_exception_flags(&env->fp_status);



    if (unlikely(status & float_flag_invalid)) {

        if (float64_is_infinity(arg1) && float64_is_infinity(arg2)) {

            /* Magnitude subtraction of infinities */

            float_invalid_op_vxisi(env, 1, GETPC());

        } else if (float64_is_signaling_nan(arg1, &env->fp_status) ||

                   float64_is_signaling_nan(arg2, &env->fp_status)) {

            /* sNaN addition */

            float_invalid_op_vxsnan(env, GETPC());

        }

        float_invalid_op_addsub(env, 1, GETPC(),

                                float64_classify(arg1) |

                                float64_classify(arg2));

    }



    return ret;
@@ -1803,12 +1804,9 @@ void helper_##name(CPUPPCState *env, uint32_t opcode) \ 
        env->fp_status.float_exception_flags |= tstat.float_exception_flags; \

                                                                             \

        if (unlikely(tstat.float_exception_flags & float_flag_invalid)) {    \

            if (tp##_is_infinity(xa.fld) && tp##_is_infinity(xb.fld)) {      \

                float_invalid_op_vxisi(env, sfprf, GETPC());                 \

            } else if (tp##_is_signaling_nan(xa.fld, &tstat) ||              \

                       tp##_is_signaling_nan(xb.fld, &tstat)) {              \

                float_invalid_op_vxsnan(env, GETPC());                       \

            }                                                                \

            float_invalid_op_addsub(env, sfprf, GETPC(),                     \

                                    tp##_classify(xa.fld) |                  \

                                    tp##_classify(xb.fld));                  \

        }                                                                    \

                                                                             \

        if (r2sp) {                                                          \
@@ -1852,12 +1850,9 @@ 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)) {

        if (float128_is_infinity(xa.f128) && float128_is_infinity(xb.f128)) {

            float_invalid_op_vxisi(env, 1, GETPC());

        } else if (float128_is_signaling_nan(xa.f128, &tstat) ||

                   float128_is_signaling_nan(xb.f128, &tstat)) {

            float_invalid_op_vxsnan(env, GETPC());

        }

        float_invalid_op_addsub(env, 1, GETPC(),

                                float128_classify(xa.f128) |

                                float128_classify(xb.f128));

    }



    helper_compute_fprf_float128(env, xt.f128);
@@ -3518,12 +3513,9 @@ 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)) {

        if (float128_is_infinity(xa.f128) && float128_is_infinity(xb.f128)) {

            float_invalid_op_vxisi(env, 1, GETPC());

        } else if (float128_is_signaling_nan(xa.f128, &tstat) ||

                   float128_is_signaling_nan(xb.f128, &tstat)) {

            float_invalid_op_vxsnan(env, GETPC());

        }

        float_invalid_op_addsub(env, 1, GETPC(),

                                float128_classify(xa.f128) |

                                float128_classify(xb.f128));

    }



    helper_compute_fprf_float128(env, xt.f128);