Diff: cmsis_dsp/FilteringFunctions/arm_correlate_fast_q15.c

Revision:

2:da51fb522205

Parent:

1:fdd22bb7aa52

Child:

3:7a284390b0ce

--- a/cmsis_dsp/FilteringFunctions/arm_correlate_fast_q15.c	Wed Nov 28 12:30:09 2012 +0000
+++ b/cmsis_dsp/FilteringFunctions/arm_correlate_fast_q15.c	Thu May 30 17:10:11 2013 +0100
@@ -2,12 +2,12 @@
 * Copyright (C) 2010 ARM Limited. All rights reserved.   
 *   
 * $Date:        15. February 2012  
-* $Revision:     V1.1.0  
+* $Revision: 	V1.1.0  
 *   
-* Project:         CMSIS DSP Library   
-* Title:        arm_correlate_fast_q15.c   
+* Project: 	    CMSIS DSP Library   
+* Title:		arm_correlate_fast_q15.c   
 *   
-* Description:    Fast Q15 Correlation.   
+* Description:	Fast Q15 Correlation.   
 *   
 * Target Processor: Cortex-M4/Cortex-M3
 *  
@@ -279,7 +279,7 @@
       x0 = *__SIMD32(px);
       /* read x[1], x[2] samples */
       x1 = _SIMD32_OFFSET(px + 1);
-      px += 2u;
+	  px += 2u;
 
       /* Apply loop unrolling and compute 4 MACs simultaneously. */
       k = srcBLen >> 2u;
@@ -324,7 +324,7 @@
 
         /* Read x[5], x[6] */
         x1 = _SIMD32_OFFSET(px + 3);
-        px += 4u;
+		px += 4u;
 
         /* acc2 +=  x[4] * y[2] + x[5] * y[3] */
         acc2 = __SMLAD(x0, c0, acc2);
@@ -357,7 +357,7 @@
 
         /* Read x[7] */
         x3 = *__SIMD32(px);
-        px++;
+		px++;
 
         /* Perform the multiply-accumulates */
         acc0 = __SMLAD(x0, c0, acc0);
@@ -376,7 +376,7 @@
 
         /* Read x[9] */
         x2 = _SIMD32_OFFSET(px + 1);
-        px += 2u;
+		px += 2u;
 
         /* Perform the multiply-accumulates */
         acc0 = __SMLAD(x0, c0, acc0);
@@ -414,7 +414,7 @@
 
         /* Read x[10] */
         x3 = _SIMD32_OFFSET(px + 2);
-        px += 3u;
+		px += 3u;
 
         /* Perform the multiply-accumulates */
         acc0 = __SMLADX(x1, c0, acc0);
@@ -823,24 +823,24 @@
       acc3 = 0;
 
       /* read x[0], x[1], x[2] samples */
-      a = *px;
-      b = *(px + 1);
+	  a = *px;
+	  b = *(px + 1);
 
 #ifndef ARM_MATH_BIG_ENDIAN
 
-      x0 = __PKHBT(a, b, 16);
-      a = *(px + 2);
-      x1 = __PKHBT(b, a, 16);
+	  x0 = __PKHBT(a, b, 16);
+	  a = *(px + 2);
+	  x1 = __PKHBT(b, a, 16);
 
 #else
 
-      x0 = __PKHBT(b, a, 16);
-      a = *(px + 2);
-      x1 = __PKHBT(a, b, 16);
+	  x0 = __PKHBT(b, a, 16);
+	  a = *(px + 2);
+	  x1 = __PKHBT(a, b, 16);
 
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
-      px += 2u;
+	  px += 2u;
 
       /* Apply loop unrolling and compute 4 MACs simultaneously. */
       k = srcBLen >> 2u;
@@ -851,18 +851,18 @@
       {
         /* Read the first two inputB samples using SIMD:   
          * y[0] and y[1] */
-          a = *py;
-          b = *(py + 1);
-    
+		  a = *py;
+		  b = *(py + 1);
+	
 #ifndef ARM_MATH_BIG_ENDIAN
-    
-          c0 = __PKHBT(a, b, 16);
-    
+	
+		  c0 = __PKHBT(a, b, 16);
+	
 #else
-    
-          c0 = __PKHBT(b, a, 16);
-    
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+	
+		  c0 = __PKHBT(b, a, 16);
+	
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
         /* acc0 +=  x[0] * y[0] + x[1] * y[1] */
         acc0 = __SMLAD(x0, c0, acc0);
@@ -871,22 +871,22 @@
         acc1 = __SMLAD(x1, c0, acc1);
 
         /* Read x[2], x[3], x[4] */
-          a = *px;
-          b = *(px + 1);
+	  	a = *px;
+	  	b = *(px + 1);
 
 #ifndef ARM_MATH_BIG_ENDIAN
 
-          x2 = __PKHBT(a, b, 16);
-          a = *(px + 2);
-          x3 = __PKHBT(b, a, 16);
+	  	x2 = __PKHBT(a, b, 16);
+	  	a = *(px + 2);
+	  	x3 = __PKHBT(b, a, 16);
 
 #else
 
-          x2 = __PKHBT(b, a, 16);
-          a = *(px + 2);
-          x3 = __PKHBT(a, b, 16);
+	  	x2 = __PKHBT(b, a, 16);
+	  	a = *(px + 2);
+	  	x3 = __PKHBT(a, b, 16);
 
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
         /* acc2 +=  x[2] * y[0] + x[3] * y[1] */
         acc2 = __SMLAD(x2, c0, acc2);
@@ -895,20 +895,20 @@
         acc3 = __SMLAD(x3, c0, acc3);
 
         /* Read y[2] and y[3] */
-          a = *(py + 2);
-          b = *(py + 3);
+		  a = *(py + 2);
+		  b = *(py + 3);
 
-          py += 4u;
-    
+		  py += 4u;
+	
 #ifndef ARM_MATH_BIG_ENDIAN
-    
-          c0 = __PKHBT(a, b, 16);
-    
+	
+		  c0 = __PKHBT(a, b, 16);
+	
 #else
-    
-          c0 = __PKHBT(b, a, 16);
-    
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+	
+		  c0 = __PKHBT(b, a, 16);
+	
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
         /* acc0 +=  x[2] * y[2] + x[3] * y[3] */
         acc0 = __SMLAD(x2, c0, acc0);
@@ -917,24 +917,24 @@
         acc1 = __SMLAD(x3, c0, acc1);
 
         /* Read x[4], x[5], x[6] */
-          a = *(px + 2);
-          b = *(px + 3);
+	  	a = *(px + 2);
+	  	b = *(px + 3);
 
 #ifndef ARM_MATH_BIG_ENDIAN
 
-          x0 = __PKHBT(a, b, 16);
-          a = *(px + 4);
-          x1 = __PKHBT(b, a, 16);
+	  	x0 = __PKHBT(a, b, 16);
+	  	a = *(px + 4);
+	  	x1 = __PKHBT(b, a, 16);
 
 #else
 
-          x0 = __PKHBT(b, a, 16);
-          a = *(px + 4);
-          x1 = __PKHBT(a, b, 16);
+	  	x0 = __PKHBT(b, a, 16);
+	  	a = *(px + 4);
+	  	x1 = __PKHBT(a, b, 16);
 
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
-        px += 4u;
+		px += 4u;
 
         /* acc2 +=  x[4] * y[2] + x[5] * y[3] */
         acc2 = __SMLAD(x0, c0, acc2);
@@ -966,22 +966,22 @@
 #endif /*      #ifdef  ARM_MATH_BIG_ENDIAN     */
 
         /* Read x[7] */
-        a = *px;
-        b = *(px + 1);
+		a = *px;
+		b = *(px + 1);
 
-        px++;;
-    
+		px++;;
+	
 #ifndef ARM_MATH_BIG_ENDIAN
-    
-        x3 = __PKHBT(a, b, 16);
-    
+	
+		x3 = __PKHBT(a, b, 16);
+	
 #else
-    
-        x3 = __PKHBT(b, a, 16);
-    
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+	
+		x3 = __PKHBT(b, a, 16);
+	
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
-        px++;
+		px++;
 
         /* Perform the multiply-accumulates */
         acc0 = __SMLAD(x0, c0, acc0);
@@ -993,38 +993,38 @@
       if(k == 2u)
       {
         /* Read y[4], y[5] */
-          a = *py;
-          b = *(py + 1);
-    
+		  a = *py;
+		  b = *(py + 1);
+	
 #ifndef ARM_MATH_BIG_ENDIAN
-    
-          c0 = __PKHBT(a, b, 16);
-    
+	
+		  c0 = __PKHBT(a, b, 16);
+	
 #else
-    
-          c0 = __PKHBT(b, a, 16);
-    
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+	
+		  c0 = __PKHBT(b, a, 16);
+	
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
         /* Read x[7], x[8], x[9] */
-          a = *px;
-          b = *(px + 1);
+	  	a = *px;
+	  	b = *(px + 1);
 
 #ifndef ARM_MATH_BIG_ENDIAN
 
-          x3 = __PKHBT(a, b, 16);
-          a = *(px + 2);
-          x2 = __PKHBT(b, a, 16);
+	  	x3 = __PKHBT(a, b, 16);
+	  	a = *(px + 2);
+	  	x2 = __PKHBT(b, a, 16);
 
 #else
 
-          x3 = __PKHBT(b, a, 16);
-          a = *(px + 2);
-          x2 = __PKHBT(a, b, 16);
+	  	x3 = __PKHBT(b, a, 16);
+	  	a = *(px + 2);
+	  	x2 = __PKHBT(a, b, 16);
 
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
-        px += 2u;
+		px += 2u;
 
         /* Perform the multiply-accumulates */
         acc0 = __SMLAD(x0, c0, acc0);
@@ -1036,38 +1036,38 @@
       if(k == 3u)
       {
         /* Read y[4], y[5] */
-          a = *py;
-          b = *(py + 1);
-    
+		  a = *py;
+		  b = *(py + 1);
+	
 #ifndef ARM_MATH_BIG_ENDIAN
-    
-          c0 = __PKHBT(a, b, 16);
-    
+	
+		  c0 = __PKHBT(a, b, 16);
+	
 #else
-    
-          c0 = __PKHBT(b, a, 16);
-    
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+	
+		  c0 = __PKHBT(b, a, 16);
+	
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
-        py += 2u;
+		py += 2u;
 
         /* Read x[7], x[8], x[9] */
-          a = *px;
-          b = *(px + 1);
+	  	a = *px;
+	  	b = *(px + 1);
 
 #ifndef ARM_MATH_BIG_ENDIAN
 
-          x3 = __PKHBT(a, b, 16);
-          a = *(px + 2);
-          x2 = __PKHBT(b, a, 16);
+	  	x3 = __PKHBT(a, b, 16);
+	  	a = *(px + 2);
+	  	x2 = __PKHBT(b, a, 16);
 
 #else
 
-          x3 = __PKHBT(b, a, 16);
-          a = *(px + 2);
-          x2 = __PKHBT(a, b, 16);
+	  	x3 = __PKHBT(b, a, 16);
+	  	a = *(px + 2);
+	  	x2 = __PKHBT(a, b, 16);
 
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
         /* Perform the multiply-accumulates */
         acc0 = __SMLAD(x0, c0, acc0);
@@ -1086,19 +1086,19 @@
 #endif /*      #ifdef  ARM_MATH_BIG_ENDIAN     */
 
         /* Read x[10] */
-        b = *(px + 3);
-    
+		b = *(px + 3);
+	
 #ifndef ARM_MATH_BIG_ENDIAN
-    
-        x3 = __PKHBT(a, b, 16);
-    
+	
+		x3 = __PKHBT(a, b, 16);
+	
 #else
-    
-        x3 = __PKHBT(b, a, 16);
-    
-#endif    /*    #ifndef ARM_MATH_BIG_ENDIAN    */
+	
+		x3 = __PKHBT(b, a, 16);
+	
+#endif	/*	#ifndef ARM_MATH_BIG_ENDIAN	*/
 
-        px += 3u;
+		px += 3u;
 
         /* Perform the multiply-accumulates */
         acc0 = __SMLADX(x1, c0, acc0);