Diff: cmsis_dsp/BasicMathFunctions/arm_abs_q15.c

Revision:

3:7a284390b0ce

Parent:

2:da51fb522205

--- a/cmsis_dsp/BasicMathFunctions/arm_abs_q15.c	Thu May 30 17:10:11 2013 +0100
+++ b/cmsis_dsp/BasicMathFunctions/arm_abs_q15.c	Fri Nov 08 13:45:10 2013 +0000
@@ -1,8 +1,8 @@
 /* ----------------------------------------------------------------------    
-* Copyright (C) 2010 ARM Limited. All rights reserved.    
+* Copyright (C) 2010-2013 ARM Limited. All rights reserved.    
 *    
-* $Date:        15. February 2012  
-* $Revision: 	V1.1.0  
+* $Date:        17. January 2013
+* $Revision: 	V1.4.1
 *    
 * Project: 	    CMSIS DSP Library    
 * Title:		arm_abs_q15.c    
@@ -11,26 +11,31 @@
 *    
 * Target Processor: Cortex-M4/Cortex-M3/Cortex-M0
 *  
-* Version 1.1.0 2012/02/15 
-*    Updated with more optimizations, bug fixes and minor API changes.  
-*   
-* Version 1.0.10 2011/7/15  
-*    Big Endian support added and Merged M0 and M3/M4 Source code.   
-*    
-* Version 1.0.3 2010/11/29   
-*    Re-organized the CMSIS folders and updated documentation.    
-*     
-* Version 1.0.2 2010/11/11    
-*    Documentation updated.     
-*    
-* Version 1.0.1 2010/10/05     
-*    Production release and review comments incorporated.    
-*    
-* Version 1.0.0 2010/09/20     
-*    Production release and review comments incorporated.    
-*    
-* Version 0.0.7  2010/06/10     
-*    Misra-C changes done    
+* Redistribution and use in source and binary forms, with or without 
+* modification, are permitted provided that the following conditions
+* are met:
+*   - Redistributions of source code must retain the above copyright
+*     notice, this list of conditions and the following disclaimer.
+*   - Redistributions in binary form must reproduce the above copyright
+*     notice, this list of conditions and the following disclaimer in
+*     the documentation and/or other materials provided with the 
+*     distribution.
+*   - Neither the name of ARM LIMITED nor the names of its contributors
+*     may be used to endorse or promote products derived from this
+*     software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE. 
 * -------------------------------------------------------------------- */
 
 #include "arm_math.h"
@@ -64,7 +69,8 @@
 {
   uint32_t blkCnt;                               /* loop counter */
 
-#ifndef ARM_MATH_CM0
+#ifndef ARM_MATH_CM0_FAMILY
+  __SIMD32_TYPE *simd;
 
 /* Run the below code for Cortex-M4 and Cortex-M3 */
 
@@ -77,6 +83,7 @@
 
   /* First part of the processing with loop unrolling.  Compute 4 outputs at a time.    
    ** a second loop below computes the remaining 1 to 3 samples. */
+  simd = __SIMD32_CONST(pDst);
   while(blkCnt > 0u)
   {
     /* C = |A| */
@@ -86,19 +93,17 @@
 
 
     /* Store the Absolute result in the destination buffer by packing the two values, in a single cycle */
-
 #ifndef  ARM_MATH_BIG_ENDIAN
-
-    *__SIMD32(pDst)++ =
-      __PKHBT(((in1 > 0) ? in1 : __QSUB16(0, in1)),
-              ((in2 > 0) ? in2 : __QSUB16(0, in2)), 16);
+    *simd++ =
+      __PKHBT(((in1 > 0) ? in1 : (q15_t)__QSUB16(0, in1)),
+              ((in2 > 0) ? in2 : (q15_t)__QSUB16(0, in2)), 16);
 
 #else
 
 
-    *__SIMD32(pDst)++ =
-      __PKHBT(((in2 > 0) ? in2 : __QSUB16(0, in2)),
-              ((in1 > 0) ? in1 : __QSUB16(0, in1)), 16);
+    *simd++ =
+      __PKHBT(((in2 > 0) ? in2 : (q15_t)__QSUB16(0, in2)),
+              ((in1 > 0) ? in1 : (q15_t)__QSUB16(0, in1)), 16);
 
 #endif /* #ifndef  ARM_MATH_BIG_ENDIAN    */
 
@@ -108,23 +113,24 @@
 
 #ifndef  ARM_MATH_BIG_ENDIAN
 
-    *__SIMD32(pDst)++ =
-      __PKHBT(((in1 > 0) ? in1 : __QSUB16(0, in1)),
-              ((in2 > 0) ? in2 : __QSUB16(0, in2)), 16);
+    *simd++ =
+      __PKHBT(((in1 > 0) ? in1 : (q15_t)__QSUB16(0, in1)),
+              ((in2 > 0) ? in2 : (q15_t)__QSUB16(0, in2)), 16);
 
 #else
 
 
-    *__SIMD32(pDst)++ =
-      __PKHBT(((in2 > 0) ? in2 : __QSUB16(0, in2)),
-              ((in1 > 0) ? in1 : __QSUB16(0, in1)), 16);
+    *simd++ =
+      __PKHBT(((in2 > 0) ? in2 : (q15_t)__QSUB16(0, in2)),
+              ((in1 > 0) ? in1 : (q15_t)__QSUB16(0, in1)), 16);
 
 #endif /* #ifndef  ARM_MATH_BIG_ENDIAN    */
 
     /* Decrement the loop counter */
     blkCnt--;
   }
-
+  pDst = (q15_t *)simd;
+	
   /* If the blockSize is not a multiple of 4, compute any remaining output samples here.    
    ** No loop unrolling is used. */
   blkCnt = blockSize % 0x4u;
@@ -136,7 +142,7 @@
     in1 = *pSrc++;
 
     /* Calculate absolute value of input and then store the result in the destination buffer. */
-    *pDst++ = (in1 > 0) ? in1 : __QSUB16(0, in1);
+    *pDst++ = (in1 > 0) ? in1 : (q15_t)__QSUB16(0, in1);
 
     /* Decrement the loop counter */
     blkCnt--;
@@ -164,7 +170,7 @@
     blkCnt--;
   }
 
-#endif /* #ifndef ARM_MATH_CM0 */
+#endif /* #ifndef ARM_MATH_CM0_FAMILY */
 
 }