Commit 6c2a12c8 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch... 

Merge branch '1128-basop-l_add_c-erroneous-undeprecate-depr_l_add_c-activate-basop_noglob' into 'main'

Resolve "[BASOP] L_add_c erroneous / undeprecate DEPR_L_add_c"

Closes #1128

See merge request !891
parents 4e780ae3 7686d206

lib_com/basop32.c

+7 −7
Original line number Diff line number Diff line
@@ -1571,7 +1571,7 @@ Word32 DEPR_L_macNs( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry ) 
    Word32 L_var_out;



    L_var_out = L_mult( var1, var2 );

    L_var_out = DEPR_L_add_c( L_var3, L_var_out, Carry );

    L_var_out = L_add_c( L_var3, L_var_out, Carry );



#ifdef WMOPS

    multiCounter[currCounter].L_mult--;
@@ -1938,7 +1938,7 @@ Word32 L_sub_sat( Word32 L_var1, Word32 L_var2 ) 
#ifndef BASOP_NOGLOB

Word32 L_add_c( Word32 L_var1, Word32 L_var2 )

#else  /* BASOP_NOGLOB */

Word32 DEPR_L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry )

Word32 L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry )

#endif /* BASOP_NOGLOB */

{

    Word32 L_var_out;
@@ -2121,13 +2121,13 @@ Word32 L_add_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow ) 
        carry_int ? set_carry( Carry ) : unset_carry( Carry );

    }



#ifdef WMOPS

    multiCounter[currCounter].L_add_c++;

#endif

    return ( L_var_out );

}

Word32 L_add_c( Word32 L_var1, Word32 L_var2 )

{

    return L_add_co( L_var1, L_var2, NULL, NULL );

}

#endif



/*___________________________________________________________________________

 |                                                                           |

 |   Function Name : L_sub_c                                                 |
@@ -2199,7 +2199,7 @@ Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry ) 
#ifndef BASOP_NOGLOB

            L_var_out = L_add_c( L_var1, -L_var2 );

#else  /* BASOP_NOGLOB */

            L_var_out = DEPR_L_add_c( L_var1, -L_var2, Carry );

            L_var_out = L_add_c( L_var1, -L_var2, Carry );

#endif /* BASOP_NOGLOB */

#ifdef WMOPS

            multiCounter[currCounter].L_add_c--;

lib_com/basop32.h

+1 −2
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ Word32 L_macNs( Word32 L_var3, Word16 var1, Word16 var2 ); /* 
Word32 L_msuNs( Word32 L_var3, Word16 var1, Word16 var2 );                   /* Msu without sat, 1 */

Word32 L_add_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow );

Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow );

Word32 L_add_c( Word32 L_var1, Word32 L_var2 );                              /* Long add with c, 2 */

Word32 L_sub_c( Word32 L_var1, Word32 L_var2 );                              /* Long sub with c, 2 */



#endif /* BASOP_NOGLOB */
@@ -189,7 +188,7 @@ Word16 shr_r( Word16 var1, Word16 var2 ); /* Shift right with 
#else                                           /* BASOP_NOGLOB */

Word32 L_add( Word32 L_var1, Word32 L_var2 );                                /* Long add,        1 */

Word32 L_sub( Word32 L_var1, Word32 L_var2 );                                /* Long sub,        1 */

Word32 DEPR_L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry );            /* Long add with c, 2 */

Word32 L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry );                 /* Long add with c, 2 */

Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry );            /* Long sub with c, 2 */

Word32 L_negate( Word32 L_var1 );                                            /* Long negate,     1 */

Word16 mult_r( Word16 var1, Word16 var2 );                                   /* Mult with round, 1 */