summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoryangjie11 <[email protected]>2018-12-13 09:22:12 +0800
committerGitHub <[email protected]>2018-12-13 09:22:12 +0800
commit2b98f4720c827ae1850df78299f6b273d568c8c7 (patch)
tree142d000d78e3b874b7bdd2313388b00a3ddf1000 /src
parent1a7f95f92b84b0a3acd6243cb2a658b4f9b6f1ac (diff)
parentdcf7bce2cc5d04bcb006b84a27a5498f42268184 (diff)
Merge pull request #2 from RT-Thread/master
更新
Diffstat (limited to 'src')
-rw-r--r--src/cpu.c2
-rw-r--r--src/irq.c2
-rw-r--r--src/scheduler.c8
3 files changed, 10 insertions, 2 deletions
diff --git a/src/cpu.c b/src/cpu.c
index ef6dce1787..3e2d65dfb9 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -86,6 +86,6 @@ void rt_cpus_lock_status_restore(struct rt_thread *thread)
rt_hw_spin_unlock(&_cpus_lock);
}
}
-RTM_EXPORT(rt_post_switch);
+RTM_EXPORT(rt_cpus_lock_status_restore);
#endif
diff --git a/src/irq.c b/src/irq.c
index ee03204819..78ad586064 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -52,7 +52,7 @@ void rt_interrupt_leave_sethook(void (*hook)(void))
#ifdef RT_USING_SMP
#define rt_interrupt_nest rt_cpu_self()->irq_nest
#else
-volatile rt_uint8_t rt_interrupt_nest;
+volatile rt_uint8_t rt_interrupt_nest = 0;
#endif
/**
diff --git a/src/scheduler.c b/src/scheduler.c
index e177bde6b7..aafa1f4529 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -99,11 +99,19 @@ static void _rt_scheduler_stack_check(struct rt_thread *thread)
level = rt_hw_interrupt_disable();
while (level);
}
+#if defined(ARCH_CPU_STACK_GROWS_UPWARD)
+ else if ((rt_ubase_t)thread->sp > ((rt_ubase_t)thread->stack_addr + thread->stack_size))
+ {
+ rt_kprintf("warning: %s stack is close to the top of stack address.\n",
+ thread->name);
+ }
+#else
else if ((rt_ubase_t)thread->sp <= ((rt_ubase_t)thread->stack_addr + 32))
{
rt_kprintf("warning: %s stack is close to end of stack address.\n",
thread->name);
}
+#endif
}
#endif