diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-24 06:03:39 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-24 06:03:39 -0600 |
| commit | ec6b436dc9afec0d39ce52c3e589a4e37bc1facd (patch) | |
| tree | f49f588fd7fb77f9799fc666da6246f35efb68b6 /nuttx/arch/arm/src/a1x | |
| parent | dc57c53f080c460896db6309f98511f592c149ce (diff) | |
| download | px4-nuttx-ec6b436dc9afec0d39ce52c3e589a4e37bc1facd.tar.gz px4-nuttx-ec6b436dc9afec0d39ce52c3e589a4e37bc1facd.tar.bz2 px4-nuttx-ec6b436dc9afec0d39ce52c3e589a4e37bc1facd.zip | |
Add CONFIG_STACK_COLORATION that does the same thing as CONFIG_DEBUG_STACK but without enabling debug. From David Sidrane
Diffstat (limited to 'nuttx/arch/arm/src/a1x')
| -rw-r--r-- | nuttx/arch/arm/src/a1x/Make.defs | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/a1x/a1x_irq.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/a1x/Make.defs b/nuttx/arch/arm/src/a1x/Make.defs index b00b34938..177b423fd 100644 --- a/nuttx/arch/arm/src/a1x/Make.defs +++ b/nuttx/arch/arm/src/a1x/Make.defs @@ -119,6 +119,10 @@ CMN_ASRCS += arm_savefpu.S arm_restorefpu.S CMN_CSRCS += arm_copyarmstate.c endif +ifeq ($(CONFIG_STACK_COLORATION),y) +CMN_CSRCS += up_checkstack.c +endif + ifeq ($(CONFIG_DEBUG_STACK),y) CMN_CSRCS += up_checkstack.c endif diff --git a/nuttx/arch/arm/src/a1x/a1x_irq.c b/nuttx/arch/arm/src/a1x/a1x_irq.c index b4a69405c..6dbee9c32 100644 --- a/nuttx/arch/arm/src/a1x/a1x_irq.c +++ b/nuttx/arch/arm/src/a1x/a1x_irq.c @@ -165,8 +165,7 @@ void up_irqinitialize(void) } /* Colorize the interrupt stack for debug purposes */ - -#if defined(CONFIG_DEBUG_STACK) && CONFIG_ARCH_INTERRUPTSTACK > 3 +#if (defined(CONFIG_DEBUG_STACK) || defined(CONFIG_STACK_COLORATION)) && CONFIG_ARCH_INTERRUPTSTACK > 3 { size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~3); up_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size), |