improve armclang

9 files changed, 499 insertions, 2 deletions

diff --git a/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/ARMCM3_ac5.sct b/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/ARMCM3_ac5.sct
new file mode 100644
index 000000000..91666461d
--- /dev/null
+++ b/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/ARMCM3_ac5.sct
@@ -0,0 +1,76 @@
+#! armcc -E

+; command above MUST be in first line (no comment above!)

+

+/*

+;-------- <<< Use Configuration Wizard in Context Menu >>> -------------------

+*/

+

+/*--------------------- Flash Configuration ----------------------------------

+; <h> Flash Configuration

+;   <o0> Flash Base Address <0x0-0xFFFFFFFF:8>

+;   <o1> Flash Size (in Bytes) <0x0-0xFFFFFFFF:8>

+; </h>

+ *----------------------------------------------------------------------------*/

+#define __ROM_BASE      0x00000000

+#define __ROM_SIZE      0x00080000

+

+/*--------------------- Embedded RAM Configuration ---------------------------

+; <h> RAM Configuration

+;   <o0> RAM Base Address    <0x0-0xFFFFFFFF:8>

+;   <o1> RAM Size (in Bytes) <0x0-0xFFFFFFFF:8>

+; </h>

+ *----------------------------------------------------------------------------*/

+#define __RAM_BASE      0x20000000

+#define __RAM_SIZE      0x00040000

+

+/*--------------------- Stack / Heap Configuration ---------------------------

+; <h> Stack / Heap Configuration

+;   <o0> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>

+;   <o1> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>

+; </h>

+ *----------------------------------------------------------------------------*/

+#define __STACK_SIZE    0x00000200

+#define __HEAP_SIZE     0x00000C00

+

+/*

+;------------- <<< end of configuration section >>> ---------------------------

+*/

+

+

+/*----------------------------------------------------------------------------

+  User Stack & Heap boundary definition

+ *----------------------------------------------------------------------------*/

+#define __STACK_TOP    (__RAM_BASE + __RAM_SIZE)    /* starts at end of RAM */

+#define __HEAP_BASE    (AlignExpr(+0, 8))           /* starts after RW_RAM section, 8 byte aligned */

+

+

+/*----------------------------------------------------------------------------

+  Scatter File Definitions definition

+ *----------------------------------------------------------------------------*/

+#define __RO_BASE       __ROM_BASE

+#define __RO_SIZE       __ROM_SIZE

+

+#define __RW_BASE       __RAM_BASE

+#define __RW_SIZE      (__RAM_SIZE - __STACK_SIZE - __HEAP_SIZE)

+

+

+LR_ROM __RO_BASE __RO_SIZE  {                       ; load region size_region

+  ER_ROM __RO_BASE __RO_SIZE  {                     ; load address = execution address

+   *.o (RESET, +First)

+   *(InRoot$$Sections)

+   .ANY (+RO)

+   .ANY (+XO)

+  }

+

+  RW_RAM __RW_BASE __RW_SIZE  {                     ; RW data

+   .ANY (+RW +ZI)

+  }

+

+#if __HEAP_SIZE > 0

+  ARM_LIB_HEAP  __HEAP_BASE EMPTY  __HEAP_SIZE  {   ; Reserve empty region for heap

+  }

+#endif

+

+  ARM_LIB_STACK __STACK_TOP EMPTY -__STACK_SIZE {   ; Reserve empty region for stack

+  }

+}

diff --git a/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/startup_ARMCM3.c b/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/startup_ARMCM3.c
new file mode 100644
index 000000000..da67c87c9
--- /dev/null
+++ b/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/startup_ARMCM3.c
@@ -0,0 +1,150 @@
+/******************************************************************************

+ * @file     startup_ARMCM3.c

+ * @brief    CMSIS-Core(M) Device Startup File for a Cortex-M3 Device

+ * @version  V2.0.3

+ * @date     31. March 2020

+ ******************************************************************************/

+/*

+ * Copyright (c) 2009-2020 Arm Limited. All rights reserved.

+ *

+ * SPDX-License-Identifier: Apache-2.0

+ *

+ * Licensed under the Apache License, Version 2.0 (the License); you may

+ * not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ * www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT

+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+

+#if defined (ARMCM3)

+  #include "ARMCM3.h"

+#else

+  #error device not specified!

+#endif

+

+/*----------------------------------------------------------------------------

+  External References

+ *----------------------------------------------------------------------------*/

