Commit 50bffeb8 authored by vaillancour's avatar vaillancour
Browse files

Add comment -> Critical Overflow, to easy the location of the overflow that... 

Add comment -> Critical Overflow, to easy the location of the overflow that really need to be taken care of, plus some cleaning
parent 2fa81b87

basic_math/log2.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ Word32 pow_10(Word32 x , Word16 *Q) 
  FOR(i =1 ;i <= n ;i++)

  {

	  Overflow = 0;   move16();

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB   /* Critical Overflow */

	  L_tmp = L_shl_o(L_tmp,i, &Overflow);

#else

	  L_tmp = L_shl(L_tmp,i);

lib_com/env_stab_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ Word16 env_stability_fx( /* in Q15 */ 
            mem_norm[i] = ynrm[i];      move16();

        }

        Overflow = 0;   move16();

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB  /* Critical Overflow */

        env_delta = shl_o(*mem_env_delta, 1, &Overflow);

#else

        env_delta = shl(*mem_env_delta, 1);
@@ -89,7 +89,7 @@ Word16 env_stability_fx( /* in Q15 */ 
        *mem_env_delta = round_fx(L_tmp);   /* Q12 */

        Overflow = 0;

        move16();

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB  /* Critical Overflow */

        env_delta = round_fx_o(L_shl_o(L_tmp, 1, &Overflow), &Overflow);   /* Q13 */

#else

        env_delta = round_fx(L_shl(L_tmp, 1));   /* Q13 */

lib_com/lsf_tools_fx.c

+5 −5
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ Word16 E_LPC_f_lsp_pol_get(const Word16 lsp[], Word32 f[], const Word16 n, cons 
    /*b = -2.0f * *plsp;*/

    b = *plsp;

    move16();

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB     /* Critical Overflow */

    m2 = shl_o(-2, sub(15, Q_out), &Overflow);

    f[1] = L_mult_o(b, m2, &Overflow);

#else
@@ -867,14 +867,14 @@ Word16 E_LPC_f_lsp_pol_get(const Word16 lsp[], Word32 f[], const Word16 n, cons 
        /*b = 2.0f * *plsp;*/

        move16();

        b = *plsp;

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB     /* Critical Overflow */

        b32 = L_mult_o(b, m2, &Overflow);

#else

        b32 = L_mult(b, m2);

#endif

        /*f[i] = -b*f[i-1] + 2.0f*f[i-2];*/

        move32();

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB     /* Critical Overflow */

        f[i] = L_shl_o(L_sub_o(f[i - 2], Mpy_32_16_1(f[i - 1], b), &Overflow), 1, &Overflow);

#else

        f[i] = L_shl(L_sub(f[i-2], Mpy_32_16_1(f[i-1], b)),1);
@@ -884,14 +884,14 @@ Word16 E_LPC_f_lsp_pol_get(const Word16 lsp[], Word32 f[], const Word16 n, cons 
        {

            /*f[j] += b*f[j-1] + f[j-2];*/

            move32();

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB   /* Critical Overflow */

            f[j] = L_add_o(f[j], L_sub_o(f[j - 2], L_shl_o(Mpy_32_16_1(f[j - 1], b), 1, &Overflow), &Overflow), &Overflow);

#else

            f[j] = L_add(f[j], L_sub(f[j-2], L_shl(Mpy_32_16_1(f[j-1], b),1)));

#endif

        }

        move32();

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB     /* Critical Overflow */

        f[1] = L_add_o(f[1], b32, &Overflow);

#else

        f[1] = L_add(f[1], b32);

lib_com/swb_bwe_com_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ Word32 calc_tilt_bwe_fx( /* o : Tilt in Q24 */ 
        /* With the shift by 4 and the L_mult0, no overflow possible for 32 samples */

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

        {

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB       /* Critical Overflow */

            tmp1 = mult_ro(*ptr++, 8192, &Overflow); /* Divide by 4 */

            L_ener = L_mac0_o(L_ener, tmp1, tmp1, &Overflow);

#else
@@ -563,7 +563,7 @@ Word32 calc_tilt_bwe_fx( /* o : Tilt in Q24 */ 
            L_ener = L_mac0(L_ener, tmp1, tmp1);

#endif

        }

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB   /* Critical Overflow */

        L_ener = L_shr_o(L_ener, exp2, &Overflow);

        L_temp = L_add_o(L_ener_tot, L_ener, &Overflow);

#else
@@ -579,7 +579,7 @@ Word32 calc_tilt_bwe_fx( /* o : Tilt in Q24 */ 
            Overflow = 0;

            move16();

        }

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB         /* Critical Overflow */

        L_ener_tot = L_add_o(L_ener_tot, L_ener, &Overflow);

#else

        L_ener_tot = L_add(L_ener_tot, L_ener);

lib_com/tools_fx.c

+7 −7
Original line number Diff line number Diff line
@@ -2207,7 +2207,7 @@ Word32 Calc_Energy_Autoscaled(/* o: Result (Energy) */ 
    FOR (i = j; i < len; i+=8) /* Process 8 Samples at a time */

    {

        /* divide by 2 so energy will be divided by 4 */

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB   /* Critical Overflow */

        temp = mult_ro(*signal++, 16384, &Overflow);

#else

        temp = mult_r(*signal++, 16384);
@@ -2215,7 +2215,7 @@ Word32 Calc_Energy_Autoscaled(/* o: Result (Energy) */ 
        L_temp = L_mult0(temp, temp);

        FOR (j = 1; j < 8; j++)

        {

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB   /* Critical Overflow */

            temp = mult_ro(*signal++, 16384, &Overflow);

            L_temp = L_mac0_o(L_temp, temp, temp, &Overflow);

#else
@@ -2224,7 +2224,7 @@ Word32 Calc_Energy_Autoscaled(/* o: Result (Energy) */ 
#endif

        }



#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB   /* Critical Overflow */

        L_temp = L_shr_o(L_temp, temp2, &Overflow);

#else

        L_temp = L_shr(L_temp, temp2);
@@ -2236,11 +2236,11 @@ Word32 Calc_Energy_Autoscaled(/* o: Result (Energy) */ 
           energies are div by 2. Otherwise, nothing is done.

           After the 'IF', the sum is done again and will always

           be without an overflow. */

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB  /* Critical Overflow */

        L_add_o(L_Energy, L_temp, &Overflow);

#else /* BASOP_NOGLOB */

#else 

        L_add(L_Energy, L_temp);

#endif /* BASOP_NOGLOB */

#endif

        IF (Overflow != 0)

        {

            L_Energy = L_shr(L_Energy, 1);
@@ -2249,7 +2249,7 @@ Word32 Calc_Energy_Autoscaled(/* o: Result (Energy) */ 
            Overflow = 0;

            move16();

        }

#ifdef BASOP_NOGLOB

#ifdef BASOP_NOGLOB  /* Critical Overflow */

        L_Energy = L_add_o(L_Energy, L_temp, &Overflow);

#else

        L_Energy = L_add(L_Energy, L_temp);