zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STM8, MSP430 and AVR ports adjusted for state checker option. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3229 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2011-08-14 09:40:19 +00:00
parent 930cd17e55
commit c4f7ff481d
12 changed files with 62 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/kernel/templates/chcore.h
View File

@ -151,7 +151,7 @@ struct context {
#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \ #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \
sizeof(struct intctx) + \ sizeof(struct intctx) + \
sizeof(struct extctx) + \ sizeof(struct extctx) + \
(n) + (PORT_INT_REQUIRED_STACK)) (n) + (PORT_INT_REQUIRED_STACK))
/** /**
* @brief Static working area allocation. * @brief Static working area allocation.

2
os/ports/GCC/ARM/chcore.h
View File

@ -249,7 +249,7 @@ struct context {
#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \ #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \
sizeof(struct intctx) + \ sizeof(struct intctx) + \
sizeof(struct extctx) + \ sizeof(struct extctx) + \
(n) + (PORT_INT_REQUIRED_STACK)) (n) + (PORT_INT_REQUIRED_STACK))
/** /**
* @brief Static working area allocation. * @brief Static working area allocation.

2
os/ports/GCC/AVR/chcore.c
View File

@ -123,7 +123,7 @@ void port_halt(void) {
*/ */
void _port_thread_start(void) { void _port_thread_start(void) {
asm volatile ("sei"); chSysUnlock();
asm volatile ("movw r24, r4"); asm volatile ("movw r24, r4");
asm volatile ("movw r30, r2"); asm volatile ("movw r30, r2");
asm volatile ("icall"); asm volatile ("icall");

38
os/ports/GCC/AVR/chcore.h
View File

@ -142,15 +142,15 @@ struct context {
* @details This code usually setup the context switching frame represented * @details This code usually setup the context switching frame represented
* by an @p intctx structure. * by an @p intctx structure.
*/ */
#define SETUP_CONTEXT(workspace, wsize, pf, arg) { \ #define SETUP_CONTEXT(workspace, wsize, pf, arg) { \
tp->p_ctx.sp = (struct intctx*)((uint8_t *)workspace + wsize - \ tp->p_ctx.sp = (struct intctx*)((uint8_t *)workspace + wsize - \
sizeof(struct intctx)); \ sizeof(struct intctx)); \
tp->p_ctx.sp->r2 = (int)pf; \ tp->p_ctx.sp->r2 = (int)pf; \
tp->p_ctx.sp->r3 = (int)pf >> 8; \ tp->p_ctx.sp->r3 = (int)pf >> 8; \
tp->p_ctx.sp->r4 = (int)arg; \ tp->p_ctx.sp->r4 = (int)arg; \
tp->p_ctx.sp->r5 = (int)arg >> 8; \ tp->p_ctx.sp->r5 = (int)arg >> 8; \
tp->p_ctx.sp->pcl = (int)_port_thread_start >> 8; \ tp->p_ctx.sp->pcl = (int)_port_thread_start >> 8; \
tp->p_ctx.sp->pch = (int)_port_thread_start; \ tp->p_ctx.sp->pch = (int)_port_thread_start; \
} }
/** /**
@ -185,9 +185,9 @@ struct context {
/** /**
* @brief Computes the thread working area global size. * @brief Computes the thread working area global size.
*/ */
#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \ #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \
(sizeof(struct intctx) - 1) + \ (sizeof(struct intctx) - 1) + \
(sizeof(struct extctx) - 1) + \ (sizeof(struct extctx) - 1) + \
(n) + (PORT_INT_REQUIRED_STACK)) (n) + (PORT_INT_REQUIRED_STACK))
/** /**
@ -204,9 +204,9 @@ struct context {
* @note This code tricks the compiler to save all the specified registers * @note This code tricks the compiler to save all the specified registers
* by "touching" them. * by "touching" them.
*/ */
#define PORT_IRQ_PROLOGUE() { \ #define PORT_IRQ_PROLOGUE() { \
asm ("" : : : "r18", "r19", "r20", "r21", "r22", "r23", "r24", \ asm ("" : : : "r18", "r19", "r20", "r21", "r22", "r23", "r24", \
"r25", "r26", "r27", "r30", "r31"); \ "r25", "r26", "r27", "r30", "r31"); \
} }
/** /**
@ -214,9 +214,11 @@ struct context {
* @details This macro must be inserted at the end of all IRQ handlers * @details This macro must be inserted at the end of all IRQ handlers
* enabled to invoke system APIs. * enabled to invoke system APIs.
*/ */
#define PORT_IRQ_EPILOGUE() { \ #define PORT_IRQ_EPILOGUE() { \
if (chSchIsPreemptionRequired()) \ dbg_check_lock(); \
chSchDoReschedule(); \ if (chSchIsPreemptionRequired()) \
chSchDoReschedule(); \
dbg_check_unlock(); \
} }
/** /**

4
os/ports/GCC/MSP430/chcore.c
View File

@ -93,8 +93,8 @@ void port_halt(void) {
*/ */
void _port_thread_start(void) { void _port_thread_start(void) {
asm volatile ("eint \n\t" \ chSysUnlock();
"mov r11, r15 \n\t" \ asm volatile ("mov r11, r15 \n\t" \
"call r10 \n\t" \ "call r10 \n\t" \
"call #chThdExit"); "call #chThdExit");
} }

