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

3 files changed, 56 insertions, 39 deletions

diff --git a/os/common/ports/e200/compilers/CW/crt0.s b/os/common/ports/e200/compilers/CW/crt0.s
index cb5334df3..a0031d2e1 100644
--- a/os/common/ports/e200/compilers/CW/crt0.s
+++ b/os/common/ports/e200/compilers/CW/crt0.s
@@ -59,7 +59,7 @@
  * @brief   DATA segment initialization switch.

  */

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

-#define CRT0_INIT_DATA                      TRUE

+#define CRT0_INIT_DATA                      FALSE

 #endif

 

 /**

@@ -73,14 +73,14 @@
  * @brief   Constructors invocation switch.

  */

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

-#define CRT0_CALL_CONSTRUCTORS              TRUE

+#define CRT0_CALL_CONSTRUCTORS              FALSE

 #endif

 

 /**

  * @brief   Destructors invocation switch.

  */

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

-#define CRT0_CALL_DESTRUCTORS               TRUE

+#define CRT0_CALL_DESTRUCTORS               FALSE

 #endif

 

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

@@ -88,9 +88,25 @@
 /*===========================================================================*/

 

 #if !defined(__DOXYGEN__)

-

-        .section    .crt0, "ax"

-        .align		2

+        .extern     __sdata2_start__

+        .extern     __sdata_start__

+        .extern     __bss_start__

+        .extern     __bss_end__

+        .extern     __irq_stack_base__

+        .extern     __irq_stack_end__

+        .extern     __process_stack_end__

+        .extern     __process_stack_base__

+        .extern     __romdata_start__

+        .extern     __data_start__

+        .extern     __data_end__

+        .extern     __init_array_start

+        .extern     __init_array_end

+        .extern     __fini_array_start

+        .extern     __fini_array_end

+        .extern     main

+

+        .section    .crt0, 16

+        .align		4

         .globl      _boot_address

         .type       _boot_address, @function

 _boot_address:

@@ -116,7 +132,7 @@ _boot_address:
 

        /* IRQ Stack initialization. Note, the architecture does not use this

           stack, the size is usually zero. An OS can have special SW handling

-          and require this. A 4 bytes alignment is assmend and required.*/

+          and require this. A 4 bytes alignment is assumed and required.*/

         e_lis       r4, __irq_stack_base__@h

         e_or2i      r4, __irq_stack_base__@l

         e_lis       r5, __irq_stack_end__@h

@@ -130,7 +146,7 @@ _boot_address:
 .irqsend:

 

         /* Process Stack initialization. Note, does not overwrite the already

-           written EABI frame. A 4 bytes alignment is assmend and required.*/

+           written EABI frame. A 4 bytes alignment is assumed and required.*/

         e_lis       r4, __process_stack_base__@h

         e_or2i      r4, __process_stack_base__@l

         e_lis       r5, (__process_stack_end__ - 8)@h

diff --git a/os/common/ports/e200/compilers/CW/vectors.s b/os/common/ports/e200/compilers/CW/vectors.s
index aa07c9e82..7d0592f5b 100644
--- a/os/common/ports/e200/compilers/CW/vectors.s
+++ b/os/common/ports/e200/compilers/CW/vectors.s
@@ -38,8 +38,8 @@
            handler only. In order to declare an interrupt handler just create

            a function withe the same name of a vector, the symbol will

            override the weak symbol declared here.*/

-        .section    .vectors, "ax"

-        .align		4

+        .section    .vectors, 16

+        .align		16

         .globl      _vectors

 _vectors:

         .long       vector0,    vector1,    vector2,    vector3

@@ -800,8 +800,8 @@ _vectors:
         .long       vector1008, vector1009, vector1010, vector1011

 #endif

 

-        .text

-        .align      2

+/*        .section    .text, 16*/

+        .align      16

 

         .weak       vector0,    vector1,    vector2,    vector3

 #if PPC_NUM_VECTORS > 4

diff --git a/os/common/ports/e200/devices/SPC560Dxx/boot_cw.s b/os/common/ports/e200/devices/SPC560Dxx/boot_cw.s
index cd925877e..a5a8a69ec 100644
--- a/os/common/ports/e200/devices/SPC560Dxx/boot_cw.s
+++ b/os/common/ports/e200/devices/SPC560Dxx/boot_cw.s
@@ -29,13 +29,18 @@
 

 #if !defined(__DOXYGEN__)

 

+        .extern     _boot_address

+        .extern     __ram_start__

+        .extern     __ram_end__

+        .extern     __ivpr_base__

+

         /* BAM record.*/

-        .section    .boot, "ax"

+        .section    .boot, 16

 

         .long       0x015A0000

         .long       _reset_address

 

-        .align      2

+        .align      4

         .globl      _reset_address

         .type       _reset_address, @function

 _reset_address:

@@ -72,7 +77,7 @@ _reset_address:
 #endif

 

 #if BOOT_PERFORM_CORE_INIT

-        .align      2

+        .align      4

 _coreinit:

         /*

          * RAM clearing, this device requires a write to all RAM location in

@@ -135,7 +140,7 @@ _coreinit:
         /*

          * Exception vectors initialization.

          */

-        .align      2

+        .align      4

 _ivinit:

         /* MSR initialization.*/

         e_lis       r3, BOOT_MSR_DEFAULT@h

@@ -149,48 +154,42 @@ _ivinit:
 

         se_blr

 

-        .section    .ivors, "ax"

-

+        .section    .ivors, 16

         .globl      IVORS

 IVORS:

         e_b         _IVOR0

-        .align      4

+        .align      16

         e_b         _IVOR1

-        .align      4

+        .align      16

         e_b         _IVOR2

-        .align      4

+        .align      16

         e_b         _IVOR3

-        .align      4

+        .align      16

         e_b         _IVOR4

-        .align      4

+        .align      16

         e_b         _IVOR5

-        .align      4

+        .align      16

         e_b         _IVOR6

-        .align      4

+        .align      16

         e_b         _IVOR7

-        .align      4

+        .align      16

         e_b         _IVOR8

-        .align      4

+        .align      16

         e_b         _IVOR9

-        .align      4

+        .align      16

         e_b         _IVOR10

-        .align      4

+        .align      16

         e_b         _IVOR11

-        .align      4

+        .align      16

         e_b         _IVOR12

-        .align      4

+        .align      16

         e_b         _IVOR13

-        .align      4

+        .align      16

         e_b         _IVOR14

-        .align      4

+        .align      16

         e_b         _IVOR15

 

-        .section    .handlers, "ax"

-

-        /*

-         * Default IVOR handlers.

-         */

-        .align      2

+        .section    .handlers, 16

         .weak       _IVOR0,  _IVOR1,  _IVOR2,  _IVOR3,  _IVOR4,  _IVOR5

         .weak       _IVOR6,  _IVOR7,  _IVOR8,  _IVOR9,  _IVOR10, _IVOR11

         .weak       _IVOR12, _IVOR13, _IVOR14, _IVOR15

@@ -199,11 +198,13 @@ _IVOR0:
 _IVOR1:

 _IVOR2:

 _IVOR3:

+_IVOR4:

 _IVOR5:

 _IVOR6:

 _IVOR7:

 _IVOR8:

 _IVOR9:

+_IVOR10:

 _IVOR11:

 _IVOR12:

 _IVOR13: