assert: show stacks with the sp from regs

zhangyuan21 · xiaoxiang781216 · commit 841b178782ff · 2023-05-05T13:40:04.000+08:00
1. Get the value of sp from dump regs when an exception occurs,
   to avoid getting the value of fp from up_getsp and causing
   incomplete stack printing.
2. Determine which stack the value belongs to based on the value
   of SP to avoid false reports of stack overflow

Signed-off-by: zhangyuan21 &lt;zhangyuan21@xiaomi.com&gt;
diff --git a/arch/arm/src/common/arm_registerdump.c b/arch/arm/src/common/arm_registerdump.c
@@ -45,9 +45,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return CURRENT_REGS[REG_SP];
+  uint32_t *ptr = regs;
+  return ptr[REG_SP];
 }
 
 /****************************************************************************
diff --git a/arch/arm64/src/common/arm64_registerdump.c b/arch/arm64/src/common/arm64_registerdump.c
@@ -47,9 +47,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return CURRENT_REGS[REG_X13];
+  struct regs_context *ptr = regs;
+  return ptr->regs[REG_X13];
 }
 
 /****************************************************************************
diff --git a/arch/avr/src/avr/avr_registerdump.c b/arch/avr/src/avr/avr_registerdump.c
@@ -42,9 +42,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return g_current_regs[REG_R13];
+  uint8_t *ptr = regs;
+  return ptr[REG_R13];
 }
 
 /****************************************************************************
diff --git a/arch/avr/src/avr32/avr_registerdump.c b/arch/avr/src/avr32/avr_registerdump.c
@@ -42,9 +42,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return g_current_regs[REG_R13];
+  uint8_t *ptr = regs;
+  return ptr[REG_R13];
 }
 
 /****************************************************************************
diff --git a/arch/ceva/src/common/ceva_registerdump.c b/arch/ceva/src/common/ceva_registerdump.c
@@ -39,9 +39,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return CURRENT_REGS[REG_SP];
+  uint32_t *ptr = regs;
+  return ptr[REG_SP];
 }
 
 /****************************************************************************
diff --git a/arch/hc/src/m9s12/m9s12_registerdump.c b/arch/hc/src/m9s12/m9s12_registerdump.c
@@ -40,9 +40,9 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  uint8_t *ptr = (uint8_t *)g_current_regs;
+  uint8_t *ptr = regs;
   return (uintptr_t)(ptr[REG_SPH] << 8 | ptr[REG_SPL]);
 }
 
diff --git a/arch/mips/src/mips32/mips_registerdump.c b/arch/mips/src/mips32/mips_registerdump.c
@@ -42,9 +42,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return CURRENT_REGS[REG_SP];
+  uint32_t *ptr = regs;
+  return ptr[REG_SP];
 }
 
 /****************************************************************************
diff --git a/arch/misoc/src/lm32/lm32_registerdump.c b/arch/misoc/src/lm32/lm32_registerdump.c
@@ -41,9 +41,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return g_current_regs[REG_SP];
+  uint32_t *ptr = regs;
+  return ptr[REG_SP];
 }
 
 /****************************************************************************
diff --git a/arch/misoc/src/minerva/minerva_registerdump.c b/arch/misoc/src/minerva/minerva_registerdump.c
@@ -41,9 +41,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return g_current_regs[REG_X2];
+  uint32_t *ptr = regs;
+  return ptr[REG_X2];
 }
 
 /****************************************************************************
diff --git a/arch/or1k/src/common/or1k_registerdump.c b/arch/or1k/src/common/or1k_registerdump.c
@@ -40,9 +40,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return CURRENT_REGS[REG_R13];
+  uint32_t *ptr = regs;
+  return ptr[REG_R13];
 }
 
 /****************************************************************************
diff --git a/arch/renesas/src/m16c/m16c_registerdump.c b/arch/renesas/src/m16c/m16c_registerdump.c
@@ -41,9 +41,9 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  uint8_t *ptr = (uint8_t *) g_current_regs;
+  uint8_t *ptr = regs;
   return (uintptr_t)(ptr[REG_SP] << 8 | ptr[REG_SP + 1]);
 }
 
diff --git a/arch/renesas/src/rx65n/rx65n_registerdump.c b/arch/renesas/src/rx65n/rx65n_registerdump.c
@@ -43,9 +43,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return g_current_regs[REG_SP];
+  uint32_t *ptr = regs;
+  return ptr[REG_SP];
 }
 
 /****************************************************************************
diff --git a/arch/renesas/src/sh1/sh1_registerdump.c b/arch/renesas/src/sh1/sh1_registerdump.c
@@ -40,9 +40,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return g_current_regs[REG_SP];
+  uint32_t *ptr = regs;
+  return ptr[REG_SP];
 }
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_registerdump.c b/arch/risc-v/src/common/riscv_registerdump.c
@@ -41,9 +41,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return CURRENT_REGS[REG_SP];
+  uintptr_t *ptr = regs;
+  return ptr[REG_SP];
 }
 
 /****************************************************************************
diff --git a/arch/sparc/src/sparc_v8/sparc_v8_registerdump.c b/arch/sparc/src/sparc_v8/sparc_v8_registerdump.c
@@ -41,9 +41,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return CURRENT_REGS[REG_I6];
+  uint32_t *ptr = regs;
+  return ptr[REG_I6];
 }
 
 /****************************************************************************
diff --git a/arch/x86/src/i486/i486_regdump.c b/arch/x86/src/i486/i486_regdump.c
@@ -37,9 +37,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return g_current_regs[REG_ESP];
+  uint32_t *ptr = regs;
+  return ptr[REG_ESP];
 }
 
 /****************************************************************************
diff --git a/arch/x86_64/src/intel64/intel64_regdump.c b/arch/x86_64/src/intel64/intel64_regdump.c
@@ -38,9 +38,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return g_current_regs[REG_RSP];
+  uint64_t *ptr = regs;
+  return ptr[REG_RSP];
 }
 
 /****************************************************************************
diff --git a/arch/xtensa/src/common/xtensa_registerdump.c b/arch/xtensa/src/common/xtensa_registerdump.c
@@ -41,9 +41,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(void *regs)
 {
-  return CURRENT_REGS[REG_A1];
+  uintptr_t *ptr = regs;
+  return ptr[REG_A1];
 }
 
 /****************************************************************************
diff --git a/arch/z16/src/common/z16_registerdump.c b/arch/z16/src/common/z16_registerdump.c
@@ -37,9 +37,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(FAR void *regs)
 {
-  return g_current_regs[REG_SP];
+  FAR uint32_t *ptr = regs;
+  return ptr[REG_SP];
 }
 
 /****************************************************************************
diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c
@@ -40,10 +40,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(FAR void *regs)
 {
-  FAR chipreg_t *regs = g_current_regs;
-  return regs[XCPT_SP];
+  FAR chipreg_t *ptr = regs;
+  return ptr[XCPT_SP];
 }
 
 /****************************************************************************
diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c
@@ -40,10 +40,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(FAR void *regs)
 {
-  FAR chipreg_t *regs = g_current_regs;
-  return regs[XCPT_SP];
+  FAR chipreg_t *ptr = regs;
+  return ptr[XCPT_SP];
 }
 
 /****************************************************************************
diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c
@@ -59,10 +59,10 @@ static inline void z8_dumpstate(chipreg_t sp, chipreg_t pc, uint8_t irqctl,
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(FAR void *regs)
 {
-  FAR chipreg_t *regs = g_z8irqstate.regs;
-  return regs[XCPT_SP];
+  FAR chipreg_t *ptr = regs;
+  return ptr[XCPT_SP];
 }
 
 /****************************************************************************
diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c
@@ -40,10 +40,10 @@
  * Name: up_getusrsp
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void)
+uintptr_t up_getusrsp(FAR void *regs)
 {
-  FAR chipreg_t *regs = g_current_regs;
-  return regs[XCPT_SP];
+  FAR chipreg_t *ptr = regs;
+  return ptr[XCPT_SP];
 }
 
 /****************************************************************************
diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h
@@ -1756,14 +1756,14 @@ int up_timer_tick_start(clock_t ticks);
  * Name: up_getusrsp
  *
  * Input Parameters:
- *   None
+ *   regs - regs to get sp
  *
  * Returned Value:
  *   User stack pointer.
  *
  ****************************************************************************/
 
