From 208a3002e7832108a71978aa8a1afe712f5e7f17 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 22 Sep 2017 08:06:33 +0000 Subject: More GHS stuff. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10666 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/common/startup/e200/compilers/GHS/crt0.s | 8 +++----- os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk | 6 +++--- os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk | 6 +++--- os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk | 6 +++--- os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk | 6 +++--- os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk | 6 +++--- os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk | 6 +++--- os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk | 6 +++--- os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk | 6 +++--- os/common/startup/e200/compilers/GHS/vectors.s | 6 ++++-- 10 files changed, 31 insertions(+), 31 deletions(-) (limited to 'os/common/startup/e200/compilers/GHS') diff --git a/os/common/startup/e200/compilers/GHS/crt0.s b/os/common/startup/e200/compilers/GHS/crt0.s index 7c4b47bd4..cd549b98f 100644 --- a/os/common/startup/e200/compilers/GHS/crt0.s +++ b/os/common/startup/e200/compilers/GHS/crt0.s @@ -34,10 +34,6 @@ #define TRUE 1 #endif -#if defined(__HIGHTEC__) -#define se_bge bge -#endif - /*===========================================================================*/ /* Module pre-compile time settings. */ /*===========================================================================*/ @@ -90,7 +86,9 @@ #if !defined(__DOXYGEN__) - .section .crt0, "ax" + .vle + + .section .crt0, "axv" .align 2 .globl _boot_address .type _boot_address, @function diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk index c69c7b88f..e271c121e 100644 --- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk +++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bcxx.mk @@ -1,9 +1,9 @@ # List of the ChibiOS e200z0 SPC560BCxx startup files. STARTUPSRC = -STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC560BCxx/boot.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.S +STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC560BCxx/boot_ghs.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.s STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \ ${CHIBIOS}/os/common/startup/e200/devices/SPC560BCxx diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk index aba451bee..fc0d81d50 100644 --- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk +++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560bxx.mk @@ -1,9 +1,9 @@ # List of the ChibiOS e200z0 SPC560Bxx startup files. STARTUPSRC = -STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC560Bxx/boot.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.S +STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC560Bxx/boot_ghs.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.s STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \ ${CHIBIOS}/os/common/startup/e200/devices/SPC560Bxx diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk index 3824070a8..8b53117b2 100644 --- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk +++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560dxx.mk @@ -1,9 +1,9 @@ # List of the ChibiOS e200z0 SPC560Dxx startup files. STARTUPSRC = -STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC560Dxx/boot.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.S +STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC560Dxx/boot_ghs.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.s STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \ ${CHIBIOS}/os/common/startup/e200/devices/SPC560Dxx diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk index 4766491f7..93942cd3a 100644 --- a/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk +++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc560pxx.mk @@ -1,9 +1,9 @@ # List of the ChibiOS e200z0 SPC560Pxx startup files. STARTUPSRC = -STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC560Pxx/boot.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.S +STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC560Pxx/boot_ghs.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.s STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \ ${CHIBIOS}/os/common/startup/e200/devices/SPC560Pxx diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk index 83d12374a..7bf28e2d3 100644 --- a/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk +++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc563mxx.mk @@ -1,9 +1,9 @@ # List of the ChibiOS e200z3 SPC563Mxx startup files. STARTUPSRC = -STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC563Mxx/boot.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.S +STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC563Mxx/boot_ghs.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.s STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \ ${CHIBIOS}/os/common/startup/e200/devices/SPC563Mxx diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk index db968e0e9..6702f51a1 100644 --- a/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk +++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc564axx.mk @@ -1,9 +1,9 @@ # List of the ChibiOS e200z4 SPC564Axx startup files. STARTUPSRC = -STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC564Axx/boot.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.S +STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC564Axx/boot_ghs.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.s STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \ ${CHIBIOS}/os/common/startup/e200/devices/SPC564Axx diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk index 93cf96bfc..7a5b74b0e 100644 --- a/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk +++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc56ecxx.mk @@ -1,9 +1,9 @@ # List of the ChibiOS e200z4 SPC56ECxx startup files. STARTUPSRC = -STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC56ECxx/boot.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.S +STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC56ECxx/boot_ghs.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.s STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \ ${CHIBIOS}/os/common/startup/e200/devices/SPC56ECxx diff --git a/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk b/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk index 80603c948..775eb6398 100644 --- a/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk +++ b/os/common/startup/e200/compilers/GHS/mk/startup_spc56elxx.mk @@ -1,9 +1,9 @@ # List of the ChibiOS e200z4 SPC56ELxx startup files. STARTUPSRC = -STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC56ELxx/boot.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.S \ - $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.S +STARTUPASM = $(CHIBIOS)/os/common/startup/e200/devices/SPC56ELxx/boot_ghs.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/vectors.s \ + $(CHIBIOS)/os/common/startup/e200/compilers/GHS/crt0.s STARTUPINC = ${CHIBIOS}/os/common/startup/e200/compilers/GHS \ ${CHIBIOS}/os/common/startup/e200/devices/SPC56ELxx diff --git a/os/common/startup/e200/compilers/GHS/vectors.s b/os/common/startup/e200/compilers/GHS/vectors.s index 251d1e935..ba39a0230 100644 --- a/os/common/startup/e200/compilers/GHS/vectors.s +++ b/os/common/startup/e200/compilers/GHS/vectors.s @@ -31,11 +31,13 @@ #if !defined(__DOXYGEN__) + .vle + /* Software vectors table. The vectors are accessed from the IVOR4 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" + .section .vectors, "axv" .align 4 .globl _vectors _vectors: @@ -806,7 +808,7 @@ _vectors: .long vector1020, vector1021, vector1022, vector1023 #endif - .text + .section .vletext, "axv" .align 2 .weak vector0, vector1, vector2, vector3 -- cgit v1.2.3