diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-10 10:17:45 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-10 10:17:45 +0000 |
| commit | 649decd10516a30886d05f5afca3d425d836db0e (patch) | |
| tree | 48e4aa7173da4f16764926738ba5518b03b4496b /os/kernel/ports | |
| parent | c3dc5598c315f4650bfcd1e595104a2ace7aa87c (diff) | |
| download | ChibiOS-649decd10516a30886d05f5afca3d425d836db0e.tar.gz ChibiOS-649decd10516a30886d05f5afca3d425d836db0e.tar.bz2 ChibiOS-649decd10516a30886d05f5afca3d425d836db0e.zip | |
Cleanup debug module.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6120 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/ports')
| -rw-r--r-- | os/kernel/ports/ARMCMx/chcore_v7m.h | 2 | ||||
| -rw-r--r-- | os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/os/kernel/ports/ARMCMx/chcore_v7m.h b/os/kernel/ports/ARMCMx/chcore_v7m.h index a0a2680b7..3426977a1 100644 --- a/os/kernel/ports/ARMCMx/chcore_v7m.h +++ b/os/kernel/ports/ARMCMx/chcore_v7m.h @@ -371,7 +371,7 @@ struct context { #define port_switch(ntp, otp) _port_switch(ntp, otp)
#else
#define port_switch(ntp, otp) { \
- struct intctx *r13 = __get_PSP(); \
+ struct intctx *r13 = (struct intctx *)__get_PSP(); \
if ((stkalign_t *)(r13 - 1) < otp->p_stklimit) \
chDbgPanic("stack overflow"); \
_port_switch(ntp, otp); \
diff --git a/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s b/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s index 881448dfc..36864a2c9 100644 --- a/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s +++ b/os/kernel/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s @@ -85,7 +85,7 @@ _port_switch: .globl _port_thread_start
_port_thread_start:
#if CH_DBG_SYSTEM_STATE_CHECK
- bl dbg_check_unlock
+ bl _dbg_check_unlock
#endif
#if CH_DBG_STATISTICS
bl _stats_stop_measure_crit_thd
@@ -112,11 +112,11 @@ _port_switch_from_isr: bl _stats_start_measure_crit_thd
#endif
#if CH_DBG_SYSTEM_STATE_CHECK
- bl dbg_check_lock
+ bl _dbg_check_lock
#endif
bl chSchDoReschedule
#if CH_DBG_SYSTEM_STATE_CHECK
- bl dbg_check_unlock
+ bl _dbg_check_unlock
#endif
#if CH_DBG_STATISTICS
bl _stats_stop_measure_crit_thd
|