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

6 files changed, 252 insertions, 17 deletions

diff --git a/os/common/ports/e200/compilers/GCC/ivor.s b/os/common/ports/e200/compilers/GCC/ivor.s
new file mode 100644
index 000000000..2f000c531
--- /dev/null
+++ b/os/common/ports/e200/compilers/GCC/ivor.s
@@ -0,0 +1,232 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011,2012,2013 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/**

+ * @file    PPC/ivor.s

+ * @brief   Kernel ISRs.

+ *

+ * @addtogroup PPC_CORE

+ * @{

+ */

+

+#if !defined(FALSE) || defined(__DOXYGEN__)

+#define FALSE   0

+#endif

+

+#if !defined(TRUE) || defined(__DOXYGEN__)

+#define TRUE    1

+#endif

+

+/*

+ * Imports the PPC configuration headers.

+ */

+#define _FROM_ASM_

+#include "chconf.h"

+#include "chcore.h"

+

+#if !defined(__DOXYGEN__)

+        /*

+         * INTC registers address.

+         */

+        .equ  INTC_IACKR, 0xfff48010

+        .equ  INTC_EOIR,  0xfff48018

+

+        .section    .handlers, "ax"

+

+#if PPC_SUPPORTS_DECREMENTER

+        /*

+         * _IVOR10 handler (Book-E decrementer).

+         */

+        .align      4

+        .globl      _IVOR10

+        .type       _IVOR10, @function

+_IVOR10:

+        /* Creation of the external stack frame (extctx structure).*/

+        stwu        %sp, -80(%sp)           /* Size of the extctx structure.*/

+#if PPC_USE_VLE && PPC_SUPPORTS_VLE_MULTI

+        e_stmvsrrw  8(%sp)                  /* Saves PC, MSR.               */

+        e_stmvsprw  16(%sp)                 /* Saves CR, LR, CTR, XER.      */

+        e_stmvgprw  32(%sp)                 /* Saves GPR0, GPR3...GPR12.    */

+#else /* !(PPC_USE_VLE && PPC_SUPPORTS_VLE_MULTI) */

+        stw         %r0, 32(%sp)            /* Saves GPR0.                  */

+        mfSRR0      %r0

+        stw         %r0, 8(%sp)             /* Saves PC.                    */

+        mfSRR1      %r0

+        stw         %r0, 12(%sp)            /* Saves MSR.                   */

+        mfCR        %r0

+        stw         %r0, 16(%sp)            /* Saves CR.                    */

+        mfLR        %r0

+        stw         %r0, 20(%sp)            /* Saves LR.                    */

+        mfCTR       %r0

+        stw         %r0, 24(%sp)            /* Saves CTR.                   */

+        mfXER       %r0

+        stw         %r0, 28(%sp)            /* Saves XER.                   */

+        stw         %r3, 36(%sp)            /* Saves GPR3...GPR12.          */

+        stw         %r4, 40(%sp)

+        stw         %r5, 44(%sp)

+        stw         %r6, 48(%sp)

+        stw         %r7, 52(%sp)

+        stw         %r8, 56(%sp)

+        stw         %r9, 60(%sp)

+        stw         %r10, 64(%sp)

+        stw         %r11, 68(%sp)

+        stw         %r12, 72(%sp)

+#endif /* !(PPC_USE_VLE && PPC_SUPPORTS_VLE_MULTI) */

+

+        /* Reset DIE bit in TSR register.*/

+        lis         %r3, 0x0800             /* DIS bit mask.                */

+        mtspr       336, %r3                /* TSR register.                */

+

+#if CH_DBG_SYSTEM_STATE_CHECK

+        bl          dbg_check_enter_isr

+        bl          dbg_check_lock_from_isr

+#endif

+        bl          chSysTimerHandlerI

+#if CH_DBG_SYSTEM_STATE_CHECK

+        bl          dbg_check_unlock_from_isr

+        bl          dbg_check_leave_isr

+#endif

+

+        /* System tick handler invocation.*/

+#if CH_DBG_SYSTEM_STATE_CHECK

+        bl          dbg_check_lock

+#endif

+        bl          chSchIsPreemptionRequired

+        cmpli       cr0, %r3, 0

+        beq         cr0, _ivor_exit

+        bl          chSchDoReschedule

+        b           _ivor_exit

+#endif /* PPC_SUPPORTS_DECREMENTER */

+

+        /*

+         * _IVOR4 handler (Book-E external interrupt).

+         */

+        .align      4

+        .globl      _IVOR4

+        .type       _IVOR4, @function

+_IVOR4:

+        /* Creation of the external stack frame (extctx structure).*/

+        stwu        %sp, -80(%sp)           /* Size of the extctx structure.*/

+#if PPC_USE_VLE && PPC_SUPPORTS_VLE_MULTI

