nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

arch: using remain to ignore invalid stack content when sp is not within stack

Browse source 
Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
This commit is contained in:
Jiuzhu Dong 2022-07-04 15:41:59 +08:00 committed by Xiang Xiao
parent 0ca02a5564
commit 136b1d6d42
3 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/src/common/arm_assert.c
View file

@ -352,10 +352,17 @@ static void arm_dump_stack(const char *tag, uint32_t sp,
else
{
_alert("ERROR: %s Stack pointer is not within the stack\n", tag);
if (force)
{
arm_stackdump(base, top);
#ifdef CONFIG_STACK_COLORATION
uint32_t remain;
remain = size - arm_stack_check((FAR void *)(uintptr_t)base, size);
base += remain;
size -= remain;
#endif
arm_stackdump(base, base + size);
}
}
}

10
arch/risc-v/src/common/riscv_assert.c
View file

@ -331,7 +331,15 @@ static void riscv_dump_stack(const char *tag, uintptr_t sp,
if (force)
{
riscv_stackdump(base, top);
#ifdef CONFIG_STACK_COLORATION
uint32_t remain;
remain = size - riscv_stack_check((uintptr_t)base, size);
base += remain;
size -= remain;
#endif
riscv_stackdump(base, base + size);
}
}
}

13
arch/xtensa/src/common/xtensa_dumpstate.c
View file

@ -281,14 +281,16 @@ static void xtensa_dump_stack(const char *tag, uint32_t sp,
uint32_t base, uint32_t size, bool force)
{
uint32_t top = base + size;
#ifdef CONFIG_STACK_COLORATION
uint32_t used = xtensa_stack_check((uintptr_t)base, size);
#endif
_alert("%s Stack:\n", tag);
_alert("sp: %08" PRIx32 "\n", sp);
_alert(" base: %08" PRIx32 "\n", base);
_alert(" size: %08" PRIx32 "\n", size);
#ifdef CONFIG_STACK_COLORATION
_alert(" used: %08" PRIx32 "\n", xtensa_stack_check((uintptr_t)base,
size));
_alert(" used: %08" PRIx32 "\n", used);
#endif
if (sp >= base && sp < top)
@ -301,7 +303,12 @@ static void xtensa_dump_stack(const char *tag, uint32_t sp,
if (force)
{
xtensa_stackdump(base, top);
#ifdef CONFIG_STACK_COLORATION
base += size - used;
size = used;
#endif
xtensa_stackdump(base, base + size);
}
}
}