ARMv7-M: Add support for the IAR compiler

arch/arm/include/armv7-m/irq.h

@@ -127,7 +127,7 @@ struct xcptcontext
    * are pending signals to be processed.
    */
 
-  void *sigdeliver; /* Actual type is sig_deliver_t */
+  FAR void *sigdeliver; /* Actual type is sig_deliver_t */
 
   /* These are saved copies of LR, PRIMASK, and xPSR used during
    * signal processing.

arch/arm/src/armv7-m/iar/up_fullcontextrestore.S

@@ -0,0 +1,94 @@
+/************************************************************************************
+ * arch/arm/src/armv7-m/iar/up_fullcontextrestore.S
+ *
+ *   Copyright (C) 2009, 2011, 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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.
+ * 2. 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 NuttX 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.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <arch/irq.h>
+
+#include "nvic.h"
+#include "svcall.h"
+
+	MODULE up_fullcontextrestore
+	SECTION .text:CODE:NOROOT(2)
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Symbols
+ ************************************************************************************/
+
+	PUBLIC up_fullcontextrestore
+
+/************************************************************************************
+ * Macros
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: up_fullcontextrestore
+ *
+ * Description:
+ *   Restore the current thread context.  Full prototype is:
+ *
+ *   void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ *
+ * Return:
+ *   None
+ *
+ ************************************************************************************/
+
+	THUMB
+  
+up_fullcontextrestore:
+
+	/* Perform the System call with R0=1 and R1=regs */
+
+	mov		r1, r0						/* R1: regs */
+	mov		r0, #SYS_restore_context	/* R0: restore context */
+	svc		0							/* Force synchronous SVCall (or Hard Fault) */
+
+	/* This call should not return */
+
+	bx		lr							/* Unnecessary ... will not return */
+  
+	END

arch/arm/src/armv7-m/iar/up_saveusercontext.S