+        e_stmvsrrw  8(%sp)                  /* Saves PC, MSR.               */

+        e_stmvsprw  16(%sp)                 /* Saves CR, LR, CTR, XER.      */

+        e_stmvgprw  32(%sp)                 /* Saves GPR0, GPR3...GPR12.    */

+#else /* !(PPC_USE_VLE && PPC_SUPPORTS_VLE_MULTI) */

+        stw         %r0, 32(%sp)            /* Saves GPR0.                  */

+        mfSRR0      %r0

+        stw         %r0, 8(%sp)             /* Saves PC.                    */

+        mfSRR1      %r0

+        stw         %r0, 12(%sp)            /* Saves MSR.                   */

+        mfCR        %r0

+        stw         %r0, 16(%sp)            /* Saves CR.                    */

+        mfLR        %r0

+        stw         %r0, 20(%sp)            /* Saves LR.                    */

+        mfCTR       %r0

+        stw         %r0, 24(%sp)            /* Saves CTR.                   */

+        mfXER       %r0

+        stw         %r0, 28(%sp)            /* Saves XER.                   */

+        stw         %r3, 36(%sp)            /* Saves GPR3...GPR12.          */

+        stw         %r4, 40(%sp)

+        stw         %r5, 44(%sp)

+        stw         %r6, 48(%sp)

+        stw         %r7, 52(%sp)

+        stw         %r8, 56(%sp)

+        stw         %r9, 60(%sp)

+        stw         %r10, 64(%sp)

+        stw         %r11, 68(%sp)

+        stw         %r12, 72(%sp)

+#endif /* !(PPC_USE_VLE && PPC_SUPPORTS_VLE_MULTI) */

+

+        /* Software vector address from the INTC register.*/

+        lis         %r3, INTC_IACKR@h

+        ori         %r3, %r3, INTC_IACKR@l  /* IACKR register address.      */

+        lwz         %r3, 0(%r3)             /* IACKR register value.        */

+        lwz         %r3, 0(%r3)

+        mtCTR       %r3                     /* Software handler address.    */

+

+#if PPC_USE_IRQ_PREEMPTION

+        /* Allows preemption while executing the software handler.*/

+        wrteei      1

+#endif

+

+        /* Exectes the software handler.*/

+        bctrl

+

+#if PPC_USE_IRQ_PREEMPTION

+        /* Prevents preemption again.*/

+        wrteei      0

+#endif

+

+        /* Informs the INTC that the interrupt has been served.*/

+        mbar        0

+        lis         %r3, INTC_EOIR@h

+        ori         %r3, %r3, INTC_EOIR@l

+        stw         %r3, 0(%r3)             /* Writing any value should do. */

+

+        /* Verifies if a reschedule is required.*/

+#if CH_DBG_SYSTEM_STATE_CHECK

+        bl          dbg_check_lock

+#endif

+        bl          chSchIsPreemptionRequired

+        cmpli       cr0, %r3, 0

+        beq         cr0, _ivor_exit

+        bl          chSchDoReschedule

+

+        /* Context restore.*/

+        .globl      _ivor_exit

+_ivor_exit:

+#if CH_DBG_SYSTEM_STATE_CHECK

+        bl          dbg_check_unlock

+#endif

+#if PPC_USE_VLE && PPC_SUPPORTS_VLE_MULTI

+        e_lmvgprw   32(%sp)                 /* Restores GPR0, GPR3...GPR12. */

+        e_lmvsprw   16(%sp)                 /* Restores CR, LR, CTR, XER.   */

+        e_lmvsrrw   8(%sp)                  /* Restores PC, MSR.            */

+#else /*!(PPC_USE_VLE && PPC_SUPPORTS_VLE_MULTI) */

+        lwz         %r3, 36(%sp)            /* Restores GPR3...GPR12.       */

+        lwz         %r4, 40(%sp)

+        lwz         %r5, 44(%sp)

+        lwz         %r6, 48(%sp)

+        lwz         %r7, 52(%sp)

+        lwz         %r8, 56(%sp)

+        lwz         %r9, 60(%sp)

+        lwz         %r10, 64(%sp)

+        lwz         %r11, 68(%sp)

+        lwz         %r12, 72(%sp)

+        lwz         %r0, 8(%sp)

+        mtSRR0      %r0                     /* Restores PC.                 */

+        lwz         %r0, 12(%sp)

+        mtSRR1      %r0                     /* Restores MSR.                */

+        lwz         %r0, 16(%sp)

+        mtCR        %r0                     /* Restores CR.                 */

+        lwz         %r0, 20(%sp)

+        mtLR        %r0                     /* Restores LR.                 */

+        lwz         %r0, 24(%sp)

+        mtCTR       %r0                     /* Restores CTR.                */

+        lwz         %r0, 28(%sp)

