Merge pull request #2624 from jesven/lwp_swi_arm-a

修改lwp支持中arm cortex-a的swi入口函数处理
2019-04-27 14:48:33 +08:00 · 2019-04-27 14:48:33 +08:00 · c0a400ccbe
parent 8684f1662b 1e7bd3d8a1
commit c0a400ccbe
3 changed files with 8 additions and 10 deletions
--- a/components/lwp/arch/arm/cortex-a/lwp_gcc.S
+++ b/components/lwp/arch/arm/cortex-a/lwp_gcc.S
@ -45,9 +45,9 @@ lwp_user_entry:
 /*
 * void SVC_Handler(void);
 */
-.global SVC_Handler
-.type SVC_Handler, % function
-SVC_Handler:
+.global vector_swi
+.type vector_swi, % function
+vector_swi:
    push {lr}
    mrs lr, spsr
    push {r4, r5, lr}
--- a/components/lwp/arch/arm/cortex-a9/lwp_gcc.S
+++ b/components/lwp/arch/arm/cortex-a9/lwp_gcc.S
@ -43,11 +43,11 @@ lwp_user_entry:
    movs    pc, r1

 /*
- * void SVC_Handler(void);
+ * void vector_swi(void);
 */
-.global SVC_Handler
-.type SVC_Handler, % function
-SVC_Handler:
+.global vector_swi
+.type vector_swi, % function
+vector_swi:
    push {lr}
    mrs lr, spsr
    push {r4, r5, lr}
--- a/libcpu/arm/cortex-a/start_gcc.S
+++ b/libcpu/arm/cortex-a/start_gcc.S
@ -241,9 +241,7 @@ rt_hw_context_switch_interrupt_do:
 .endm

    .align  5
-    .globl  vector_swi
-.weak SVC_Handler
-SVC_Handler:
+.weak vector_swi
 vector_swi:
    push_svc_reg
    bl      rt_hw_trap_swi