Commit 04143d55 authored by JÜRGEN Gerstacker's avatar JÜRGEN Gerstacker
Browse files

Merge branch... 

Merge branch 'basop-2600-undefined-behaviour-in-basop-implementation-causes-assert-in-stereo-dmx-evs-encoder-with' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into basop-2600-undefined-behaviour-in-basop-implementation-causes-assert-in-stereo-dmx-evs-encoder-with
parents ce103366 9f0142ea

lib_basop/enh64.c

+5 −10
Original line number Diff line number Diff line
@@ -180,18 +180,16 @@ Word64 W_shl_o( Word64 L64_var1, Word16 var2, Flag *Overflow ) 


    if ( var2 <= 0 )

    {

        if ( var2 < -64 )

            var2 = -64;

#ifdef FIX_2600_UNDEF

        var2 = -var2;

#ifdef FIX_2600_UNDEF_SHIFT_SAT

        L64_var_out = L64_var1 >> s_min( 63, var2 );

#ifdef WMOPS

        multiCounter[currCounter].s_min--;

#endif

#else

#ifdef FIX_2600_UNDEF

        assert( var2 <= 63 );

#endif

        if ( var2 < -64 )

            var2 = -64;

        var2 = -var2;

        L64_var_out = L64_var1 >> var2;

#endif

    }
@@ -281,15 +279,12 @@ Word64 W_shr( Word64 L64_var1, Word16 var2 ) 
    }

    else

    {

#ifdef FIX_2600_UNDEF_SHIFT_SAT

#ifdef FIX_2600_UNDEF

        L64_var_out = L64_var1 >> s_min( 63, var2 );

#ifdef WMOPS

        multiCounter[currCounter].s_min--;

#endif

#else

#ifdef FIX_2600_UNDEF

        assert( var2 <= 63 );

#endif

        L64_var_out = L64_var1 >> var2;

#endif

    }