+        mtXER       %r0                     /* Restores XER.                */

+        lwz         %r0, 32(%sp)            /* Restores GPR0.               */

+#endif /* !(PPC_USE_VLE && PPC_SUPPORTS_VLE_MULTI) */

+        addi        %sp, %sp, 80            /* Back to the previous frame.  */

+        rfi

+

+#endif /* !defined(__DOXYGEN__) */

+

+/** @} */

diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
index 25f05fdc1..bd388a0a5 100644
--- a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
+++ b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s
@@ -26,10 +26,6 @@
  * @{

  */

 

-#define _FROM_ASM_

-#include "chconf.h"

-#include "chcore.h"

-

 #if !defined(FALSE) || defined(__DOXYGEN__)

 #define FALSE   0

 #endif

@@ -38,6 +34,10 @@
 #define TRUE    1

 #endif

 

+#define _FROM_ASM_

+#include "chconf.h"

+#include "chcore.h"

+

 #if !defined(__DOXYGEN__)

 

                 .set    CONTEXT_OFFSET, 12

diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
index 3bcc00c92..9b125ef7c 100644
--- a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
+++ b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s
@@ -26,10 +26,6 @@
  * @{

  */

 

-#define _FROM_ASM_

-#include "chconf.h"

-#include "chcore.h"

-

 #if !defined(FALSE) || defined(__DOXYGEN__)

 #define FALSE   0

 #endif

@@ -38,6 +34,10 @@
 #define TRUE    1

 #endif

 

+#define _FROM_ASM_

+#include "chconf.h"

+#include "chcore.h"

+

 #if !defined(__DOXYGEN__)

 

                 .set    CONTEXT_OFFSET, 12

diff --git a/os/rt/ports/e200/chcore.c b/os/rt/ports/e200/chcore.c
index 6205b8084..a74c76cad 100644
--- a/os/rt/ports/e200/chcore.c
+++ b/os/rt/ports/e200/chcore.c
@@ -60,9 +60,9 @@
  *          switch performance so optimize here as much as you can.

  */

 #if !defined(__DOXYGEN__)

-__attribute__((naked, required))

+__attribute__((naked))

 #endif

-static void port_dummy1(void) {

+void port_dummy1(void) {

 

   asm (".global _port_switch");

   asm ("_port_switch:");

@@ -91,9 +91,9 @@ static void port_dummy1(void) {
  *          invoked.

  */

 #if !defined(__DOXYGEN__)

-__attribute__((naked, required))

+__attribute__((naked))

 #endif

-static void port_dummy2(void) {

+void port_dummy2(void) {

 

   asm (".global _port_thread_start");

   asm ("_port_thread_start:");

diff --git a/os/rt/ports/e200/chcore.h b/os/rt/ports/e200/chcore.h
index 8ea8d0d4f..70bddf239 100644
--- a/os/rt/ports/e200/chcore.h
+++ b/os/rt/ports/e200/chcore.h
@@ -29,10 +29,6 @@
 #ifndef _CHCORE_H_

 #define _CHCORE_H_

 

-#if CH_DBG_ENABLE_STACK_CHECK

-#error "option CH_DBG_ENABLE_STACK_CHECK not supported by this port"

-#endif

-

 /*===========================================================================*/

 /* Module constants.                                                         */

 /*===========================================================================*/

@@ -360,6 +356,10 @@ struct context {
 /* External declarations.                                                    */

 /*===========================================================================*/

 

+/* The following code is not processed when the file is included from an

+   asm module.*/

+#if !defined(_FROM_ASM_)

+

 #ifdef __cplusplus

 extern "C" {

 #endif

@@ -369,6 +369,8 @@ extern "C" {
 }

 #endif

 

+#endif /* !defined(_FROM_ASM_) */

+

 /*===========================================================================*/

 /* Module inline functions.                                                  */

 /*===========================================================================*/

diff --git a/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk b/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk
index 192ee1773..0133e16f3 100644
--- a/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk
+++ b/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk
@@ -1,8 +1,9 @@
 # List of the ChibiOS/RT e200z4 SPC56ELxx port files.

-PORTSRC = #${CHIBIOS}/os/rt/ports/e200/chcore.c

+PORTSRC = ${CHIBIOS}/os/rt/ports/e200/chcore.c

           

 PORTASM = $(CHIBIOS)/os/common/ports/e200/devices/SPC56ELxx/boot.s \

           $(CHIBIOS)/os/common/ports/e200/compilers/GCC/vectors.s \

+          $(CHIBIOS)/os/common/ports/e200/compilers/GCC/ivor.s \

           $(CHIBIOS)/os/common/ports/e200/compilers/GCC/crt0.s

 

 PORTINC = ${CHIBIOS}/os/common/ports/e200/devices/SPC56ELxx \