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

Signed-off-by: buxiasen <buxiasen@xiaomi.com>
apache · Jan 5, 2025 · f76c5fa · f76c5fa
1 parent 8ea0e4c
commit f76c5fa
Show file tree

Hide file tree

Showing 52 changed files with 192 additions and 244 deletions.
diff --git a/arch/arm/include/armv6-m/irq.h b/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;

diff --git a/arch/arm/include/armv7-a/irq.h b/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)
 {

diff --git a/arch/arm/include/armv7-m/irq.h b/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;

diff --git a/arch/arm/include/armv7-r/irq.h b/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)
 {

diff --git a/arch/arm/include/armv8-m/irq.h b/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;

diff --git a/arch/arm/include/armv8-r/irq.h b/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)
 {

diff --git a/arch/arm/include/tlsr82/irq.h b/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)
 {

diff --git a/arch/arm/src/common/arm_registerdump.c b/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
  ****************************************************************************/

diff --git a/arch/arm64/include/irq.h b/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
 }

diff --git a/arch/arm64/src/common/arm64_registerdump.c b/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
  ****************************************************************************/

diff --git a/arch/avr/include/irq.h b/arch/avr/include/irq.h
@@ -126,6 +126,13 @@ static inline_function void up_set_current_regs(FAR uint8_t *regs)
 
 #define up_interrupt_context() (up_current_regs() != NULL)
 
+/****************************************************************************
+ * Name: up_getusrsp
+ ****************************************************************************/
+
+#define up_getusrsp(regs) \
+  ((uintptr_t)((uint8_t *)(regs))[REG_R13])
+
 #undef EXTERN
 #ifdef __cplusplus
 }

diff --git a/arch/avr/src/avr/avr_registerdump.c b/arch/avr/src/avr/avr_registerdump.c
@@ -40,16 +40,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-  uint8_t *ptr = regs;
-  return ptr[REG_R13];
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/

diff --git a/arch/avr/src/avr32/avr_registerdump.c b/arch/avr/src/avr32/avr_registerdump.c
@@ -40,16 +40,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-  uint8_t *ptr = regs;
-  return ptr[REG_R13];
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/

