Commit 3d3a8eab authored by multrus's avatar multrus
Browse files

[cleanup] accept ISSUE_1836_replace_overflow_libcom__remnant

parent 2b72943e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ 
/* Note: each compile switch (FIX_1101_...) is independent from the other ones */



#define ISSUE_1836_replace_overflow_libcom                   /* FhG: replace overflow operators by non-overflow-alternatives in lib_com - BE */

#define ISSUE_1836_replace_overflow_libcom__remnant          /* FhG: replace remaining overflow operators by non-overflow-alternatives in lib_com - BE */

#define ISSUE_1866_replace_overflow_libdec                   /* FhG: BE - Replace BASOPoverflow operators all over the lib_dec module if Overflow result is not used */



#define FIX_1917_DIRAC_RENDER_PTR_INCR                       /* FhG: fix wrong pointer increment in ivas_dirac_dec_render_sf_fx() for object rendering */

lib_com/weight_a_fx.c

+0 −11
Original line number Diff line number Diff line
@@ -100,13 +100,6 @@ void weight_a_fx( 
    Word16 i, fac;

    Word32 Amax;

    Word16 shift;

#ifndef ISSUE_1836_replace_overflow_libcom__remnant

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow;

    Overflow = 0;

    move32();

#endif

#endif



    fac = gamma; /* Q15 */

    move16();
@@ -124,11 +117,7 @@ void weight_a_fx( 
    move16();

    FOR( i = 1; i < m; i++ )

    {

#ifdef ISSUE_1836_replace_overflow_libcom__remnant

        ap[i] = round_fx_sat( L_shl( L_mult0( a[i], fac ), shift ) ); /* Q11 + shift */

#else

        ap[i] = round_fx_o( L_shl( L_mult0( a[i], fac ), shift ), &Overflow ); /* Q11 + shift */

#endif

        move16();

        fac = mult_r( fac, gamma ); /* Q15 */

    }

lib_com/wi_fx.c

+0 −435

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/window_fx.c

+0 −14
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ void ham_cos_window( 
{

    Word16 i;

    Word32 cte, cc;

#ifndef ISSUE_1836_replace_overflow_libcom__remnant

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();

#endif

#endif





    assert( n1 >= 102 ); /* if n1 is too low -> overflow in div_l */
@@ -47,11 +41,7 @@ void ham_cos_window( 
    {

        /* fh_f[i] = 0.54f - 0.46f * (Float32)cos(cc);	*/

        BASOP_SATURATE_WARNING_OFF_EVS

#ifdef ISSUE_1836_replace_overflow_libcom__remnant

        fh[i] = sub_sat( P54_0Q15, mult_r( getCosWord16( round_fx_sat( L_shl_sat( cc, 9 ) ) ), P92_0Q15 ) ); /*0Q15*/

#else

        fh[i] = sub_o( P54_0Q15, mult_r( getCosWord16( round_fx_o( L_shl_o( cc, 9, &Overflow ), &Overflow ) ), P92_0Q15 ), &Overflow ); /*0Q15*/

#endif

        move16();

        BASOP_SATURATE_WARNING_ON_EVS

        cc = L_add( cc, cte ); /*0Q15*/
@@ -68,11 +58,7 @@ void ham_cos_window( 
    FOR( i = n1; i < n1 + n2; i++ )

    {

        /* fh_f[i] = (Float32)cos(cc);		*/

#ifdef ISSUE_1836_replace_overflow_libcom__remnant

        fh[i] = shl_sat( getCosWord16( round_fx( L_shl( cc, 10 ) ) ), 1 ); /*0Q15*/

#else

        fh[i] = shl_o( getCosWord16( round_fx( L_shl( cc, 10 ) ) ), 1, &Overflow );                                                     /*0Q15*/

#endif

        move16();

        cc = L_add( cc, cte );

    }