Commit df984609 authored by malenov's avatar malenov Committed by Sandesh Venkatesh
Browse files

ensure proper incremenation/decremenation of shl/shr BASOP counters

parent dc2facf9

lib_com/basop32.c

+14 −0
Original line number Diff line number Diff line
@@ -2825,6 +2825,11 @@ Word16 shr_ro( Word16 var1, Word16 var2, Flag *Overflow ) 
    {

        var_out = shr_o( var1, var2, Overflow );



#ifdef FIX_1049_SHR_RO_COMPLEXITY

#ifdef WMOPS

        multiCounter[currCounter].shr--;

#endif

#endif

        if ( var2 > 0 )

        {

            if ( ( var1 & ( (Word16) 1 << ( var2 - 1 ) ) ) != 0 )
@@ -2833,6 +2838,15 @@ Word16 shr_ro( Word16 var1, Word16 var2, Flag *Overflow ) 
            }

        }

    }



#ifdef FIX_1049_SHR_RO_COMPLEXITY

#ifdef WMOPS

    multiCounter[currCounter].shr_r++;

#endif



    BASOP_CHECK();

#endif



    return ( var_out );

}

Word16 shr_r_sat( Word16 var1, Word16 var2 )

lib_com/enh1632.c

+0 −4
Original line number Diff line number Diff line
@@ -410,16 +410,12 @@ Word16 shl_r( Word16 var1, Word16 var2 ) 
        var_out = shr_r( var1, var2 );

#endif

#ifdef WMOPS

#ifndef FIX_1049_SHR_RO_COMPLEXITY

        multiCounter[currCounter].shr_r--;

#endif

#endif /* ifdef WMOPS */

    }



#ifdef WMOPS

#ifndef FIX_1049_SHR_RO_COMPLEXITY

    multiCounter[currCounter].shl_r++;

#endif

#endif /* ifdef WMOPS */



    return ( var_out );