From f26704f6eed57f17cb0eb8c1048dc5cfd7ee11a4 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 6 Mar 2011 10:39:17 +0000
Subject: Cortex-M0 improvements for IAR port.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2803 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/ports/IAR/ARMCMx/chcore_v6m.c    |  5 ----
 os/ports/IAR/ARMCMx/chcore_v6m.h    | 22 ++--------------
 os/ports/IAR/ARMCMx/chcoreasm_v6m.s | 50 ++++++++++++++++++++-----------------
 3 files changed, 29 insertions(+), 48 deletions(-)

(limited to 'os/ports/IAR')

diff --git a/os/ports/IAR/ARMCMx/chcore_v6m.c b/os/ports/IAR/ARMCMx/chcore_v6m.c
index d8ede674d..8549393e1 100644
--- a/os/ports/IAR/ARMCMx/chcore_v6m.c
+++ b/os/ports/IAR/ARMCMx/chcore_v6m.c
@@ -27,11 +27,6 @@
 
 #include "ch.h"
 
-/**
- * @brief   PC register temporary storage.
- */
-regarm_t _port_saved_pc;
-
 /**
  * @brief   System Timer vector.
  * @details This interrupt is used as system tick.
diff --git a/os/ports/IAR/ARMCMx/chcore_v6m.h b/os/ports/IAR/ARMCMx/chcore_v6m.h
index fdbde0641..e39d6c299 100644
--- a/os/ports/IAR/ARMCMx/chcore_v6m.h
+++ b/os/ports/IAR/ARMCMx/chcore_v6m.h
@@ -32,10 +32,8 @@
 /* Port implementation part.                                                 */
 /*===========================================================================*/
 
-/**
- * @brief   Cortex-Mx exception context.
- */
-struct cmxctx {
+#if !defined(__DOXYGEN__)
+struct extctx {
   regarm_t      r0;
   regarm_t      r1;
   regarm_t      r2;
@@ -46,18 +44,6 @@ struct cmxctx {
   regarm_t      xpsr;
 };
 
-#if !defined(__DOXYGEN__)
-struct extctx {
-  regarm_t      xpsr;
-  regarm_t      r12;
-  regarm_t      lr;
-  regarm_t      r0;
-  regarm_t      r1;
-  regarm_t      r2;
-  regarm_t      r3;
-  regarm_t      pc;
-};
-
 struct intctx {
   regarm_t      r8;
   regarm_t      r9;
@@ -231,10 +217,6 @@ struct intctx {
 }
 #endif
 
-#if !defined(__DOXYGEN__)
-extern regarm_t _port_saved_pc;
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/os/ports/IAR/ARMCMx/chcoreasm_v6m.s b/os/ports/IAR/ARMCMx/chcoreasm_v6m.s
index 5333d4ab9..a0ddb42bc 100644
--- a/os/ports/IAR/ARMCMx/chcoreasm_v6m.s
+++ b/os/ports/IAR/ARMCMx/chcoreasm_v6m.s
@@ -30,16 +30,15 @@
 
 #define CORTEX_PRIORITY_MASK(n) ((n) << (8 - CORTEX_PRIORITY_BITS))
 
-EXTCTX_SIZE     SET 32
-CONTEXT_OFFSET  SET 12
+EXTCTX_SIZE     SET     32
+CONTEXT_OFFSET  SET     12
+SCB_ICSR        SET     0xE000ED04
 
         SECTION .text:CODE:NOROOT(2)
 
         EXTERN  chThdExit
         EXTERN  chSchIsRescRequiredExI
         EXTERN  chSchDoRescheduleI
-        EXTERN  _port_saved_pc
-        EXTERN  _port_irq_nesting
 
         THUMB
 
@@ -76,29 +75,32 @@ _port_thread_start:
         blx     r4
         bl      chThdExit
 
+/*
+ * NMI vector.
+ * The NMI vector is used for exception mode re-entering after a context
+ * switch.
+ */
+    PUBLIC  NMIVector
+NMIVector:
+        mrs     r3, PSP
+        adds    r3, r3, #32
+        msr     PSP, r3
+        cpsie   i
+        bx      lr
+
 /*
  * Post-IRQ switch code.
  * Exception handlers return here for context switching.
  */
         PUBLIC  _port_switch_from_isr
 _port_switch_from_isr:
-        /* Note, saves r4 to make space for the PC.*/
-        push    {r0, r1, r2, r3, r4}
-        mrs     r0, APSR
-        mov     r1, r12
-        push    {r0, r1, lr}
-        ldr     r0, =_port_saved_pc
-        ldr     r0, [r0]
-        adds    r0, r0, #1
-        str     r0, [sp, #28]
         bl      chSchDoRescheduleI
-        pop     {r0, r1, r2}
-        mov     r12, r1
-        msr     APSR, r0
-        mov     lr, r2
-        pop     {r0, r1, r2, r3}
-        cpsie   i
-        pop     {pc}
+        movs    r3, #128
+        lsls    r3, r3, #24
+        ldr     r2, =SCB_ICSR
+        str     r3, [r2, #0]
+_waitnmi:
+        b       _waitnmi
 
 /*
  * Reschedule verification and setup after an IRQ.
@@ -117,11 +119,13 @@ stillnested
         pop     {r3, pc}
 doresch
         mrs     r3, PSP
-        ldr     r2, =_port_saved_pc
-        ldr     r1, [r3, #24]
-        str     r1, [r2]
+        subs    r3, r3, #32
+        msr     PSP, r3
         ldr     r2, =_port_switch_from_isr
         str     r2, [r3, #24]
+        movs    r2, #128
+        lsls     r2, r2, #17
+        str     r2, [r3, #28]
         pop     {r3, pc}
 
         END
-- 
cgit v1.2.3