arch: up_getusrsp change to inline and implement in irq.h

Signed-off-by: buxiasen <[email protected]>

Author: jasonbu

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

@@ -362,6 +362,12 @@ static always_inline_function uint32_t up_getsp(void)
   return sp;
 }
 
+static always_inline_function uintptr_t up_getusrsp(void *regs)
+{
+  uint32_t *ptr = (uint32_t *)regs;
+  return ptr[REG_SP];
+}
+
 static always_inline_function bool up_interrupt_context(void)
 {
   return getipsr() != 0;

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

@@ -473,6 +473,12 @@ static inline_function uint32_t up_getsp(void)
   return sp;
 }
 
+static inline_function uintptr_t up_getusrsp(void *regs)
+{
+  uint32_t *ptr = (uint32_t *)regs;
+  return ptr[REG_SP];
+}
+
 noinstrument_function
 static inline_function void up_set_interrupt_context(bool flag)
 {

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

@@ -512,6 +512,12 @@ static always_inline_function uint32_t up_getsp(void)
   return sp;
 }
 
+static always_inline_function uintptr_t up_getusrsp(void *regs)
+{
+  uint32_t *ptr = (uint32_t *)regs;
+  return ptr[REG_SP];
+}
+
 static always_inline_function bool up_interrupt_context(void)
 {
   return getipsr() != 0;

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

@@ -468,6 +468,12 @@ static inline_function uint32_t up_getsp(void)
   return sp;
 }
 
+static inline_function uintptr_t up_getusrsp(void *regs)
+{
+  uint32_t *ptr = (uint32_t *)regs;
+  return ptr[REG_SP];
+}
+
 noinstrument_function
 static inline_function void up_set_interrupt_context(bool flag)
 {

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

@@ -487,6 +487,12 @@ static always_inline_function uint32_t up_getsp(void)
   return sp;
 }
 
+static always_inline_function uintptr_t up_getusrsp(void *regs)
+{
+  uint32_t *ptr = (uint32_t *)regs;
+  return ptr[REG_SP];
+}
+
 static always_inline_function bool up_interrupt_context(void)
 {
   return getipsr() != 0;

arch/arm/include/armv8-r/irq.h

@@ -468,6 +468,12 @@ static inline_function uint32_t up_getsp(void)
   return sp;
 }
 
+static inline_function uintptr_t up_getusrsp(void *regs)
+{
+  uint32_t *ptr = (uint32_t *)regs;
+  return ptr[REG_SP];
+}
+
 noinstrument_function
 static inline_function void up_set_interrupt_context(bool flag)
 {

arch/arm/include/tlsr82/irq.h

@@ -262,6 +262,12 @@ static inline_function uint32_t up_getsp(void)
   return sp;
 }
 
+static inline_function uintptr_t up_getusrsp(void *regs)
+{
+  uint32_t *ptr = (uint32_t *)regs;
+  return ptr[REG_SP];
+}
+
 noinstrument_function
 static inline_function bool up_interrupt_context(void)
 {

arch/arm/src/common/arm_registerdump.c

@@ -43,16 +43,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-  uint32_t *ptr = regs;
-  return ptr[REG_SP];
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/

arch/arm64/include/irq.h

@@ -462,6 +462,14 @@ static inline_function void up_irq_restore(irqstate_t flags)
 #define up_getusrpc(regs) \
     (((uintptr_t *)((regs) ? (regs) : running_regs()))[REG_ELR])
 
+#ifndef CONFIG_BUILD_KERNEL
+#  define up_getusrsp(regs) \
+    ((uintptr_t)((uint64_t *)(regs))[REG_SP_ELX])
+#else
+#  define up_getusrsp(regs) \
+    ((uintptr_t)((uint64_t *)(regs))[REG_SP_EL0])
+#endif
+
 #undef EXTERN
 #ifdef __cplusplus
 }

arch/arm64/src/common/arm64_registerdump.c

@@ -46,19 +46,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-#ifndef CONFIG_BUILD_KERNEL
-  return ((uint64_t *)regs)[REG_SP_ELX];
-#else
-  return ((uint64_t *)regs)[REG_SP_EL0];
-#endif
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/