-uintptr_t up_getusrsp(void);
+uintptr_t up_getusrsp(FAR void *regs);
 
 /****************************************************************************
  * TLS support
diff --git a/sched/misc/assert.c b/sched/misc/assert.c

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,10 @@`
`45`	`45`	`* Name: up_getusrsp`
`46`	`46`	`****************************************************************************/`
`47`	`47`
`48`		`-uintptr_t up_getusrsp(void)`
	`48`	`+uintptr_t up_getusrsp(void *regs)`
`49`	`49`	`{`
`50`		`- return CURRENT_REGS[REG_SP];`
	`50`	`+ uint32_t *ptr = regs;`
	`51`	`+ return ptr[REG_SP];`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`/****************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,10 @@`
`47`	`47`	`* Name: up_getusrsp`
`48`	`48`	`****************************************************************************/`
`49`	`49`
`50`		`-uintptr_t up_getusrsp(void)`
	`50`	`+uintptr_t up_getusrsp(void *regs)`
`51`	`51`	`{`
`52`		`- return CURRENT_REGS[REG_X13];`
	`52`	`+ struct regs_context *ptr = regs;`
	`53`	`+ return ptr->regs[REG_X13];`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`/****************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,10 @@`
`42`	`42`	`* Name: up_getusrsp`
`43`	`43`	`****************************************************************************/`
`44`	`44`
`45`		`-uintptr_t up_getusrsp(void)`
	`45`	`+uintptr_t up_getusrsp(void *regs)`
`46`	`46`	`{`
`47`		`- return g_current_regs[REG_R13];`
	`47`	`+ uint8_t *ptr = regs;`
	`48`	`+ return ptr[REG_R13];`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`/****************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,10 @@`
`39`	`39`	`* Name: up_getusrsp`
`40`	`40`	`****************************************************************************/`
`41`	`41`
`42`		`-uintptr_t up_getusrsp(void)`
	`42`	`+uintptr_t up_getusrsp(void *regs)`
`43`	`43`	`{`
`44`		`- return CURRENT_REGS[REG_SP];`
	`44`	`+ uint32_t *ptr = regs;`
	`45`	`+ return ptr[REG_SP];`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`/****************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,9 @@`
`40`	`40`	`* Name: up_getusrsp`
`41`	`41`	`****************************************************************************/`
`42`	`42`
`43`		`-uintptr_t up_getusrsp(void)`
	`43`	`+uintptr_t up_getusrsp(void *regs)`
`44`	`44`	`{`
`45`		`- uint8_t ptr = (uint8_t )g_current_regs;`
	`45`	`+ uint8_t *ptr = regs;`
`46`	`46`	`return (uintptr_t)(ptr[REG_SPH] << 8 \| ptr[REG_SPL]);`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,10 @@`
`41`	`41`	`* Name: up_getusrsp`
`42`	`42`	`****************************************************************************/`
`43`	`43`
`44`		`-uintptr_t up_getusrsp(void)`
	`44`	`+uintptr_t up_getusrsp(void *regs)`
`45`	`45`	`{`
`46`		`- return g_current_regs[REG_SP];`
	`46`	`+ uint32_t *ptr = regs;`
	`47`	`+ return ptr[REG_SP];`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`/****************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,10 @@`
`40`	`40`	`* Name: up_getusrsp`
`41`	`41`	`****************************************************************************/`
`42`	`42`
`43`		`-uintptr_t up_getusrsp(void)`
	`43`	`+uintptr_t up_getusrsp(void *regs)`
`44`	`44`	`{`
`45`		`- return CURRENT_REGS[REG_R13];`
	`45`	`+ uint32_t *ptr = regs;`
	`46`	`+ return ptr[REG_R13];`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`/****************************************************************************`