diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-03-30 20:06:21 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-03-30 20:06:21 +0000 |
| commit | 652029259b246dc5dff906a0b945b29f5e72690e (patch) | |
| tree | 8bfff244bc0275bbbdd9fdabf46e248de3a096be /os/ports | |
| parent | 3846f18c1279ab30944e3dd63cc002379be6a5e1 (diff) | |
| download | ChibiOS-652029259b246dc5dff906a0b945b29f5e72690e.tar.gz ChibiOS-652029259b246dc5dff906a0b945b29f5e72690e.tar.bz2 ChibiOS-652029259b246dc5dff906a0b945b29f5e72690e.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1816 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports')
| -rw-r--r-- | os/ports/GCC/ARMCMx/chcore.c | 29 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/chcore.h | 2 |
2 files changed, 24 insertions, 7 deletions
diff --git a/os/ports/GCC/ARMCMx/chcore.c b/os/ports/GCC/ARMCMx/chcore.c index 9cb2b9ea5..348aedef7 100644 --- a/os/ports/GCC/ARMCMx/chcore.c +++ b/os/ports/GCC/ARMCMx/chcore.c @@ -80,28 +80,46 @@ __attribute__((naked)) #endif
void _port_switch_from_irq(void) {
/* Note, saves r4 to make space for the PC.*/
+#if defined(CH_ARCHITECTURE_ARM_v6M)
asm volatile ("push {r0, r1, r2, r3, r4} \n\t" \
- "mov r0, r12 \n\t" \
- "mrs r1, XPSR \n\t" \
+ "mrs r0, XPSR \n\t" \
+ "mov r1, r12 \n\t" \
"push {r0, r1, lr} \n\t" \
"ldr r0, =_port_saved_pc \n\t" \
"ldr r0, [r0] \n\t" \
"add r0, r0, #1 \n\t" \
"str r0, [sp, #28]");
+#elif defined(CH_ARCHITECTURE_ARM_v7M)
+ asm volatile ("push {r0, r1, r2, r3, r4} \n\t" \
+ "mrs r0, XPSR \n\t" \
+ "push {r0, r12, lr} \n\t" \
+ "ldr r0, =_port_saved_pc \n\t" \
+ "ldr r0, [r0] \n\t" \
+ "add r0, r0, #1 \n\t" \
+ "str r0, [sp, #28]");
+#endif
chSchDoRescheduleI();
/* Note, the PC is restored alone after re-enabling the interrupts in
order to minimize the (very remote and unlikely) possibility that
- the stack is filled by continous and saturating interrups that would
+ the stack is filled by continuous and saturating interrupts that would
not allow that last word to be pulled out of the stack.*/
+#if defined(CH_ARCHITECTURE_ARM_v6M)
asm volatile ("pop {r0, r1, r2} \n\t" \
- "mov r12, r0 \n\t" \
- "msr XPSR, r1 \n\t" \
+ "mov r12, r1 \n\t" \
+ "msr XPSR, r0 \n\t" \
"mov lr, r2 \n\t" \
"pop {r0, r1, r2, r3} \n\t" \
"cpsie i \n\t" \
"pop {pc}");
+#elif defined(CH_ARCHITECTURE_ARM_v7M)
+ asm volatile ("pop {r0, r12, lr} \n\t" \
+ "msr XPSR, r0 \n\t" \
+ "pop {r0, r1, r2, r3} \n\t" \
+ "cpsie i \n\t" \
+ "pop {pc}");
+#endif
}
#if defined(CH_ARCHITECTURE_ARM_v6M)
@@ -131,7 +149,6 @@ void _port_switch_from_irq(void) { asm volatile ("pop {r4, r5, r6, r7, r8, r9, r10, r11, pc} \n\t" \
: : "r" (sp)); \
}
-#else
#endif
/**
diff --git a/os/ports/GCC/ARMCMx/chcore.h b/os/ports/GCC/ARMCMx/chcore.h index aec560565..e318eec57 100644 --- a/os/ports/GCC/ARMCMx/chcore.h +++ b/os/ports/GCC/ARMCMx/chcore.h @@ -198,8 +198,8 @@ struct cmxctx { * preemption-capable interrupt handler.
*/
struct extctx {
- regarm_t r12;
regarm_t xpsr;
+ regarm_t r12;
regarm_t lr;
regarm_t r0;
regarm_t r1;
|