aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-03-10 15:05:20 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-03-10 15:05:20 +0000
commit69c791b542c1e1691b3b8737777aa595fde03e16 (patch)
treec5a7f18682017e8dcebd1297b7d73b9f50f09333
parent04e194c54f4a208b14d8c17aaddf3170e943eea8 (diff)
downloadChibiOS-69c791b542c1e1691b3b8737777aa595fde03e16.tar.gz
ChibiOS-69c791b542c1e1691b3b8737777aa595fde03e16.tar.bz2
ChibiOS-69c791b542c1e1691b3b8737777aa595fde03e16.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7750 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/rt/ports/ARMCMx/chcore_v6m.h3
-rw-r--r--os/rt/ports/ARMCMx/chcore_v7m.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/os/rt/ports/ARMCMx/chcore_v6m.h b/os/rt/ports/ARMCMx/chcore_v6m.h
index 3ac78b926..9750308d4 100644
--- a/os/rt/ports/ARMCMx/chcore_v6m.h
+++ b/os/rt/ports/ARMCMx/chcore_v6m.h
@@ -251,8 +251,9 @@ struct port_intctx {
#else
#define port_switch(ntp, otp) { \
struct port_intctx *r13 = (struct port_intctx *)__get_PSP(); \
- if ((stkalign_t *)(r13 - 1) < (otp)->p_stklimit) \
+ if ((stkalign_t *)(r13 - 1) < (otp)->p_stklimit) { \
chSysHalt("stack overflow"); \
+ } \
_port_switch(ntp, otp); \
}
#endif
diff --git a/os/rt/ports/ARMCMx/chcore_v7m.h b/os/rt/ports/ARMCMx/chcore_v7m.h
index d6befaf72..2e49c1895 100644
--- a/os/rt/ports/ARMCMx/chcore_v7m.h
+++ b/os/rt/ports/ARMCMx/chcore_v7m.h
@@ -343,8 +343,9 @@ struct port_intctx {
#else
#define port_switch(ntp, otp) { \
struct port_intctx *r13 = (struct port_intctx *)__get_PSP(); \
- if ((stkalign_t *)(r13 - 1) < (otp)->p_stklimit) \
+ if ((stkalign_t *)(r13 - 1) < (otp)->p_stklimit) { \
chSysHalt("stack overflow"); \
+ } \
_port_switch(ntp, otp); \
}
#endif