Diff: TARGET_NRF51_DK/compiler_abstraction.h

Revision:

123:b0220dba8be7

Parent:

97:433970e64889

--- a/TARGET_NRF51_DK/compiler_abstraction.h	Thu Jul 07 14:34:11 2016 +0100
+++ b/TARGET_NRF51_DK/compiler_abstraction.h	Fri Aug 12 13:04:35 2016 +0200
@@ -1,107 +1,133 @@
-/* Copyright (c) 2013, Nordic Semiconductor ASA
+/* 
+ * Copyright (c) 2015 Nordic Semiconductor ASA
  * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * 
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * 
+ *   1. Redistributions of source code must retain the above copyright notice, this list 
+ *      of conditions and the following disclaimer.
  *
- *   * Redistributions of source code must retain the above copyright notice, this
- *     list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA 
+ *      integrated circuit in a product or a software update for such product, 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.
  *
- *   * 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.
+ *   3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be 
+ *      used to endorse or promote products derived from this software without specific prior 
+ *      written permission.
  *
- *   * Neither the name of Nordic Semiconductor ASA nor the names of its
- *     contributors may be used to endorse or promote products derived from
- *     this software without specific prior written permission.
+ *   4. This software, with or without modification, must only be used with a 
+ *      Nordic Semiconductor ASA integrated circuit.
  *
- * 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 HOLDER 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.
- *
+ *   5. Any software provided in binary or object form under this license must not be reverse 
+ *      engineered, decompiled, modified and/or disassembled. 
+ * 
+ * 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 HOLDER 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.
+ * 
  */
+
 #ifndef _COMPILER_ABSTRACTION_H
 #define _COMPILER_ABSTRACTION_H
 
 /*lint ++flb "Enter library region" */
 
 #if defined ( __CC_ARM )
-    
+
     #ifndef __ASM
-        #define __ASM               __asm                       /*!< asm keyword for ARM Compiler */
+        #define __ASM               __asm
     #endif
-    
+
     #ifndef __INLINE
-        #define __INLINE            __inline                    /*!< inline keyword for ARM Compiler */
+        #define __INLINE            __inline
     #endif
-    
+
     #ifndef __WEAK
-        #define __WEAK              __weak                      /*!< weak keyword for ARM Compiler */
+        #define __WEAK              __weak
     #endif
-    
-    #define GET_SP()                __current_sp()              /*!> read current SP function for ARM Compiler */
-  
+
+    #ifndef __ALIGN
+        #define __ALIGN(n)          __align(n)
+    #endif
+
+    #define GET_SP()                __current_sp()
+
 #elif defined ( __ICCARM__ )
-    
+
     #ifndef __ASM
-        #define __ASM               __asm                       /*!< asm keyword for IAR Compiler */
+        #define __ASM               __asm
     #endif
-    
+
     #ifndef __INLINE
-        #define __INLINE            inline                      /*!< inline keyword for IAR Compiler. Only available in High optimization mode! */
+        #define __INLINE            inline
     #endif
-    
+
     #ifndef __WEAK
-        #define __WEAK              __weak                      /*!> define weak function for IAR Compiler */
+        #define __WEAK              __weak
     #endif
-    
-    #define GET_SP()                __get_SP()                  /*!> read current SP function for IAR Compiler */
-    
+
+    /* Not defined for IAR since it requires a new line to work, and C preprocessor does not allow that. */
+    #ifndef __ALIGN
+        #define __ALIGN(n)
+    #endif
+
+    #define GET_SP()                __get_SP()
+
 #elif defined   ( __GNUC__ )
-    
+
     #ifndef __ASM
-        #define __ASM               __asm                       /*!< asm keyword for GNU Compiler */
+        #define __ASM               __asm
     #endif
-    
+
     #ifndef __INLINE
-        #define __INLINE            inline                      /*!< inline keyword for GNU Compiler */
+        #define __INLINE            inline
     #endif
-    
+
     #ifndef __WEAK
-        #define __WEAK              __attribute__((weak))       /*!< weak keyword for GNU Compiler */
+        #define __WEAK              __attribute__((weak))
     #endif
-    
-    #define GET_SP()                gcc_current_sp()            /*!> read current SP function for GNU Compiler */
+
+    #ifndef __ALIGN
+        #define __ALIGN(n)          __attribute__((aligned(n)))
+    #endif
+
+    #define GET_SP()                gcc_current_sp()
 
     static inline unsigned int gcc_current_sp(void)
     {
-        register unsigned sp asm("sp");
+        register unsigned sp __ASM("sp");
         return sp;
     }
-    
+
 #elif defined   ( __TASKING__ )
-        
-    #ifndef __ASM        
-        #define __ASM               __asm                       /*!< asm keyword for TASKING Compiler */
+
+    #ifndef __ASM
+        #define __ASM               __asm
     #endif
-    
+
     #ifndef __INLINE
-        #define __INLINE            inline                      /*!< inline keyword for TASKING Compiler */
+        #define __INLINE            inline
     #endif
-    
+
     #ifndef __WEAK
-        #define __WEAK              __attribute__((weak))       /*!< weak keyword for TASKING Compiler */
+        #define __WEAK              __attribute__((weak))
     #endif
-    
-    #define GET_SP()                __get_MSP()                 /*!> read current SP function for TASKING Compiler */
-    
+
+    #ifndef __ALIGN
+        #define __ALIGN(n)          __align(n)
+    #endif
+
+    #define GET_SP()                __get_MSP()
+
 #endif
 
 /*lint --flb "Leave library region" */