Commit 1361488c authored by Fabian Bauer's avatar Fabian Bauer
Browse files

bitalloc.c : replaced overflow basops

parent 349f8563

lib_com/bitalloc_fx.c

+8 −2
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ void bitalloc_fx( 
    Word16 diff, temp;

    Word16 fac;

    Word16 ii;

#ifndef ISSUE_1836_replace_overflow_libcom

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();

#endif

#endif

    Word16 SFM_thr = SFM_G1G2;

    move16();
@@ -54,7 +56,11 @@ void bitalloc_fx( 
        move16();

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

        {

#ifdef ISSUE_1836_replace_overflow_libcom

            v = sub_sat( temp, y[m] ); /* Q0 */

#else

            v = sub_o( temp, y[m], &Overflow ); /* Q0 */

#endif

            temp = s_max( temp, y[m] );

            if ( v < 0 )

            {
@@ -245,7 +251,7 @@ Word16 BitAllocF_fx( 
    Word16 tmp, exp1, exp2;

    Word32 Rsubband_w32_fx[NB_SFM]; /* Q15  */

    Word16 B_w16_fx;

#ifndef ISSUE_1796_replace_shl_o

#ifndef ISSUE_1836_replace_overflow_libcom

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -444,7 +450,7 @@ Word16 BitAllocF_fx( 
            exp1 = sub( norm_l( L_tmp2 ), 1 );

            exp2 = norm_s( n );

            tmp = div_s( extract_h( L_shl( L_tmp2, exp1 ) ), shl( n, exp2 ) ); /*15 + 15 + exp1 - 16 - exp2*/

#ifdef ISSUE_1796_replace_shl_o

#ifdef ISSUE_1836_replace_overflow_libcom

            m_fx = shl_sat( tmp, sub( exp2, exp1 ) ); /*Q14*/

#else

            m_fx = shl_o( tmp, sub( exp2, exp1 ), &Overflow ); /*Q14*/