sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

All ARM assertion logic will show stack usage on assertion if DEBUG_STACK is enabled

Browse Source
This commit is contained in:
Gregory Nutt 2014-03-23 10:06:48 -06:00
parent 3303e04e78
commit 394ccb3932
3 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/src/arm/up_assert.c
View File

@ -63,8 +63,14 @@
# undef CONFIG_ARCH_USBDUMP # undef CONFIG_ARCH_USBDUMP
#endif #endif
/* Output debug info if stack dump is selected -- even if /* Check if we can dump stack usage information */
* debug is not selected.
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_STACK
#endif
/* Output debug info if stack dump is selected -- even if debug is not
* selected.
*/ */
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
@ -206,7 +212,7 @@ static void up_dumpstate(void)
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
istackbase = (uint32_t)&g_intstackbase; istackbase = (uint32_t)&g_intstackbase;
istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~3) - 4; istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
/* Show interrupt stack info */ /* Show interrupt stack info */
@ -214,6 +220,9 @@ static void up_dumpstate(void)
lldbg("IRQ stack:\n"); lldbg("IRQ stack:\n");
lldbg(" base: %08x\n", istackbase); lldbg(" base: %08x\n", istackbase);
lldbg(" size: %08x\n", istacksize); lldbg(" size: %08x\n", istacksize);
#ifdef CONFIG_DEBUG_STACK
lldbg(" used: %08x\n", up_check_intstack());
#endif
/* Does the current stack pointer lie within the interrupt /* Does the current stack pointer lie within the interrupt
* stack? * stack?
@ -238,10 +247,17 @@ static void up_dumpstate(void)
lldbg("User stack:\n"); lldbg("User stack:\n");
lldbg(" base: %08x\n", ustackbase); lldbg(" base: %08x\n", ustackbase);
lldbg(" size: %08x\n", ustacksize); lldbg(" size: %08x\n", ustacksize);
#ifdef CONFIG_DEBUG_STACK
lldbg(" used: %08x\n", up_check_tcbstack(rtcb));
#endif
#else #else
lldbg("sp: %08x\n", sp); lldbg("sp: %08x\n", sp);
lldbg("stack base: %08x\n", ustackbase); lldbg("stack base: %08x\n", ustackbase);
lldbg("stack size: %08x\n", ustacksize); lldbg("stack size: %08x\n", ustacksize);
#ifdef CONFIG_DEBUG_STACK
lldbg("stack used: %08x\n", up_check_tcbstack(rtcb));
#endif
#endif #endif
/* Dump the user stack if the stack pointer lies within the allocated user /* Dump the user stack if the stack pointer lies within the allocated user

22
arch/arm/src/armv7-a/arm_assert.c
View File

@ -63,8 +63,14 @@
# undef CONFIG_ARCH_USBDUMP # undef CONFIG_ARCH_USBDUMP
#endif #endif
/* Output debug info if stack dump is selected -- even if /* Check if we can dump stack usage information */
* debug is not selected.
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_STACK
#endif
/* Output debug info if stack dump is selected -- even if debug is not
* selected.
*/ */
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
@ -206,7 +212,7 @@ static void up_dumpstate(void)
#if CONFIG_ARCH_INTERRUPTSTACK > 3 #if CONFIG_ARCH_INTERRUPTSTACK > 3
istackbase = (uint32_t)&g_intstackbase; istackbase = (uint32_t)&g_intstackbase;
istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~3) - 4; istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
/* Show interrupt stack info */ /* Show interrupt stack info */
@ -214,6 +220,9 @@ static void up_dumpstate(void)
lldbg("IRQ stack:\n"); lldbg("IRQ stack:\n");
lldbg(" base: %08x\n", istackbase); lldbg(" base: %08x\n", istackbase);
lldbg(" size: %08x\n", istacksize); lldbg(" size: %08x\n", istacksize);
#ifdef CONFIG_DEBUG_STACK
lldbg(" used: %08x\n", up_check_intstack());
#endif
/* Does the current stack pointer lie within the interrupt /* Does the current stack pointer lie within the interrupt
* stack? * stack?
@ -246,10 +255,17 @@ static void up_dumpstate(void)
lldbg("User stack:\n"); lldbg("User stack:\n");
lldbg(" base: %08x\n", ustackbase); lldbg(" base: %08x\n", ustackbase);
lldbg(" size: %08x\n", ustacksize); lldbg(" size: %08x\n", ustacksize);
#ifdef CONFIG_DEBUG_STACK
lldbg(" used: %08x\n", up_check_tcbstack(rtcb));
#endif
#else #else
lldbg("sp: %08x\n", sp); lldbg("sp: %08x\n", sp);
lldbg("stack base: %08x\n", ustackbase); lldbg("stack base: %08x\n", ustackbase);
lldbg("stack size: %08x\n", ustacksize); lldbg("stack size: %08x\n", ustacksize);
#ifdef CONFIG_DEBUG_STACK
lldbg("stack used: %08x\n", up_check_tcbstack(rtcb));
#endif
#endif #endif
/* Dump the user stack if the stack pointer lies within the allocated user /* Dump the user stack if the stack pointer lies within the allocated user

23
arch/arm/src/armv7-m/up_assert.c
View File

@ -63,8 +63,14 @@
# undef CONFIG_ARCH_USBDUMP # undef CONFIG_ARCH_USBDUMP
#endif #endif
/* Output debug info if stack dump is selected -- even if /* Check if we can dump stack usage information */
* debug is not selected.
#ifndef CONFIG_DEBUG
# undef CONFIG_DEBUG_STACK
#endif
/* Output debug info if stack dump is selected -- even if debug is not
* selected.
*/ */
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
@ -193,7 +199,7 @@ static int assert_tracecallback(struct usbtrace_s *trace, void *arg)
#ifdef CONFIG_ARCH_STACKDUMP #ifdef CONFIG_ARCH_STACKDUMP
static void up_dumpstate(void) static void up_dumpstate(void)
{ {
struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; struct tcb_s *rtcb = (struct tcb_s *)g_readytorun.head;
uint32_t sp = up_getsp(); uint32_t sp = up_getsp();
uint32_t ustackbase; uint32_t ustackbase;
uint32_t ustacksize; uint32_t ustacksize;
@ -219,7 +225,7 @@ static void up_dumpstate(void)
/* Get the limits on the interrupt stack memory */ /* Get the limits on the interrupt stack memory */
istackbase = (uint32_t)&g_intstackbase; istackbase = (uint32_t)&g_intstackbase;
istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~3) - 4; istacksize = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
/* Show interrupt stack info */ /* Show interrupt stack info */
@ -227,6 +233,9 @@ static void up_dumpstate(void)
lldbg("IRQ stack:\n"); lldbg("IRQ stack:\n");
lldbg(" base: %08x\n", istackbase); lldbg(" base: %08x\n", istackbase);
lldbg(" size: %08x\n", istacksize); lldbg(" size: %08x\n", istacksize);
#ifdef CONFIG_DEBUG_STACK
lldbg(" used: %08x\n", up_check_intstack());
#endif
/* Does the current stack pointer lie within the interrupt /* Does the current stack pointer lie within the interrupt
* stack? * stack?
@ -253,6 +262,9 @@ static void up_dumpstate(void)
lldbg("User stack:\n"); lldbg("User stack:\n");
lldbg(" base: %08x\n", ustackbase); lldbg(" base: %08x\n", ustackbase);
lldbg(" size: %08x\n", ustacksize); lldbg(" size: %08x\n", ustacksize);
#ifdef CONFIG_DEBUG_STACK
lldbg(" used: %08x\n", up_check_tcbstack(rtcb));
#endif
/* Dump the user stack if the stack pointer lies within the allocated user /* Dump the user stack if the stack pointer lies within the allocated user
* stack memory. * stack memory.
@ -270,6 +282,9 @@ static void up_dumpstate(void)
lldbg("sp: %08x\n", sp); lldbg("sp: %08x\n", sp);
lldbg("stack base: %08x\n", ustackbase); lldbg("stack base: %08x\n", ustackbase);
lldbg("stack size: %08x\n", ustacksize); lldbg("stack size: %08x\n", ustacksize);
#ifdef CONFIG_DEBUG_STACK
lldbg("stack used: %08x\n", up_check_tcbstack(rtcb));
#endif
/* Dump the user stack if the stack pointer lies within the allocated user /* Dump the user stack if the stack pointer lies within the allocated user
* stack memory. * stack memory.