diff options
| author | Bernard Xiong <[email protected]> | 2018-12-16 06:49:34 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-12-16 06:49:34 +0800 |
| commit | 9e990be5729ba4d4514ba997708ca0b70b147a36 (patch) | |
| tree | c05e2cfff5dbad61f2d9b8d019b8248d5a44f4a8 | |
| parent | c72dc1a7e5493c9f6af4a221b27499e2f00e2620 (diff) | |
| parent | 10d00ff41c407f9d309a4319621c90ca363bf887 (diff) | |
Merge pull request #2074 from zhaohengbo/master
fix some bug when stack grows upward
| -rw-r--r-- | components/finsh/cmd.c | 2 | ||||
| -rw-r--r-- | src/scheduler.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/components/finsh/cmd.c b/components/finsh/cmd.c index 0c06303b14..6bb8bce4de 100644 --- a/components/finsh/cmd.c +++ b/components/finsh/cmd.c @@ -116,7 +116,7 @@ static long _list_thread(struct rt_list_node *list) else if (stat == RT_THREAD_CLOSE) rt_kprintf(" close "); #if defined(ARCH_CPU_STACK_GROWS_UPWARD) - ptr = (rt_uint8_t *)thread->stack_addr + thread->stack_size; + ptr = (rt_uint8_t *)thread->stack_addr + thread->stack_size - 1; while (*ptr == '#')ptr --; rt_kprintf(" 0x%08x 0x%08x %02d%% 0x%08x %03d\n", diff --git a/src/scheduler.c b/src/scheduler.c index 14f7510e66..503639fa81 100644 --- a/src/scheduler.c +++ b/src/scheduler.c @@ -82,7 +82,11 @@ static void _rt_scheduler_stack_check(struct rt_thread *thread) { RT_ASSERT(thread != RT_NULL); +#if defined(ARCH_CPU_STACK_GROWS_UPWARD) + if (*((rt_uint8_t *)((rt_ubase_t)thread->stack_addr + thread->stack_size - 1)) != '#' || +#else if (*((rt_uint8_t *)thread->stack_addr) != '#' || +#endif (rt_ubase_t)thread->sp <= (rt_ubase_t)thread->stack_addr || (rt_ubase_t)thread->sp > (rt_ubase_t)thread->stack_addr + (rt_ubase_t)thread->stack_size) |