Rename up_saveusercontext to arm_saveusercontext

arch/arm/src/arm/arm_saveusercontext.S

@@ -1,5 +1,5 @@
 /**************************************************************************
- * arch/arm/src/arm/up_saveusercontext.S
+ * arch/arm/src/arm/arm_saveusercontext.S
  *
  *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -69,13 +69,13 @@
  **************************************************************************/
 
 /**************************************************************************
- * Name: up_saveusercontext
+ * Name: arm_saveusercontext
  **************************************************************************/
 
 	.text
-	.globl	up_saveusercontext
-	.type	up_saveusercontext, function
-up_saveusercontext:
+	.globl	arm_saveusercontext
+	.type	arm_saveusercontext, function
+arm_saveusercontext:
 	/* On entry, a1 (r0) holds address of struct xcptcontext.
 	 * Offset to the user region.
 	 */
@@ -115,4 +115,4 @@ up_saveusercontext:
 
 	mov	r0, #0		/* Return value == 0 */
 	mov	pc, lr		/* Return */
-	.size	up_saveusercontext, . - up_saveusercontext
+	.size	arm_saveusercontext, . - arm_saveusercontext

arch/arm/src/arm/up_assert.c

@@ -138,7 +138,7 @@ static inline void up_registerdump(void)
     {
       /* No.. capture user registers by hand */
 
-      up_saveusercontext(s_last_regs);
+      arm_saveusercontext(s_last_regs);
       regs = s_last_regs;
     }
 

arch/arm/src/arm/up_blocktask.c

@@ -140,11 +140,11 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
         }
 
       /* Copy the user C context into the TCB at the (old) head of the
-       * ready-to-run Task list. if up_saveusercontext returns a non-zero
+       * ready-to-run Task list. if arm_saveusercontext returns a non-zero
        * value, then this is really the previously running task restarting!
        */
 