diff --git a/arch/ceva/include/irq.h b/arch/ceva/include/irq.h
@@ -175,6 +175,13 @@ static inline_function bool up_interrupt_context(void)
 #define up_getusrpc(regs) \
     (((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
 
+/****************************************************************************
+ * Name: up_getusrsp
+ ****************************************************************************/
+
+#define up_getusrsp(regs) \
+    ((uintptr_t)((uint32_t*)(regs))[REG_SP])
+
 #undef EXTERN
 #ifdef __cplusplus
 }

diff --git a/arch/ceva/src/common/ceva_registerdump.c b/arch/ceva/src/common/ceva_registerdump.c
@@ -37,16 +37,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-  uint32_t *ptr = regs;
-  return ptr[REG_SP];
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/

diff --git a/arch/hc/include/irq.h b/arch/hc/include/irq.h
@@ -127,6 +127,16 @@ static inline_function void up_set_current_regs(FAR uint8_t *regs)
 
 #define up_interrupt_context() (up_current_regs() != NULL)
 
+/****************************************************************************
+ * Name: up_getusrsp
+ ****************************************************************************/
+
+static inline_function uintptr_t up_getusrsp(void *regs)
+{
+  uint8_t *ptr = regs;
+  return (uintptr_t)(ptr[REG_SPH] << 8 | ptr[REG_SPL]);
+}
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/

diff --git a/arch/hc/src/m9s12/m9s12_registerdump.c b/arch/hc/src/m9s12/m9s12_registerdump.c
@@ -38,16 +38,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-  uint8_t *ptr = regs;
-  return (uintptr_t)(ptr[REG_SPH] << 8 | ptr[REG_SPL]);
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/

diff --git a/arch/mips/include/irq.h b/arch/mips/include/irq.h
@@ -138,6 +138,13 @@ static inline_function void up_set_current_regs(uint32_t *regs)
 #define up_getusrpc(regs) \
     (((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_EPC])
 
+/****************************************************************************
+ * Name: up_getusrsp
+ ****************************************************************************/
+
+#define up_getusrsp(regs) \
+    ((uintptr_t)((uint32_t*)(regs))[REG_SP])
+
 #undef EXTERN
 #ifdef __cplusplus
 }

diff --git a/arch/mips/src/mips32/mips_registerdump.c b/arch/mips/src/mips32/mips_registerdump.c
@@ -40,16 +40,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-  uint32_t *ptr = regs;
-  return ptr[REG_SP];
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/

diff --git a/arch/misoc/include/lm32/irq.h b/arch/misoc/include/lm32/irq.h
@@ -227,5 +227,12 @@ struct xcptcontext
 #define up_getusrpc(regs) \
     (((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_EPC])
 
+/****************************************************************************
+ * Name: up_getusrsp
+ ****************************************************************************/
+
+#define up_getusrsp(regs) \
+    ((uintptr_t)((uint32_t *)(regs))[REG_SP])
+
 #endif /* __ASSEMBLY__ */
 #endif /* __ARCH_MISOC_INCLUDE_LM32_IRQ_H */
diff --git a/arch/misoc/include/minerva/irq.h b/arch/misoc/include/minerva/irq.h
@@ -308,5 +308,12 @@ struct xcptcontext
 #define up_getusrpc(regs) \
     (((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_CSR_MEPC])
 
+/****************************************************************************
+ * Name: up_getusrsp
+ ****************************************************************************/
+
+#define up_getusrsp(regs) \
+    ((uintptr_t)((uint32_t *)(regs))[REG_X2])
+
 #endif /* __ASSEMBLY__ */
 #endif /* __ARCH_MISOC_INCLUDE_MINERVA_IRQ_H */
diff --git a/arch/misoc/src/lm32/lm32_registerdump.c b/arch/misoc/src/lm32/lm32_registerdump.c
@@ -39,16 +39,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-  uint32_t *ptr = regs;
-  return ptr[REG_SP];
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/

diff --git a/arch/misoc/src/minerva/minerva_registerdump.c b/arch/misoc/src/minerva/minerva_registerdump.c
@@ -39,16 +39,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-  uint32_t *ptr = regs;
-  return ptr[REG_X2];
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/

diff --git a/arch/or1k/include/irq.h b/arch/or1k/include/irq.h
@@ -157,6 +157,13 @@ static inline_function bool up_interrupt_context(void)
 #define up_getusrpc(regs) \
     (((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
 
+/****************************************************************************
+ * Name: up_getusrsp
+ ****************************************************************************/
+
+#define up_getusrsp(regs) \
+    ((uintptr_t)((uint32_t *)(regs))[REG_R13])
+
 #undef EXTERN
 #ifdef __cplusplus
 }

diff --git a/arch/or1k/src/common/or1k_registerdump.c b/arch/or1k/src/common/or1k_registerdump.c
@@ -38,16 +38,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: up_getusrsp
- ****************************************************************************/
-
-uintptr_t up_getusrsp(void *regs)
-{
-  uint32_t *ptr = regs;
-  return ptr[REG_R13];
-}
-
 /****************************************************************************
  * Name: up_dump_register
  ****************************************************************************/

diff --git a/arch/renesas/include/m16c/irq.h b/arch/renesas/include/m16c/irq.h
@@ -350,6 +350,16 @@ static inline_function irqstate_t up_irq_enable(void)
 #define up_getusrpc(regs) \
     (((uint32_t *)((regs) ? (regs) : up_current_regs()))[REG_PC])
 
+/****************************************************************************
+ * Name: up_getusrsp
+ ****************************************************************************/
+
+static inline_function uintptr_t up_getusrsp(void *regs)
+{
+  uint8_t *ptr = regs;
+  return (uintptr_t)(ptr[REG_SP] << 8 | ptr[REG_SP + 1]);
+}
+
 #undef EXTERN
 #ifdef __cplusplus
 }