40
os/ports/GCC/MSP430/chcore.h
View File

@ -119,13 +119,13 @@ struct context {
* @details This code usually setup the context switching frame represented * @details This code usually setup the context switching frame represented
* by an @p intctx structure. * by an @p intctx structure.
*/ */
#define SETUP_CONTEXT(workspace, wsize, pf, arg) { \ #define SETUP_CONTEXT(workspace, wsize, pf, arg) { \
tp->p_ctx.sp = (struct intctx *)((uint8_t *)workspace + \ tp->p_ctx.sp = (struct intctx *)((uint8_t *)workspace + \
wsize - \ wsize - \
sizeof(struct intctx)); \ sizeof(struct intctx)); \
tp->p_ctx.sp->r10 = pf; \ tp->p_ctx.sp->r10 = pf; \
tp->p_ctx.sp->r11 = arg; \ tp->p_ctx.sp->r11 = arg; \
tp->p_ctx.sp->pc = _port_thread_start; \ tp->p_ctx.sp->pc = _port_thread_start; \
} }
/** /**
@ -159,10 +159,10 @@ struct context {
/** /**
* @brief Computes the thread working area global size. * @brief Computes the thread working area global size.
*/ */
#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \ #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \
sizeof(struct intctx) + \ sizeof(struct intctx) + \
sizeof(struct extctx) + \ sizeof(struct extctx) + \
(n) + (PORT_INT_REQUIRED_STACK)) (n) + (PORT_INT_REQUIRED_STACK))
/** /**
* @brief Static working area allocation. * @brief Static working area allocation.
@ -183,9 +183,11 @@ struct context {
* @details This macro must be inserted at the end of all IRQ handlers * @details This macro must be inserted at the end of all IRQ handlers
* enabled to invoke system APIs. * enabled to invoke system APIs.
*/ */
#define PORT_IRQ_EPILOGUE() { \ #define PORT_IRQ_EPILOGUE() { \
if (chSchIsPreemptionRequired()) \ dbg_check_lock(); \
chSchDoReschedule(); \ if (chSchIsPreemptionRequired()) \
chSchDoReschedule(); \
dbg_check_unlock(); \
} }
/** /**
@ -220,7 +222,11 @@ struct context {
/** /**
* @brief Kernel-lock action from an interrupt handler. * @brief Kernel-lock action from an interrupt handler.
* @details This function is invoked before invoking I-class APIs from * @details This function is invoked before invoking I-class APIs from
* interrupt handlers. The implementation is architecture dependent, * interrupt handlers. The implementation is architecture dependen#define PORT_IRQ_EPILOGUE() { \
if (chSchIsPreemptionRequired()) \
chSchDoReschedule(); \
}
* t,
* in its simplest form it is void. * in its simplest form it is void.
* @note This function is empty in this port. * @note This function is empty in this port.
*/ */
@ -270,8 +276,8 @@ struct context {
*/ */
#if ENABLE_WFI_IDLE != 0 #if ENABLE_WFI_IDLE != 0
#ifndef port_wait_for_interrupt #ifndef port_wait_for_interrupt
#define port_wait_for_interrupt() { \ #define port_wait_for_interrupt() { \
asm volatile ("nop" : : : "memory"); \ asm volatile ("nop" : : : "memory"); \
} }
#endif #endif
#else #else

