git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6094 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2013-08-06 15:05:20 +00:00
parent 8a3e3223da
commit b5e0aff09d
2 changed files with 18 additions and 18 deletions

View File

@ -19,10 +19,10 @@
*/
/**
* @file ARM/chcoreasm.s
* @brief ARM7/9 architecture port low level code.
* @file ARMCMx/GCC/chcoreasm_v7m.s
* @brief ARMv7-M architecture port low level code.
*
* @addtogroup ARM_CORE
* @addtogroup ARMCMx_CORE
* @{
*/
@ -39,12 +39,12 @@
#if !defined(__DOXYGEN__)
.syntax unified
.cpu cortex-m4
.fpu softvfp
.syntax unified
.cpu cortex-m4
.fpu softvfp
.thumb
.text
.thumb
.text
/*
* Thread trampoline code.
@ -54,20 +54,20 @@
* register R5 contains the thread parameter. The function chThdExit() is
* called on thread function return.
*/
.thumb_func
.globl _port_thread_start
.thumb_func
.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
bl _stats_stop_measure_crit_thd
#endif
movs r3, #0
msr BASEPRI, r3
mov r0, r5
blx r4
bl chThdExit
movs r3, #0
msr BASEPRI, r3
mov r0, r5
blx r4
bl chThdExit
#endif /* !defined(__DOXYGEN__) */

View File

@ -4,7 +4,7 @@ PORTSRC = ${CHIBIOS}/os/kernel/ports/ARMCMx/chcore.c \
$(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/crt0.c \
$(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/vectors.c \
PORTASM = $(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/chcoreasm.s
PORTASM = $(CHIBIOS)/os/kernel/ports/ARMCMx/GCC/chcoreasm_v7m.s
PORTINC = ${CHIBIOS}/os/kernel/ports/ARMCMx \
${CHIBIOS}/os/kernel/ports/ARMCMx/GCC \