Commit 9e0eb11f authored by multrus's avatar multrus
Browse files

BASOP_Util_Divide3232_Scale_FhG(): replace DEPR_L_add_c() by L_add_co();... 

BASOP_Util_Divide3232_Scale_FhG(): replace DEPR_L_add_c() by L_add_co(); currently inactive, since no counting in L_add_co()
parent c8f737ed

lib_com/basop_util.c

+16 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,8 @@ Word32 div_w( Word32 L_num, Word32 L_den ) 
    }

}



// replace depreacted L_add_c() by L_add_co(); currently disabled, because of missing counting in L_add_co();

//#define REPLACE_DEPR_L_ADD_C

Word32 BASOP_Util_Divide3232_Scale_FhG( Word32 x, Word32 y, Word16 *s, Word16 bits )

{

    Word32 z;
@@ -1046,9 +1048,15 @@ Word32 BASOP_Util_Divide3232_Scale_FhG( Word32 x, Word32 y, Word16 *s, Word16 bi 
    Word32 sign;

    Word16 iteration;

    Flag Carry;

#ifdef REPLACE_DEPR_L_ADD_C

    Flag Overflow;

#endif

    Word16 s_val;



    unset_carry( &Carry );

#ifdef REPLACE_DEPR_L_ADD_C

    unset_overflow( &Overflow );

#endif



    /* assert (x >= (Word32)0); */

    assert( y != (Word32) 0 );
@@ -1089,9 +1097,17 @@ Word32 BASOP_Util_Divide3232_Scale_FhG( Word32 x, Word32 y, Word16 *s, Word16 bi 
    {

        if ( L_add( x, y ) >= 0 )

        {

#ifdef REPLACE_DEPR_L_ADD_C

            x = L_add_co( x, y, &Carry, &Overflow ); // sets always carry=1

#else

            x = DEPR_L_add_c( x, y, &Carry ); // sets always carry=1

#endif

        }

#ifdef REPLACE_DEPR_L_ADD_C

        z = L_add_co( z, z, &Carry, &Overflow ); // sets always carry=0

#else

        z = DEPR_L_add_c( z, z, &Carry ); // sets always carry=0

#endif

        x = L_add( x, x );

    }