12
os/ports/GCC/PPC/chcore.h
View File

@ -221,10 +221,10 @@ struct context {
/** /**
* @brief Computes the thread working area global size. * @brief Computes the thread working area global size.
*/ */
#define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \ #define THD_WA_SIZE(n) STACK_ALIGN(sizeof(Thread) + \
sizeof(struct intctx) + \ sizeof(struct intctx) + \
sizeof(struct extctx) + \ sizeof(struct extctx) + \
(n) + (PORT_INT_REQUIRED_STACK)) (n) + (PORT_INT_REQUIRED_STACK))
/** /**
* @brief Static working area allocation. * @brief Static working area allocation.
@ -307,8 +307,8 @@ struct context {
*/ */
#if ENABLE_WFI_IDLE != 0 #if ENABLE_WFI_IDLE != 0
#ifndef port_wait_for_interrupt #ifndef port_wait_for_interrupt
#define port_wait_for_interrupt() { \ #define port_wait_for_interrupt() { \
asm volatile ("wait" : : : "memory"); \ asm volatile ("wait" : : : "memory"); \
} }
#endif #endif
#else #else

2
os/ports/GCC/SIMIA32/chcore.h
View File

@ -144,7 +144,7 @@ struct context {
sizeof(void *) * 4 + \ sizeof(void *) * 4 + \
sizeof(struct intctx) + \ sizeof(struct intctx) + \
sizeof(struct extctx) + \ sizeof(struct extctx) + \
(n) + (PORT_INT_REQUIRED_STACK)) (n) + (PORT_INT_REQUIRED_STACK))
/** /**
* Macro used to allocate a thread working area aligned as both position and * Macro used to allocate a thread working area aligned as both position and

2
os/ports/RC/STM8/chcore.c
View File

@ -54,8 +54,8 @@ void _port_switch(Thread *otp) {
*/ */
void _port_thread_start(void) { void _port_thread_start(void) {
chSysUnlock();
#pragma ASM #pragma ASM
RIM
POPW X POPW X
#pragma ENDASM #pragma ENDASM
} }

2
os/ports/RC/STM8/chcore.h
View File

@ -206,8 +206,10 @@ struct stm8_startctx {
* enabled to invoke system APIs. * enabled to invoke system APIs.
*/ */
#define PORT_IRQ_EPILOGUE() { \ #define PORT_IRQ_EPILOGUE() { \
dbg_check_lock(); \
if (chSchIsPreemptionRequired()) \ if (chSchIsPreemptionRequired()) \
chSchDoReschedule(); \ chSchDoReschedule(); \
dbg_check_unlock(); \
} }
/** /**

4
os/ports/cosmic/STM8/chcore.c
View File

@ -50,8 +50,8 @@ void _port_switch(Thread *otp) {
*/ */
void _port_thread_start(void) { void _port_thread_start(void) {
_asm(" rim \n" chSysUnlock();
" popw x \n"); _asm(" popw x \n");
} }
/** /**

2
os/ports/cosmic/STM8/chcore.h
View File

@ -203,8 +203,10 @@ struct stm8_startctx {
* enabled to invoke system APIs. * enabled to invoke system APIs.
*/ */
#define PORT_IRQ_EPILOGUE() { \ #define PORT_IRQ_EPILOGUE() { \
dbg_check_lock(); \
if (chSchIsPreemptionRequired()) \ if (chSchIsPreemptionRequired()) \
chSchDoReschedule(); \ chSchDoReschedule(); \
dbg_check_unlock(); \
} }
/** /**