+extern uint32_t __INITIAL_SP;

+

+extern __NO_RETURN void __PROGRAM_START(void);

+

+/*----------------------------------------------------------------------------

+  Internal References

+ *----------------------------------------------------------------------------*/

+__NO_RETURN void Reset_Handler  (void);

+            void Default_Handler(void);

+

+/*----------------------------------------------------------------------------

+  Exception / Interrupt Handler

+ *----------------------------------------------------------------------------*/

+/* Exceptions */

+void NMI_Handler            (void) __attribute__ ((weak, alias("Default_Handler")));

+void HardFault_Handler      (void) __attribute__ ((weak));

+void MemManage_Handler      (void) __attribute__ ((weak, alias("Default_Handler")));

+void BusFault_Handler       (void) __attribute__ ((weak, alias("Default_Handler")));

+void UsageFault_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void SVC_Handler            (void) __attribute__ ((weak, alias("Default_Handler")));

+void DebugMon_Handler       (void) __attribute__ ((weak, alias("Default_Handler")));

+void PendSV_Handler         (void) __attribute__ ((weak, alias("Default_Handler")));

+void SysTick_Handler        (void) __attribute__ ((weak, alias("Default_Handler")));

+

+void Interrupt0_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void Interrupt1_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void Interrupt2_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void Interrupt3_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void Interrupt4_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void Interrupt5_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void Interrupt6_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void Interrupt7_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void Interrupt8_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+void Interrupt9_Handler     (void) __attribute__ ((weak, alias("Default_Handler")));

+

+

+/*----------------------------------------------------------------------------

+  Exception / Interrupt Vector table

+ *----------------------------------------------------------------------------*/

+

+#if defined ( __GNUC__ )

+#pragma GCC diagnostic push

+#pragma GCC diagnostic ignored "-Wpedantic"

+#endif

+

+extern const VECTOR_TABLE_Type __VECTOR_TABLE[240];

+       const VECTOR_TABLE_Type __VECTOR_TABLE[240] __VECTOR_TABLE_ATTRIBUTE = {

+  (VECTOR_TABLE_Type)(&__INITIAL_SP),       /*     Initial Stack Pointer */

+  Reset_Handler,                            /*     Reset Handler */

+  NMI_Handler,                              /* -14 NMI Handler */

+  HardFault_Handler,                        /* -13 Hard Fault Handler */

+  MemManage_Handler,                        /* -12 MPU Fault Handler */

+  BusFault_Handler,                         /* -11 Bus Fault Handler */

+  UsageFault_Handler,                       /* -10 Usage Fault Handler */

+  0,                                        /*     Reserved */

+  0,                                        /*     Reserved */

+  0,                                        /*     Reserved */

+  0,                                        /*     Reserved */

+  SVC_Handler,                              /*  -5 SVCall Handler */

+  DebugMon_Handler,                         /*  -4 Debug Monitor Handler */

+  0,                                        /*     Reserved */

+  PendSV_Handler,                           /*  -2 PendSV Handler */

+  SysTick_Handler,                          /*  -1 SysTick Handler */

+

+  /* Interrupts */

+  Interrupt0_Handler,                       /*   0 Interrupt 0 */

+  Interrupt1_Handler,                       /*   1 Interrupt 1 */

+  Interrupt2_Handler,                       /*   2 Interrupt 2 */

+  Interrupt3_Handler,                       /*   3 Interrupt 3 */

+  Interrupt4_Handler,                       /*   4 Interrupt 4 */

+  Interrupt5_Handler,                       /*   5 Interrupt 5 */

+  Interrupt6_Handler,                       /*   6 Interrupt 6 */

+  Interrupt7_Handler,                       /*   7 Interrupt 7 */

+  Interrupt8_Handler,                       /*   8 Interrupt 8 */

+  Interrupt9_Handler                        /*   9 Interrupt 9 */

+                                            /* Interrupts 10 .. 223 are left out */

+};

+

+#if defined ( __GNUC__ )

+#pragma GCC diagnostic pop

+#endif

+

+/*----------------------------------------------------------------------------

+  Reset Handler called on controller reset

+ *----------------------------------------------------------------------------*/