@@ -0,0 +1,101 @@
+/************************************************************************************
+ * arch/arm/src/armv7-m/iar/up_saveusercontext.S
+ *
+ *   Copyright (C) 2009, 2011, 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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.
+ * 2. 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 NuttX 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.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <arch/irq.h>
+
+#include "nvic.h"
+#include "svcall.h"
+
+	MODULE up_saveusercontext
+	SECTION .text:CODE:NOROOT(2)
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Symbols
+ ************************************************************************************/
+
+	PUBLIC up_saveusercontext
+
+/************************************************************************************
+ * Macros
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: up_saveusercontext
+ *
+ * Description:
+ *   Save the current thread context.  Full prototype is:
+ *
+ *   int  up_saveusercontext(uint32_t *saveregs);
+ *
+ * Return:
+ *   0: Normal return
+ *   1: Context switch return
+ *
+ ************************************************************************************/
+
+	THUMB
+
+up_saveusercontext:
+
+	/* Perform the System call with R0=0 and R1=regs */
+
+	mov		r1, r0					/* R1: regs */
+	mov		r0, #SYS_save_context	/* R0: save context (also return value) */
+	svc		0						/* Force synchronous SVCall (or Hard Fault) */
+
+	/* There are two return conditions.  On the first return, R0 (the
+	 * return value will be zero.  On the second return we need to
+	 * force R0 to be 1.
+	 */
+
+	add		r2, r1, #(4*REG_R0)
+	mov		r3, #1
+	str		r3, [r2, #0]
+	bx		lr						/* "normal" return with r0=0 or
+									 * context switch with r0=1 */
+	END

arch/arm/src/armv7-m/iar/up_switchcontext.S

@@ -0,0 +1,96 @@
+/************************************************************************************
+ * arch/arm/src/armv7-m/iar/up_switchcontext.S
+ *
+ *   Copyright (C) 2009-2011, 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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.
+ * 2. 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 NuttX 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.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <arch/irq.h>
+
+#include "nvic.h"
+#include "svcall.h"
+
+	MODULE up_switchcontext
+	SECTION .text:CODE:NOROOT(2)
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Symbols
+ ************************************************************************************/
+
+	PUBLIC up_switchcontext
+
+/************************************************************************************
+ * Macros
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: up_switchcontext
+ *
+ * Description:
+ *   Save the current thread context and restore the specified context.
+ *   Full prototype is:
+ *
+ *   void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
+ *
+ * Return:
+ *   None
+ *
+ ************************************************************************************/
+
+	THUMB
+
+up_switchcontext:
+
+	/* Perform the System call with R0=1, R1=saveregs, R2=restoreregs */
+
+	mov		r2, r1					/* R2: restoreregs */
+	mov		r1, r0					/* R1: saveregs */
+	mov		r0, #SYS_switch_context	/* R0: context switch */
+	svc		0						/* Force synchronous SVCall (or Hard Fault) */
+
+	/* We will get here only after the rerturn from the context switch */
+
+	bx		lr
+
+	END

arch/arm/src/armv7-m/iar/vfork.S

@@ -0,0 +1,141 @@
+/************************************************************************************
+ * arch/arm/src/armv7-m/iar/vfork.S
+ *
+ *   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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.
+ * 2. 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 NuttX 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.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "up_vfork.h"
+
+	MODULE vfork
+	SECTION .text:CODE:NOROOT(2)
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Symbols
+ ************************************************************************************/
+
+	PUBLIC	vfork
+	EXTERN	up_vfork
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: vfork
+ *
+ * Description:
+ *   The vfork() function has the same effect as fork(), except that the behavior is
+ *   undefined if the process created by vfork() either modifies any data other than
+ *   a variable of type pid_t used to store the return value from vfork(), or returns
+ *   from the function in which vfork() was called, or calls any other function before
+ *   successfully calling _exit() or one of the exec family of functions.
+ *
+ *   This thin layer implements vfork by simply calling up_vfork() with the vfork()
+ *   context as an argument.  The overall sequence is:
+ *
+ *   1) User code calls vfork().  vfork() collects context information and
+ *      transfers control up up_vfork().
+ *   2) up_vfork()and calls task_vforksetup().
+ *   3) task_vforksetup() allocates and configures the child task's TCB.  This
+ *      consists of:
+ *      - Allocation of the child task's TCB.
+ *      - Initialization of file descriptors and streams
+ *      - Configuration of environment variables
+ *      - Setup the intput parameters for the task.
+ *      - Initialization of the TCB (including call to up_initial_state()
+ *   4) up_vfork() provides any additional operating context. up_vfork must:
+ *      - Allocate and initialize the stack
+ *      - Initialize special values in any CPU registers that were not
+ *        already configured by up_initial_state()
+ *   5) up_vfork() then calls task_vforkstart()
+ *   6) task_vforkstart() then executes the child thread.
+ *
+ * Input Paremeters:
+ *   None
+ *
+ * Return:
+ *   Upon successful completion, vfork() returns 0 to the child process and returns
+ *   the process ID of the child process to the parent process. Otherwise, -1 is
+ *   returned to the parent, no child process is created, and errno is set to
+ *   indicate the error.
+ *
+ ************************************************************************************/
+
+	THUMB
+
+vfork:
+	/* Create a stack frame */
+
+	mov		r0, sp					/* Save the value of the stack on entry */
+	sub		sp, sp, #VFORK_SIZEOF	/* Allocate the structure on the stack */
+
+	/* CPU registers */
+	/* Save the volatile registers */
+
+	str		r4, [sp, #VFORK_R4_OFFSET]
+	str		r5, [sp, #VFORK_R5_OFFSET]
+	str		r6, [sp, #VFORK_R6_OFFSET]
+	str		r7, [sp, #VFORK_R7_OFFSET]
+	str		r8, [sp, #VFORK_R8_OFFSET]
+	str		r9, [sp, #VFORK_R9_OFFSET]
+	str		r10, [sp, #VFORK_R10_OFFSET]
+
+	/* Save the frame pointer, stack pointer, and return address */
+
+	str		r11, [sp, #VFORK_FP_OFFSET] /* fp not defined. use r11 */
+	str		r0, [sp, #VFORK_SP_OFFSET]
+	str		lr, [sp, #VFORK_LR_OFFSET]
+
+	/* Floating point registers (not yet) */
+
+	/* Then, call up_vfork(), passing it a pointer to the stack structure */
+
+	mov		r0, sp
+	bl		up_vfork
+
+	/* Release the stack data and return the value returned by up_vfork */
+
+	ldr		lr, [sp, #VFORK_LR_OFFSET]
+	add		sp, sp, #VFORK_SIZEOF
+	bx		lr
+
+	END

arch/arm/src/armv7-m/up_hardfault.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-m/up_hardfault.c
  *
- *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -113,15 +113,15 @@ int up_hardfault(int irq, FAR void *context)
    * FLASH region or in the user FLASH region.
    */
 
-  if (((uintptr_t)pc >= (uintptr_t)&_stext &&
+  if (((uintptr_t)pc >= (uintptr_t)_START_TEXT &&
-       (uintptr_t)pc <  (uintptr_t)&_etext) ||
+       (uintptr_t)pc <  (uintptr_t)_END_TEXT) ||
       ((uintptr_t)pc >= (uintptr_t)USERSPACE->us_textstart &&
        (uintptr_t)pc <  (uintptr_t)USERSPACE->us_textend))
 #else
   /* SVCalls are expected only from the base, kernel FLASH region */
 
-  if ((uintptr_t)pc >= (uintptr_t)&_stext &&
+  if ((uintptr_t)pc >= (uintptr_t)_START_TEXT &&
-      (uintptr_t)pc <  (uintptr_t)&_etext)
+      (uintptr_t)pc <  (uintptr_t)_END_TEXT)
 #endif
     {
       /* Fetch the instruction that caused the Hard fault */

arch/arm/src/armv7-m/up_schedulesigaction.c

@@ -139,7 +139,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
                * delivered.
                */
 
-              tcb->xcp.sigdeliver       = sigdeliver;
+              tcb->xcp.sigdeliver       = (FAR void *)sigdeliver;
               tcb->xcp.saved_pc         = CURRENT_REGS[REG_PC];
 #ifdef CONFIG_ARMV7M_USEBASEPRI
               tcb->xcp.saved_basepri    = CURRENT_REGS[REG_BASEPRI];
@@ -185,7 +185,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
            * by the signal trampoline after the signal has been delivered.
            */
 
-          tcb->xcp.sigdeliver       = sigdeliver;
+          tcb->xcp.sigdeliver       = (FAR void *)sigdeliver;
           tcb->xcp.saved_pc         = tcb->xcp.regs[REG_PC];
 #ifdef CONFIG_ARMV7M_USEBASEPRI
           tcb->xcp.saved_basepri    = tcb->xcp.regs[REG_BASEPRI];

arch/arm/src/armv7-m/up_sigdeliver.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-m/up_sigdeliver.c
  *
- *   Copyright (C) 2009-2010, 2013-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009-2010, 2013-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -118,7 +118,7 @@ void up_sigdeliver(void)
    * more signal deliveries while processing the current pending signals.
    */
 
-  sigdeliver           = rtcb->xcp.sigdeliver;
+  sigdeliver           = (sig_deliver_t)rtcb->xcp.sigdeliver;
   rtcb->xcp.sigdeliver = NULL;
 
   /* Then restore the task interrupt state */

arch/arm/src/common/up_internal.h

@@ -176,6 +176,26 @@
 
 #endif
 
+/* Toolchain dependent, linker defined section addresses */
+
+#if defined(__ICCARM__)
+#  define _START_TEXT  __sfb(".text")
+#  define _END_TEXT    __sfe(".text")
+#  define _START_BSS   __sfb(".bss")
+#  define _END_BSS     __sfe(".bss")
+#  define _DATA_INIT   __sfb(".data_init")
+#  define _START_DATA  __sfb(".data")
+#  define _END_DATA    __sfe(".data")
+#else
+#  define _START_TEXT  &_stext
+#  define _END_TEXT    &_etext
+#  define _START_BSS   &_sbss
+#  define _END_BSS     &_ebss
+#  define _DATA_INIT   &_eronly
+#  define _START_DATA  &_sdata
+#  define _END_DATA    &_edata
+#endif
+
 /* This is the value used to mark the stack for subsequent stack monitoring
  * logic.
  */

arch/arm/src/stm32/stm32_start.c

@@ -57,24 +57,6 @@
 #  include "nvic.h"
 #endif
 
-/****************************************************************************
- * Pre-processor definitions
- ****************************************************************************/
-
-#if defined(__ICCARM__)
-#  define _START_BSS  __sfb(".bss")
-#  define _END_BSS    __sfe(".bss")
-#  define _DATA_INIT  __sfb(".data_init")
-#  define _START_DATA __sfb(".data")
-#  define _END_DATA   __sfe(".data")
-#else
-#  define _START_BSS  &_sbss
-#  define _END_BSS    &_ebss
-#  define _DATA_INIT  &_eronly
-#  define _START_DATA &_sdata
-#  define _END_DATA   &_edata
-#endif
-
 /****************************************************************************
  * Private Function prototypes
  ****************************************************************************/