Commit 46237146 authored by norvell's avatar norvell
Browse files

Merge branch... 

Merge branch 'basop-2641-fix_basop_2563_crash_hq_generic_dec-not-active-or-cleaned-properly' into 'main'

Clean out FIX_BASOP_2563_CRASH_HQ_GENERIC_DEC set active, as intended

See merge request !3092
parents 1c0fab3a 8f0b9906

lib_basop/basop32.c

+0 −4
Original line number Diff line number Diff line
@@ -896,7 +896,6 @@ Word16 shr_o( Word16 var1, Word16 var2, Flag *Overflow ) 


Word16 shr( Word16 var1, Word16 var2 )

{

#ifdef FIX_BASOP_2563_CRASH_HQ_GENERIC_DEC

    Flag Overflow;

    Word16 result;
@@ -908,9 +907,6 @@ Word16 shr( Word16 var1, Word16 var2 ) 
        assert( 0 );

    }

    return result;

#else

    return shr_o( var1, var2, NULL );

#endif

}

Word16 shr_sat( Word16 var1, Word16 var2 )

{