+__NO_RETURN void Reset_Handler(void)

+{

+  SystemInit();                             /* CMSIS System Initialization */

+  __PROGRAM_START();                        /* Enter PreMain (C library entry point) */

+}

+

+

+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)

+  #pragma clang diagnostic push

+  #pragma clang diagnostic ignored "-Wmissing-noreturn"

+#endif

+

+/*----------------------------------------------------------------------------

+  Hard Fault Handler

+ *----------------------------------------------------------------------------*/

+void HardFault_Handler(void)

+{

+  while(1);

+}

+

+/*----------------------------------------------------------------------------

+  Default Handler for Exceptions / Interrupts

+ *----------------------------------------------------------------------------*/

+void Default_Handler(void)

+{

+  while(1);

+}

+

+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)

+  #pragma clang diagnostic pop

+#endif

+

diff --git a/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/startup_ARMCM3.s b/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/startup_ARMCM3.s
new file mode 100644
index 000000000..efe40c1e3
--- /dev/null
+++ b/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/startup_ARMCM3.s
@@ -0,0 +1,172 @@
+;/**************************************************************************//**

+; * @file     startup_ARMCM3.s

+; * @brief    CMSIS Core Device Startup File for

+; *           ARMCM3 Device

+; * @version  V1.0.1

+; * @date     23. July 2019

+; ******************************************************************************/

+;/*

+; * Copyright (c) 2009-2019 Arm Limited. All rights reserved.

+; *

+; * SPDX-License-Identifier: Apache-2.0

+; *

+; * Licensed under the Apache License, Version 2.0 (the License); you may

+; * not use this file except in compliance with the License.

+; * You may obtain a copy of the License at

+; *

+; * www.apache.org/licenses/LICENSE-2.0

+; *

+; * Unless required by applicable law or agreed to in writing, software

+; * distributed under the License is distributed on an AS IS BASIS, WITHOUT

+; * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+; * See the License for the specific language governing permissions and

+; * limitations under the License.

+; */

+

+;//-------- <<< Use Configuration Wizard in Context Menu >>> ------------------

+

+

+;<h> Stack Configuration

+;  <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>

+;</h>

+

+Stack_Size      EQU      0x00000400

+

+                AREA     STACK, NOINIT, READWRITE, ALIGN=3

+__stack_limit

+Stack_Mem       SPACE    Stack_Size

+__initial_sp

+

+

+;<h> Heap Configuration

+;  <o> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>

+;</h>

+

+Heap_Size       EQU      0x00000C00

+

+                IF       Heap_Size != 0                      ; Heap is provided

+                AREA     HEAP, NOINIT, READWRITE, ALIGN=3

+__heap_base

+Heap_Mem        SPACE    Heap_Size

+__heap_limit

+                ENDIF

+

+

+                PRESERVE8

+                THUMB

+

+

+; Vector Table Mapped to Address 0 at Reset

+

+                AREA     RESET, DATA, READONLY

+                EXPORT   __Vectors

+                EXPORT   __Vectors_End

+                EXPORT   __Vectors_Size

+

+__Vectors       DCD      __initial_sp                        ;     Top of Stack

+                DCD      Reset_Handler                       ;     Reset Handler

+                DCD      NMI_Handler                         ; -14 NMI Handler

+                DCD      HardFault_Handler                   ; -13 Hard Fault Handler

+                DCD      MemManage_Handler                   ; -12 MPU Fault Handler

+                DCD      BusFault_Handler                    ; -11 Bus Fault Handler

+                DCD      UsageFault_Handler                  ; -10 Usage Fault Handler

+                DCD      0                                   ;     Reserved

+                DCD      0                                   ;     Reserved

+                DCD      0                                   ;     Reserved

+                DCD      0                                   ;     Reserved

+                DCD      SVC_Handler                         ;  -5 SVCall Handler

+                DCD      DebugMon_Handler                    ;  -4 Debug Monitor Handler

+                DCD      0                                   ;     Reserved

+                DCD      PendSV_Handler                      ;  -2 PendSV Handler

+                DCD      SysTick_Handler                     ;  -1 SysTick Handler

+

+                ; Interrupts

+                DCD      Interrupt0_Handler                  ;   0 Interrupt 0

