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

2 files changed, 18 insertions, 249 deletions

diff --git a/os/common/ports/e200/compilers/GCC/ivor.s b/os/common/ports/e200/compilers/GCC/ivor.s
deleted file mode 100644
index 6d24c0b30..000000000
--- a/os/common/ports/e200/compilers/GCC/ivor.s
+++ /dev/null
@@ -1,249 +0,0 @@
-/*

-    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:

-        /* Saving the external context (port_extctx structure).*/

-        stwu        %sp, -80(%sp)

-#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) */

-

-        /* Increasing the SPGR0 register.*/

-        mfspr       %r0, 272

-        eaddi       %r0, %r0, 1

-        mtspr       272, %r0

-

-        /* 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:

-        /* Saving the external context (port_extctx structure).*/

-        stwu        %sp, -80(%sp)

-#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) */

-

-        /* Increasing the SPGR0 register.*/

-        mfspr       %r0, 272

-        eaddi       %r0, %r0, 1

-        mtspr       272, %r0

-

-        /* 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

-

-        /* Decreasing the SPGR0 register.*/

-        mfspr       %r0, 272

-        eaddi       %r0, %r0, -1

-        mtspr       272, %r0

-

-        /* Restoring the external context.*/

-#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/common/ports/e200/compilers/GCC/vectors.h b/os/common/ports/e200/compilers/GCC/vectors.h
index ce175e652..60241864e 100644
--- a/os/common/ports/e200/compilers/GCC/vectors.h
+++ b/os/common/ports/e200/compilers/GCC/vectors.h
@@ -35,10 +35,16 @@
 /* Module constants.                                                         */

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

 

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

+   asm module.*/

+#if !defined(_FROM_ASM_)

+

 #define INTC_MCR        *((volatile uint32_t *)0xfff48000)

 #define INTC_CPR        *((volatile uint32_t *)0xfff48008)

 #define INTC_IACKR      *((volatile uint32_t *)0xfff48010)

 

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

+

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

 /* Module pre-compile time settings.                                         */

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

@@ -59,6 +65,10 @@
 /* External declarations.                                                    */

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

 

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

+   asm module.*/

+#if !defined(_FROM_ASM_)

+

 #if !defined(__DOXYGEN__)

 extern uint32_t _vectors[PPC_NUM_VECTORS];

 #endif

@@ -71,10 +81,16 @@ extern "C" {
 }

 #endif

 

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

+

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

 /* Module inline functions.                                                  */

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

 

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

+   asm module.*/

+#if !defined(_FROM_ASM_)

+

 static inline void intc_init(void) {

 

   INTC_MCR   = 0;

@@ -82,6 +98,8 @@ static inline void intc_init(void) {
   INTC_IACKR = (uint32_t)_vectors;

 }

 

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

+

 #endif /* _VECTORS_H_ */

 

 /** @} */