Commit 806c9d71 authored by Nikunj A Dadhania's avatar Nikunj A Dadhania Committed by David Gibson
Browse files

target/ppc: fmadd check for excp independently 



Current order of checking does not confirm with the spec
(ISA 3.0: MultiplyAddDP page-469). Change the order and make them
independent of each other.

For example: a = infinity, b = zero, c = SNaN, this should set both
VXIMZ and VXNAN

Signed-off-by: default avatarNikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 17b7c39e

target/ppc/fpu_helper.c

+12 −8
Original line number Diff line number Diff line
@@ -747,16 +747,20 @@ static void float64_maddsub_update_excp(CPUPPCState *env, float64 arg1, 
                                        float64 arg2, float64 arg3,

                                        unsigned int madd_flags)

{

    if (unlikely((float64_is_infinity(arg1) && float64_is_zero(arg2)) ||

                 (float64_is_zero(arg1) && float64_is_infinity(arg2)))) {

        /* Multiplication of zero by infinity */

        arg1 = float_invalid_op_excp(env, POWERPC_EXCP_FP_VXIMZ, 1);

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

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

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

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

        /* sNaN operation */

        float_invalid_op_excp(env, POWERPC_EXCP_FP_VXSNAN, 1);

    } else if ((float64_is_infinity(arg1) || float64_is_infinity(arg2)) &&

    }



    if (unlikely((float64_is_infinity(arg1) && float64_is_zero(arg2)) ||

                 (float64_is_zero(arg1) && float64_is_infinity(arg2)))) {

        /* Multiplication of zero by infinity */

        float_invalid_op_excp(env, POWERPC_EXCP_FP_VXIMZ, 1);

    }



    if ((float64_is_infinity(arg1) || float64_is_infinity(arg2)) &&

        float64_is_infinity(arg3)) {

        uint8_t aSign, bSign, cSign;