+                DCD      Interrupt1_Handler                  ;   1 Interrupt 1

+                DCD      Interrupt2_Handler                  ;   2 Interrupt 2

+                DCD      Interrupt3_Handler                  ;   3 Interrupt 3

+                DCD      Interrupt4_Handler                  ;   4 Interrupt 4

+                DCD      Interrupt5_Handler                  ;   5 Interrupt 5

+                DCD      Interrupt6_Handler                  ;   6 Interrupt 6

+                DCD      Interrupt7_Handler                  ;   7 Interrupt 7

+                DCD      Interrupt8_Handler                  ;   8 Interrupt 8

+                DCD      Interrupt9_Handler                  ;   9 Interrupt 9

+

+                SPACE    (214 * 4)                           ; Interrupts 10 .. 224 are left out

+__Vectors_End

+__Vectors_Size  EQU      __Vectors_End - __Vectors

+

+

+                AREA     |.text|, CODE, READONLY

+

+; Reset Handler

+

+Reset_Handler   PROC

+                EXPORT   Reset_Handler             [WEAK]

+                IMPORT   SystemInit

+                IMPORT   __main

+

+                LDR      R0, =SystemInit

+                BLX      R0

+                LDR      R0, =__main

+                BX       R0

+                ENDP

+

+; The default macro is not used for HardFault_Handler

+; because this results in a poor debug illusion.

+HardFault_Handler PROC

+                EXPORT   HardFault_Handler         [WEAK]

+                B        .

+                ENDP

+

+; Macro to define default exception/interrupt handlers.

+; Default handler are weak symbols with an endless loop.

+; They can be overwritten by real handlers.

+                MACRO

+                Set_Default_Handler  $Handler_Name

+$Handler_Name   PROC

+                EXPORT   $Handler_Name             [WEAK]

+                B        .

+                ENDP

+                MEND

+

+

+; Default exception/interrupt handler

+

+                Set_Default_Handler  NMI_Handler

+                Set_Default_Handler  MemManage_Handler

+                Set_Default_Handler  BusFault_Handler

+                Set_Default_Handler  UsageFault_Handler

+                Set_Default_Handler  SVC_Handler

+                Set_Default_Handler  DebugMon_Handler

+                Set_Default_Handler  PendSV_Handler

+                Set_Default_Handler  SysTick_Handler

+

+                Set_Default_Handler  Interrupt0_Handler

+                Set_Default_Handler  Interrupt1_Handler

+                Set_Default_Handler  Interrupt2_Handler

+                Set_Default_Handler  Interrupt3_Handler

+                Set_Default_Handler  Interrupt4_Handler

+                Set_Default_Handler  Interrupt5_Handler

+                Set_Default_Handler  Interrupt6_Handler

+                Set_Default_Handler  Interrupt7_Handler

+                Set_Default_Handler  Interrupt8_Handler

+                Set_Default_Handler  Interrupt9_Handler

+

+                ALIGN

+

+

+; User setup Stack & Heap

+

+                IF       :LNOT::DEF:__MICROLIB

+                IMPORT   __use_two_region_memory

+                ENDIF

+

+                EXPORT   __stack_limit

+                EXPORT   __initial_sp

+                IF       Heap_Size != 0                      ; Heap is provided

+                EXPORT   __heap_base

+                EXPORT   __heap_limit

+                ENDIF

+

+                END

diff --git a/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/system_ARMCM3.c b/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/system_ARMCM3.c
new file mode 100644
index 000000000..19484537f
--- /dev/null
+++ b/tests/projects/mdk/hello/src/RTE/Device/ARMCM3/system_ARMCM3.c
@@ -0,0 +1,65 @@
+/**************************************************************************//**

+ * @file     system_ARMCM3.c

+ * @brief    CMSIS Device System Source File for

+ *           ARMCM3 Device

+ * @version  V1.0.1

+ * @date     15. November 2019

+ ******************************************************************************/

+/*

+ * Copyright (c) 2009-2019 Arm Limited. All rights reserved.

+ *

+ * SPDX-License-Identifier: Apache-2.0

+ *

+ * Licensed under the Apache License, Version 2.0 (the License); you may

+ * not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ * www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT

+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+

+#include "ARMCM3.h"

+

+/*----------------------------------------------------------------------------

+  Define clocks

+ *----------------------------------------------------------------------------*/

