shithub: opus

Info  •  Files  •  Log  •  Branches

Harden SILK x86 code

--- a/silk/fixed/x86/burg_modified_FIX_sse4_1.c

+++ b/silk/fixed/x86/burg_modified_FIX_sse4_1.c

@@ -72,7 +72,7 @@

     __m128i FIRST_3210, LAST_3210, ATMP_3210, TMP1_3210, TMP2_3210, T1_3210, T2_3210, PTR_3210, SUBFR_3210, X1_3210, X2_3210;

     __m128i CONST1 = _mm_set1_epi32(1);

-    silk_assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE );

+    celt_assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE );

     /* Compute autocorrelations, added over subframes */

     silk_sum_sqr_shift( &C0, &rshifts, x, nb_subfr * subfr_length );

--- a/silk/fixed/x86/prefilter_FIX_sse.c

+++ b/silk/fixed/x86/prefilter_FIX_sse.c

@@ -49,7 +49,7 @@

     opus_int32   acc_Q11, tmp1, tmp2;

     /* Order must be even */

-    silk_assert( ( order & 1 ) == 0 );

+    celt_assert( ( order & 1 ) == 0 );

     if (order == 10)

     {

@@ -65,7 +65,7 @@

             register opus_int32 state_8, state_9, state_a;

             register opus_int64 coef_Q13_8, coef_Q13_9;

-            silk_assert( length > 0 );

+            celt_assert( length > 0 );

             coef_Q13_3210 = OP_CVTEPI16_EPI32_M64( &coef_Q13[ 0 ] );

             coef_Q13_7654 = OP_CVTEPI16_EPI32_M64( &coef_Q13[ 4 ] );

--- a/silk/x86/NSQ_del_dec_sse4_1.c

+++ b/silk/x86/NSQ_del_dec_sse4_1.c

@@ -247,7 +247,7 @@

                 /* Rewhiten with new A coefs */

                 start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2;

-                silk_assert( start_idx > 0 );

+                celt_assert( start_idx > 0 );

                 silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k * psEncC->subfr_length ],

                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );

@@ -353,7 +353,7 @@

     __m128i b_Q12_0123, b_sr_Q12_0123;

     SAVE_STACK;

-    silk_assert( nStatesDelayedDecision > 0 );

+    celt_assert( nStatesDelayedDecision > 0 );

     ALLOC( psSampleState, nStatesDelayedDecision, NSQ_sample_pair );

     shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];

--- a/silk/x86/NSQ_sse4_1.c

+++ b/silk/x86/NSQ_sse4_1.c

@@ -199,7 +199,7 @@

             if( ( k & ( 3 - silk_LSHIFT( LSF_interpolation_flag, 1 ) ) ) == 0 ) {

                 /* Rewhiten with new A coefs */

                 start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2;

-                silk_assert( start_idx > 0 );

+                celt_assert( start_idx > 0 );

                 silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k * psEncC->subfr_length ],

                     A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch );

--- a/silk/x86/VAD_sse4_1.c

+++ b/silk/x86/VAD_sse4_1.c

@@ -65,9 +65,9 @@

     /* Safety checks */

     silk_assert( VAD_N_BANDS == 4 );

-    silk_assert( MAX_FRAME_LENGTH >= psEncC->frame_length );

-    silk_assert( psEncC->frame_length <= 512 );

-    silk_assert( psEncC->frame_length == 8 * silk_RSHIFT( psEncC->frame_length, 3 ) );

+    celt_assert( MAX_FRAME_LENGTH >= psEncC->frame_length );

+    celt_assert( psEncC->frame_length <= 512 );

+    celt_assert( psEncC->frame_length == 8 * silk_RSHIFT( psEncC->frame_length, 3 ) );

     /***********************/

     /* Filter and Decimate */