-      else if (!up_saveusercontext(rtcb->xcp.regs))
+      else if (!arm_saveusercontext(rtcb->xcp.regs))
         {
           /* Restore the exception context of the rtcb at the (new) head
            * of the ready-to-run task list.

arch/arm/src/arm/up_releasepending.c

@@ -94,12 +94,12 @@ void up_release_pending(void)
         }
 
       /* Copy the exception context into the TCB of the task that
-       * was currently active. if up_saveusercontext returns a non-zero
+       * was currently active. if arm_saveusercontext returns a non-zero
        * value, then this is really the previously running task
        * restarting!
        */
 
-      else if (!up_saveusercontext(rtcb->xcp.regs))
+      else if (!arm_saveusercontext(rtcb->xcp.regs))
         {
           /* Restore the exception context of the rtcb at the (new) head
            * of the ready-to-run task list.

arch/arm/src/arm/up_reprioritizertr.c

@@ -149,12 +149,12 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
             }
 
           /* Copy the exception context into the TCB at the (old) head of the
-           * ready-to-run Task list. if up_saveusercontext returns a non-zero
+           * ready-to-run Task list. if arm_saveusercontext returns a non-zero
            * value, then this is really the previously running task
            * restarting!
            */
 
-          else if (!up_saveusercontext(rtcb->xcp.regs))
+          else if (!arm_saveusercontext(rtcb->xcp.regs))
             {
               /* Restore the exception context of the rtcb at the (new) head
                * of the ready-to-run task list.

arch/arm/src/arm/up_unblocktask.c

@@ -125,11 +125,11 @@ void up_unblock_task(struct tcb_s *tcb)
 
       /* We are not in an interrupt handler.  Copy the user C context
        * into the TCB of the task that was previously active.  if
-       * up_saveusercontext returns a non-zero value, then this is really the
+       * arm_saveusercontext returns a non-zero value, then this is really the
        * previously running task restarting!
        */
 
-      else if (!up_saveusercontext(rtcb->xcp.regs))
+      else if (!arm_saveusercontext(rtcb->xcp.regs))
         {
           /* Restore the exception context of the new task that is ready to
            * run (probably tcb).  This is the new rtcb at the head of the

arch/arm/src/armv6-m/arm_saveusercontext.S

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv6-m/up_saveusercontext.S
+ * arch/arm/src/armv6-m/arm_saveusercontext.S
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +52,7 @@
  ************************************************************************************/
 
 	.cpu	cortex-m0
-	.file	"up_saveusercontext.S"
+	.file	"arm_saveusercontext.S"
 
 /************************************************************************************
  * Macros
@@ -63,12 +63,12 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_saveusercontext
+ * Name: arm_saveusercontext
  *
  * Description:
  *   Save the current thread context.  Full prototype is:
  *
- *   int  up_saveusercontext(uint32_t *saveregs);
+ *   int  arm_saveusercontext(uint32_t *saveregs);
  *
  * Returned Value:
  *   0: Normal return
@@ -80,9 +80,9 @@
 	.align	2
 	.code	16
 	.thumb_func
-	.globl	up_saveusercontext
-	.type	up_saveusercontext, function
-up_saveusercontext:
+	.globl	arm_saveusercontext
+	.type	arm_saveusercontext, function
+arm_saveusercontext:
 
 	/* Perform the System call with R0=0 and R1=regs */
 
@@ -101,5 +101,5 @@ up_saveusercontext:
 	str		r3, [r2, #0]			/* Save return value */
 	bx		lr						/* "normal" return with r0=0 or
 									 * context switch with r0=1 */
-	.size	up_saveusercontext, .-up_saveusercontext
+	.size	arm_saveusercontext, .-arm_saveusercontext
 	.end

arch/arm/src/armv6-m/svcall.h

@@ -62,7 +62,7 @@
 
 /* SYS call 0:
  *
- * int up_saveusercontext(uint32_t *saveregs);
+ * int arm_saveusercontext(uint32_t *saveregs);
  */
 
 #define SYS_save_context          (0)

arch/arm/src/armv6-m/up_assert.c

@@ -171,7 +171,7 @@ static inline void up_registerdump(void)
     {
       /* No.. capture user registers by hand */
 
-      up_saveusercontext(s_last_regs);
+      arm_saveusercontext(s_last_regs);
       regs = s_last_regs;
     }
 

arch/arm/src/armv6-m/up_svcall.c

@@ -156,7 +156,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg)
     {
       /* R0=SYS_save_context:  This is a save context command:
        *
-       *   int up_saveusercontext(uint32_t *saveregs);
+       *   int arm_saveusercontext(uint32_t *saveregs);
        *
        * At this point, the following values are saved in context:
        *

arch/arm/src/armv7-a/arm_assert.c

@@ -175,7 +175,7 @@ static inline void up_registerdump(void)
     {
       /* No.. capture user registers by hand */
 
-      up_saveusercontext(s_last_regs);
+      arm_saveusercontext(s_last_regs);
       regs = s_last_regs;
     }
 

arch/arm/src/armv7-a/arm_blocktask.c

@@ -140,11 +140,11 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
         }
 
       /* Copy the user C context into the TCB at the (old) head of the
-       * ready-to-run Task list. if up_saveusercontext returns a non-zero
+       * ready-to-run Task list. if arm_saveusercontext returns a non-zero
        * value, then this is really the previously running task restarting!
        */
 
-      else if (!up_saveusercontext(rtcb->xcp.regs))
+      else if (!arm_saveusercontext(rtcb->xcp.regs))
         {
           /* Restore the exception context of the rtcb at the (new) head
            * of the ready-to-run task list.

arch/arm/src/armv7-a/arm_releasepending.c

@@ -93,12 +93,12 @@ void up_release_pending(void)
         }
 
       /* Copy the exception context into the TCB of the task that
-       * was currently active. if up_saveusercontext returns a non-zero
+       * was currently active. if arm_saveusercontext returns a non-zero
        * value, then this is really the previously running task
        * restarting!
        */
 
-      else if (!up_saveusercontext(rtcb->xcp.regs))
+      else if (!arm_saveusercontext(rtcb->xcp.regs))
         {
           /* Restore the exception context of the rtcb at the (new) head
            * of the ready-to-run task list.

arch/arm/src/armv7-a/arm_reprioritizertr.c

@@ -149,12 +149,12 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
             }
 
           /* Copy the exception context into the TCB at the (old) head of the
-           * ready-to-run Task list. if up_saveusercontext returns a non-zero
+           * ready-to-run Task list. if arm_saveusercontext returns a non-zero
            * value, then this is really the previously running task
            * restarting!
            */
 
-          else if (!up_saveusercontext(rtcb->xcp.regs))
+          else if (!arm_saveusercontext(rtcb->xcp.regs))
             {
               /* Restore the exception context of the rtcb at the (new) head
                * of the ready-to-run task list.

arch/arm/src/armv7-a/arm_saveusercontext.S

@@ -46,7 +46,7 @@
  * Public Symbols
  ****************************************************************************/
 
-	.globl	up_saveusercontext
+	.globl	arm_saveusercontext
 
 /****************************************************************************
  * Public Functions
@@ -55,13 +55,13 @@
 	.text
 
 /****************************************************************************
- * Name: up_saveusercontext
+ * Name: arm_saveusercontext
  ****************************************************************************/
 
-	.globl	up_saveusercontext
-	.type	up_saveusercontext, function
+	.globl	arm_saveusercontext
+	.type	arm_saveusercontext, function
 
-up_saveusercontext:
+arm_saveusercontext:
 
 	/* On entry, a1 (r0) holds address of struct xcptcontext */
 
@@ -129,5 +129,5 @@ up_saveusercontext:
 	mov		r0, #1			/* Return value == 1 */
 	mov		pc, lr			/* Return */
 
-	.size	up_saveusercontext, . - up_saveusercontext
+	.size	arm_saveusercontext, . - arm_saveusercontext
 	.end

arch/arm/src/armv7-a/arm_unblocktask.c

@@ -142,11 +142,11 @@ void up_unblock_task(struct tcb_s *tcb)
 
       /* We are not in an interrupt handler.  Copy the user C context
        * into the TCB of the task that was previously active.  if
-       * up_saveusercontext returns a non-zero value, then this is really the
+       * arm_saveusercontext returns a non-zero value, then this is really the
        * previously running task restarting!
        */
 
-      else if (!up_saveusercontext(rtcb->xcp.regs))
+      else if (!arm_saveusercontext(rtcb->xcp.regs))
         {
           /* Restore the exception context of the new task that is ready to
            * run (probably tcb).  This is the new rtcb at the head of the

arch/arm/src/armv7-m/gnu/arm_saveusercontext.S

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv7-m/gnu/up_saveusercontext.S
+ * arch/arm/src/armv7-m/gnu/arm_saveusercontext.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -38,7 +38,7 @@
 
 	.syntax	unified
 	.thumb
-	.file	"up_saveusercontext.S"
+	.file	"arm_saveusercontext.S"
 
 /************************************************************************************
  * Macros
@@ -49,12 +49,12 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_saveusercontext
+ * Name: arm_saveusercontext
  *
  * Description:
  *   Save the current thread context.  Full prototype is:
  *
- *   int  up_saveusercontext(uint32_t *saveregs);
+ *   int  arm_saveusercontext(uint32_t *saveregs);
  *
  * Returned Value:
  *   0: Normal return
@@ -64,9 +64,9 @@
 
 	.text
 	.thumb_func
-	.globl	up_saveusercontext
-	.type	up_saveusercontext, function
-up_saveusercontext:
+	.globl	arm_saveusercontext
+	.type	arm_saveusercontext, function
+arm_saveusercontext:
 
 	/* Perform the System call with R0=0 and R1=regs */
 
@@ -84,5 +84,5 @@ up_saveusercontext:
 	str		r3, [r2, #0]
 	bx		lr						/* "normal" return with r0=0 or
 									 * context switch with r0=1 */
-	.size	up_saveusercontext, .-up_saveusercontext
+	.size	arm_saveusercontext, .-arm_saveusercontext
 	.end

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

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/armv7-m/iar/up_saveusercontext.S
+ * arch/arm/src/armv7-m/iar/arm_saveusercontext.S
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -28,7 +28,7 @@
 #include "nvic.h"
 #include "svcall.h"
 
-	MODULE up_saveusercontext
+	MODULE arm_saveusercontext
 	SECTION .text:CODE:NOROOT(2)
 
 /************************************************************************************
@@ -39,7 +39,7 @@
  * Public Symbols
  ************************************************************************************/
 
-	PUBLIC up_saveusercontext
+	PUBLIC arm_saveusercontext
 
 /************************************************************************************
  * Macros
@@ -50,12 +50,12 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_saveusercontext
+ * Name: arm_saveusercontext
  *
  * Description:
  *   Save the current thread context.  Full prototype is:
  *
- *   int  up_saveusercontext(uint32_t *saveregs);
+ *   int  arm_saveusercontext(uint32_t *saveregs);
  *
  * Returned Value:
  *   0: Normal return
@@ -65,7 +65,7 @@
 
 	THUMB
 
-up_saveusercontext:
+arm_saveusercontext:
 
 	/* Perform the System call with R0=0 and R1=regs */
 

arch/arm/src/armv7-m/svcall.h

@@ -62,7 +62,7 @@
 
 /* SYS call 0:
  *
- * int up_saveusercontext(uint32_t *saveregs);
+ * int arm_saveusercontext(uint32_t *saveregs);
  */
 
 #define SYS_save_context          (0)

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

@@ -159,7 +159,7 @@ static inline void up_registerdump(void)
     {
       /* No.. capture user registers by hand */
 
-      up_saveusercontext(s_last_regs);
+      arm_saveusercontext(s_last_regs);
       regs = s_last_regs;
     }
 

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

@@ -163,7 +163,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg)
     {
       /* R0=SYS_save_context:  This is a save context command:
        *
-       *   int up_saveusercontext(uint32_t *saveregs);
+       *   int arm_saveusercontext(uint32_t *saveregs);
        *
        * At this point, the following values are saved in context:
        *

arch/arm/src/armv7-r/arm_assert.c

@@ -172,7 +172,7 @@ static inline void up_registerdump(void)
     {
       /* No.. capture user registers by hand */
 
-      up_saveusercontext(s_last_regs);
+      arm_saveusercontext(s_last_regs);
       regs = s_last_regs;
     }
 

arch/arm/src/armv7-r/arm_blocktask.c

@@ -138,11 +138,11 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
         }
 
       /* Copy the user C context into the TCB at the (old) head of the
-       * ready-to-run Task list. if up_saveusercontext returns a non-zero
+       * ready-to-run Task list. if arm_saveusercontext returns a non-zero
        * value, then this is really the previously running task restarting!
        */
 
-      else if (!up_saveusercontext(rtcb->xcp.regs))
+      else if (!arm_saveusercontext(rtcb->xcp.regs))
         {
           /* Restore the exception context of the rtcb at the (new) head
            * of the ready-to-run task list.

arch/arm/src/armv7-r/arm_releasepending.c

@@ -94,12 +94,12 @@ void up_release_pending(void)
         }
 
       /* Copy the exception context into the TCB of the task that
-       * was currently active. if up_saveusercontext returns a non-zero
+       * was currently active. if arm_saveusercontext returns a non-zero
        * value, then this is really the previously running task
        * restarting!
        */
 
-      else if (!up_saveusercontext(rtcb->xcp.regs))
+      else if (!arm_saveusercontext(rtcb->xcp.regs))
         {
           /* Restore the exception context of the rtcb at the (new) head
            * of the ready-to-run task list.

arch/arm/src/armv7-r/arm_reprioritizertr.c

@@ -149,12 +149,12 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
             }
 
           /* Copy the exception context into the TCB at the (old) head of the
-           * ready-to-run Task list. if up_saveusercontext returns a non-zero
+           * ready-to-run Task list. if arm_saveusercontext returns a non-zero
            * value, then this is really the previously running task
            * restarting!
            */
 
-          else if (!up_saveusercontext(rtcb->xcp.regs))
+          else if (!arm_saveusercontext(rtcb->xcp.regs))
             {
               /* Restore the exception context of the rtcb at the (new) head
                * of the ready-to-run task list.

arch/arm/src/armv7-r/arm_saveusercontext.S

@@ -44,7 +44,7 @@
  * Public Symbols
  ****************************************************************************/
 
-	.globl	up_saveusercontext
+	.globl	arm_saveusercontext
 
 #ifdef CONFIG_ARCH_FPU
 	.cpu	cortex-r4f
@@ -61,13 +61,13 @@
 	.text
 
 /****************************************************************************
- * Name: up_saveusercontext
+ * Name: arm_saveusercontext
  ****************************************************************************/
 
-	.globl	up_saveusercontext
-	.type	up_saveusercontext, function
+	.globl	arm_saveusercontext
+	.type	arm_saveusercontext, function
 
-up_saveusercontext:
+arm_saveusercontext:
 
 	/* On entry, a1 (r0) holds address of struct xcptcontext */
 
@@ -128,5 +128,5 @@ up_saveusercontext:
 
 	mov		r0, #0			/* Return value == 0 */
 	mov		pc, lr			/* Return */
-	.size	up_saveusercontext, . - up_saveusercontext
+	.size	arm_saveusercontext, . - arm_saveusercontext
 	.end

arch/arm/src/armv7-r/arm_unblocktask.c

@@ -122,11 +122,11 @@ void up_unblock_task(struct tcb_s *tcb)
 
       /* We are not in an interrupt handler.  Copy the user C context
        * into the TCB of the task that was previously active.  if
-       * up_saveusercontext returns a non-zero value, then this is really the
+       * arm_saveusercontext returns a non-zero value, then this is really the
        * previously running task restarting!
        */
 
-      else if (!up_saveusercontext(rtcb->xcp.regs))
+      else if (!arm_saveusercontext(rtcb->xcp.regs))
         {
           /* Restore the exception context of the new task that is ready to
            * run (probably tcb).  This is the new rtcb at the head of the

arch/arm/src/c5471/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC = up_nommuhead.S
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S vfork.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c arm_copyfullstate.c
 CMN_CSRCS += up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c up_doirq.c

arch/arm/src/common/up_internal.h

@@ -299,7 +299,7 @@ void arm_copyfullstate(uint32_t *dest, uint32_t *src);
 void arm_copyarmstate(uint32_t *dest, uint32_t *src);
 #endif
 void up_decodeirq(uint32_t *regs);
-int  up_saveusercontext(uint32_t *saveregs);
+int  arm_saveusercontext(uint32_t *saveregs);
 void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
 void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
 

arch/arm/src/cxd56xx/Make.defs

@@ -37,7 +37,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/dm320/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC = up_head.S
 
-CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S up_saveusercontext.S
+CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S arm_saveusercontext.S
 CMN_ASRCS += up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
 
 CMN_CSRCS  = up_assert.c up_blocktask.c arm_copyfullstate.c up_createstack.c

arch/arm/src/efm32/Make.defs

@@ -38,7 +38,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/imx1/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC = up_head.S
 
-CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S up_saveusercontext.S
+CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S arm_saveusercontext.S
 CMN_ASRCS += up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
 CMN_CSRCS  = up_assert.c up_blocktask.c arm_copyfullstate.c up_createstack.c
 CMN_CSRCS += up_dataabort.c up_mdelay.c up_udelay.c up_exit.c

arch/arm/src/imxrt/Make.defs

@@ -38,7 +38,7 @@ HEAD_ASRC  =
 
 # Common ARM and Cortex-M7 files
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/kinetis/Make.defs

@@ -38,7 +38,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/kl/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS  = up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c arm_copyfullstate.c

arch/arm/src/lc823450/Make.defs

@@ -40,7 +40,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/lpc17xx_40xx/Make.defs

@@ -42,7 +42,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/lpc214x/Make.defs

@@ -36,7 +36,7 @@
 
 HEAD_ASRC = lpc214x_head.S
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
 CMN_ASRCS += vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c arm_copyfullstate.c

arch/arm/src/lpc2378/Make.defs

@@ -40,7 +40,7 @@
 
 HEAD_ASRC = lpc23xx_head.S
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
 CMN_ASRCS += vfork.S
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c arm_copyfullstate.c
 CMN_CSRCS += up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c

arch/arm/src/lpc31xx/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC = up_head.S
 
-CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S up_saveusercontext.S
+CMN_ASRCS  = up_cache.S arm_fullcontextrestore.S arm_saveusercontext.S
 CMN_ASRCS += up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
 
 CMN_CSRCS  = up_assert.c up_blocktask.c arm_copyfullstate.c up_createstack.c

arch/arm/src/lpc43xx/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/lpc54xx/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/max326xx/Make.defs

@@ -37,7 +37,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/moxart/Make.defs

@@ -38,7 +38,7 @@
 
 HEAD_ASRC = moxart_head.S
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
 CMN_ASRCS += up_nommuhead.S vfork.S
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c arm_copyfullstate.c
 CMN_CSRCS += up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c

arch/arm/src/nrf52/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/nuc1xx/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS  = up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c arm_copyfullstate.c

arch/arm/src/s32k1xx/s32k11x/Make.defs

@@ -35,7 +35,7 @@
 
 # Source files specific to the Cortex-M0+
 
-CMN_ASRCS += up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS += up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS += up_assert.c up_blocktask.c arm_copyfullstate.c up_createstack.c

arch/arm/src/s32k1xx/s32k14x/Make.defs

@@ -35,7 +35,7 @@
 
 # Source files specific to the Cortex-M4F
 
-CMN_ASRCS += up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS += arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/sam34/Make.defs

@@ -43,7 +43,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/samd2l2/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS  = up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c arm_copyfullstate.c

arch/arm/src/samd5e5/Make.defs

@@ -42,7 +42,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/samv7/Make.defs

@@ -43,7 +43,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/stm32/Make.defs

@@ -38,7 +38,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/stm32f0l0g0/Make.defs

@@ -36,7 +36,7 @@
 
 HEAD_ASRC =
 
-CMN_ASRCS  = up_exception.S up_saveusercontext.S arm_fullcontextrestore.S
+CMN_ASRCS  = up_exception.S arm_saveusercontext.S arm_fullcontextrestore.S
 CMN_ASRCS += up_switchcontext.S vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c arm_copyfullstate.c

arch/arm/src/stm32f7/Make.defs

@@ -43,7 +43,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/stm32h7/Make.defs

@@ -43,7 +43,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/stm32l4/Make.defs

@@ -44,7 +44,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/str71x/Make.defs

@@ -35,7 +35,7 @@
 
 HEAD_ASRC = str71x_head.S
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_vectors.S
 CMN_ASRCS += vfork.S
 
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c arm_copyfullstate.c

arch/arm/src/tiva/Make.defs

@@ -36,7 +36,7 @@
 
 HEAD_ASRC  =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S  vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

arch/arm/src/xmc4/Make.defs

@@ -38,7 +38,7 @@ HEAD_ASRC =
 CMN_UASRCS =
 CMN_UCSRCS =
 
-CMN_ASRCS  = up_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS  = arm_saveusercontext.S arm_fullcontextrestore.S up_switchcontext.S
 CMN_ASRCS += up_testset.S up_fetchadd.S vfork.S
 
 ifeq ($(CONFIG_ARCH_SETJMP_H),y)

boards/arm/cxd56xx/spresense/src/cxd56_ostest.c

@@ -93,7 +93,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c

@@ -91,7 +91,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c

@@ -94,7 +94,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c

@@ -94,7 +94,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c

@@ -94,7 +94,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/sama5/sama5d2-xult/src/sam_ostest.c

@@ -79,7 +79,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c

@@ -94,7 +94,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c

@@ -93,7 +93,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/sama5/sama5d4-ek/src/sam_ostest.c

@@ -94,7 +94,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/stm32/omnibusf4/src/stm32_ostest.c

@@ -92,7 +92,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c

@@ -92,7 +92,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c

@@ -92,7 +92,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c

@@ -90,7 +90,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c

@@ -92,7 +92,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c

@@ -93,7 +93,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c

@@ -90,7 +90,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */
 

boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c

@@ -75,7 +75,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
   /* Take a snapshot of the thread context right now */
 
   flags = enter_critical_section();
-  up_saveusercontext(g_saveregs);
+  arm_saveusercontext(g_saveregs);
 
   /* Return only the floating register values */