+#define  XTAL            (50000000UL)     /* Oscillator frequency */

+

+#define  SYSTEM_CLOCK    (XTAL / 2U)

+

+/*----------------------------------------------------------------------------

+  Exception / Interrupt Vector table

+ *----------------------------------------------------------------------------*/

+extern const VECTOR_TABLE_Type __VECTOR_TABLE[240];

+

+/*----------------------------------------------------------------------------

+  System Core Clock Variable

+ *----------------------------------------------------------------------------*/

+uint32_t SystemCoreClock = SYSTEM_CLOCK;  /* System Core Clock Frequency */

+

+

+/*----------------------------------------------------------------------------

+  System Core Clock update function

+ *----------------------------------------------------------------------------*/

+void SystemCoreClockUpdate (void)

+{

+  SystemCoreClock = SYSTEM_CLOCK;

+}

+

+/*----------------------------------------------------------------------------

+  System initialization function

+ *----------------------------------------------------------------------------*/

+void SystemInit (void)

+{

+

+#if defined (__VTOR_PRESENT) && (__VTOR_PRESENT == 1U)

+  SCB->VTOR = (uint32_t) &(__VECTOR_TABLE[0]);

+#endif

+

+  SystemCoreClock = SYSTEM_CLOCK;

+}

diff --git a/tests/projects/mdk/hello/src/hello.c b/tests/projects/mdk/hello/src/hello.c
new file mode 100644
index 000000000..a6e46accc
--- /dev/null
+++ b/tests/projects/mdk/hello/src/hello.c
@@ -0,0 +1,4 @@
+int main()

+{

+	return 0;

+}

diff --git a/tests/projects/mdk/hello/xmake.lua b/tests/projects/mdk/hello/xmake.lua
new file mode 100644
index 000000000..faa68cf5f
--- /dev/null
+++ b/tests/projects/mdk/hello/xmake.lua
@@ -0,0 +1,6 @@
+add_rules("mode.debug", "mode.release")
+target("hello")
+    set_kind("binary")
+    set_extension(".axf")
+    add_files("src/**.c", "src/**.s")
+
diff --git a/xmake/modules/detect/tools/armclang/has_flags.lua b/xmake/modules/detect/tools/armclang/has_flags.lua
new file mode 100644
index 000000000..6464e10b6
--- /dev/null
+++ b/xmake/modules/detect/tools/armclang/has_flags.lua
@@ -0,0 +1,23 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        has_flags.lua
+--
+
+-- imports
+inherit("detect.tools.gcc.has_flags")
+
diff --git a/xmake/toolchains/armcc/xmake.lua b/xmake/toolchains/armcc/xmake.lua
index 1ba3a15eb..95f1d0528 100644
--- a/xmake/toolchains/armcc/xmake.lua
+++ b/xmake/toolchains/armcc/xmake.lua
@@ -28,7 +28,6 @@ toolchain("armcc")
     set_toolset("cc", "armcc")
     set_toolset("cxx", "armcc")
     set_toolset("ld", "armlink")
-    set_toolset("sh", "armlink")
     set_toolset("ar", "armar")
     set_toolset("ex", "armar")
     set_toolset("as", "armasm")
diff --git a/xmake/toolchains/armclang/xmake.lua b/xmake/toolchains/armclang/xmake.lua
index 5461d2f3d..20ee896fc 100644
--- a/xmake/toolchains/armclang/xmake.lua
+++ b/xmake/toolchains/armclang/xmake.lua
@@ -28,7 +28,6 @@ toolchain("armclang")
     set_toolset("cc", "armclang")
     set_toolset("cxx", "armclang")
     set_toolset("ld", "armlink")
-    set_toolset("sh", "armlink")
     set_toolset("ar", "armar")
     set_toolset("ex", "armar")
     set_toolset("as", "armasm")
@@ -38,4 +37,7 @@ toolchain("armclang")
     end)
 
     on_load(function (toolchain)
+        toolchain:add("cxflags", "--target=aarch64-arm-none-eabi")
+        toolchain:add("asflags", "--target=aarch64-arm-none-eabi")
+        toolchain:add("ldflags", "--target=aarch64-arm-none-eabi")
     end)