andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
gdisirio 2010-03-26 12:55:23 +00:00
parent 2dc90132f5
commit 8429df6891
1 changed files with 39 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
os/ports/GCC/ARMCMx/chcore.c
View File

@ -69,6 +69,34 @@ void SysTickVector(void) {
chSysUnlockFromIsr(); chSysUnlockFromIsr();
} }
#ifdef CH_CURRP_REGISTER_CACHE
#define PUSH_CONTEXT(sp, prio) { \
asm volatile ("mrs %0, PSP \n\t" \
"stmdb %0!, {r3-r6,r8-r11, lr}" : \
"=r" (sp) : "r" (sp), "r" (prio)); \
}
#define POP_CONTEXT(sp) { \
asm volatile ("ldmia %0!, {r3-r6,r8-r11, lr} \n\t" \
"msr PSP, %0 \n\t" \
"msr BASEPRI, r3 \n\t" \
"bx lr" : "=r" (sp) : "r" (sp)); \
}
#else
#define PUSH_CONTEXT(sp, prio) { \
asm volatile ("mrs %0, PSP \n\t" \
"stmdb %0!, {r3-r11,lr}" : \
"=r" (sp) : "r" (sp), "r" (prio)); \
}
#define POP_CONTEXT(sp) { \
asm volatile ("ldmia r12!, {r3-r11, lr} \n\t" \
"msr PSP, %0 \n\t" \
"msr BASEPRI, r3 \n\t" \
"bx lr" : "=r" (sp) : "r" (sp)); \
}
#endif
/** /**
* @brief SVC vector. * @brief SVC vector.
* @details The SVC vector is used for commanded context switch. Structures * @details The SVC vector is used for commanded context switch. Structures
@ -82,60 +110,17 @@ void SysTickVector(void) {
__attribute__((naked)) __attribute__((naked))
#endif #endif
void SVCallVector(Thread *ntp, Thread *otp) { void SVCallVector(Thread *ntp, Thread *otp) {
(void)otp; register struct intctx *sp_thd asm("r12");
(void)ntp; register uint32_t prio asm ("r3");
#ifdef CH_CURRP_REGISTER_CACHE
asm volatile ("mrs r3, BASEPRI \n\t" \
"mrs r12, PSP \n\t" \
"stmdb r12!, {r3-r6,r8-r11, lr} \n\t" \
"str r12, [r1, #12] \n\t" \
"ldr r12, [r0, #12] \n\t" \
"ldmia r12!, {r3-r6,r8-r11, lr} \n\t" \
"msr PSP, r12 \n\t" \
"msr BASEPRI, r3 \n\t" \
"bx lr ");
#else
asm volatile ("mrs r3, BASEPRI \n\t" \
"mrs r12, PSP \n\t" \
"stmdb r12!, {r3-r11, lr} \n\t" \
"str r12, [r1, #12] \n\t" \
"ldr r12, [r0, #12] \n\t" \
"ldmia r12!, {r3-r11, lr} \n\t" \
"msr PSP, r12 \n\t" \
"msr BASEPRI, r3 \n\t" \
"bx lr ");
#endif
}
#ifdef CH_CURRP_REGISTER_CACHE asm volatile ("mrs r3, BASEPRI" : "=r" (prio) : );
#define PUSH_CONTEXT(sp) { \ PUSH_CONTEXT(sp_thd, prio);
register uint32_t tmp asm ("r3") = CORTEX_BASEPRI_USER; \
asm volatile ("mrs %0, PSP \n\t" \
"stmdb %0!, {r3-r6,r8-r11, lr}" : \
"=r" (sp) : "r" (sp), "r" (tmp)); \
}
#define POP_CONTEXT(sp) { \ otp->p_ctx.r13 = sp_thd;
asm volatile ("ldmia %0!, {r3-r6,r8-r11, lr} \n\t" \ sp_thd = ntp->p_ctx.r13;
"msr PSP, %0 \n\t" \
"msr BASEPRI, r3 \n\t" \
"bx lr" : "=r" (sp) : "r" (sp)); \
}
#else
#define PUSH_CONTEXT(sp) { \
register uint32_t tmp asm ("r3") = CORTEX_BASEPRI_USER; \
asm volatile ("mrs %0, PSP \n\t" \
"stmdb %0!, {r3-r11,lr}" : \
"=r" (sp) : "r" (sp), "r" (tmp)); \
}
#define POP_CONTEXT(sp) { \ POP_CONTEXT(sp_thd);
asm volatile ("ldmia %0!, {r3-r11, lr} \n\t" \
"msr PSP, %0 \n\t" \
"msr BASEPRI, r3 \n\t" \
"bx lr" : "=r" (sp) : "r" (sp)); \
} }
#endif
/** /**
* @brief Preemption code. * @brief Preemption code.
@ -144,12 +129,14 @@ void SVCallVector(Thread *ntp, Thread *otp) {
__attribute__((naked)) __attribute__((naked))
#endif #endif
void PendSVVector(void) { void PendSVVector(void) {
Thread *otp, *ntp;
register struct intctx *sp_thd asm("r12"); register struct intctx *sp_thd asm("r12");
register uint32_t prio asm ("r3");
Thread *otp, *ntp;
chSysLockFromIsr(); chSysLockFromIsr();
PUSH_CONTEXT(sp_thd); prio = CORTEX_BASEPRI_USER;
PUSH_CONTEXT(sp_thd, prio);
(otp = currp)->p_ctx.r13 = sp_thd; (otp = currp)->p_ctx.r13 = sp_thd;
ntp = fifo_remove(&rlist.r_queue); ntp = fifo_remove(&rlist.r_queue);