Browse Source

Merge pull request #2624 from jesven/lwp_swi_arm-a

修改lwp支持中arm cortex-a的swi入口函数处理
Bernard Xiong 6 years ago
parent
commit
c0a400ccbe

+ 3 - 3
components/lwp/arch/arm/cortex-a/lwp_gcc.S

@@ -45,9 +45,9 @@ lwp_user_entry:
 /*
 /*
  * void SVC_Handler(void);
  * void SVC_Handler(void);
  */
  */
-.global SVC_Handler
-.type SVC_Handler, % function
-SVC_Handler:
+.global vector_swi
+.type vector_swi, % function
+vector_swi:
     push {lr}
     push {lr}
     mrs lr, spsr
     mrs lr, spsr
     push {r4, r5, lr}
     push {r4, r5, lr}

+ 4 - 4
components/lwp/arch/arm/cortex-a9/lwp_gcc.S

@@ -43,11 +43,11 @@ lwp_user_entry:
     movs    pc, r1
     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}
     push {lr}
     mrs lr, spsr
     mrs lr, spsr
     push {r4, r5, lr}
     push {r4, r5, lr}

+ 1 - 3
libcpu/arm/cortex-a/start_gcc.S

@@ -241,9 +241,7 @@ rt_hw_context_switch_interrupt_do:
 .endm
 .endm
 
 
     .align  5
     .align  5
-    .globl  vector_swi
-.weak SVC_Handler
-SVC_Handler:
+.weak vector_swi
 vector_swi:
 vector_swi:
     push_svc_reg
     push_svc_reg
     bl      rt_hw_trap_swi
     bl      rt_hw_trap_swi