ArmPlatformPkg/ArmVExpressPkg: switch to ASM_FUNC() asm macro

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / Library / ArmVExpressLibCTA15-A7 / CTA15-A7Helper.S

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
index 20bfe52610e3383205dce88569914ed0a0322569..3719a5ace6040c65f07e4fe4fd12a8a5c4087359 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.S
@@ -16,22 +16,14 @@
 \r
 #include <ArmPlatform.h>\r
 \r
-.text\r
-.align 2\r
-\r
-GCC_ASM_EXPORT(ArmPlatformPeiBootAction)\r
-GCC_ASM_EXPORT(ArmPlatformGetCorePosition)\r
-GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)\r
-GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)\r
-\r
-ASM_PFX(ArmPlatformPeiBootAction):\r
+ASM_FUNC(ArmPlatformPeiBootAction)\r
   bx    lr\r
 \r
 //UINTN\r
 //ArmPlatformGetCorePosition (\r
 //  IN UINTN MpId\r
 //  );\r
-ASM_PFX(ArmPlatformGetCorePosition):\r
+ASM_FUNC(ArmPlatformGetCorePosition)\r
   and   r1, r0, #ARM_CORE_MASK\r
   and   r0, r0, #ARM_CLUSTER_MASK\r
   add   r0, r1, r0, LSR #7\r
@@ -41,10 +33,10 @@ ASM_PFX(ArmPlatformGetCorePosition):
 //ArmPlatformIsPrimaryCore (\r
 //  IN UINTN MpId\r
 //  );\r
-ASM_PFX(ArmPlatformIsPrimaryCore):\r
+ASM_FUNC(ArmPlatformIsPrimaryCore)\r
   // Extract cpu_id and cluster_id from ARM_SCC_CFGREG48\r
   // with cpu_id[0:3] and cluster_id[4:7]\r
-  LoadConstantToReg (ARM_CTA15A7_SCC_CFGREG48, r1)\r
+  MOV32 (r1, ARM_CTA15A7_SCC_CFGREG48)\r
   ldr   r1, [r1]\r
   lsr   r1, #24\r
 \r
@@ -58,7 +50,7 @@ ASM_PFX(ArmPlatformIsPrimaryCore):
   orr   r1, r1, r2\r
 \r
   // Keep the Cluster ID and Core ID from the MPID\r
-  LoadConstantToReg (ARM_CLUSTER_MASK | ARM_CORE_MASK, r2)\r
+  MOV32 (r2, ARM_CLUSTER_MASK | ARM_CORE_MASK)\r
   and   r0, r0, r2\r
 \r
   // Compare mpid and boot cpu from ARM_SCC_CFGREG48\r
@@ -71,10 +63,10 @@ ASM_PFX(ArmPlatformIsPrimaryCore):
 //ArmPlatformGetPrimaryCoreMpId (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmPlatformGetPrimaryCoreMpId):\r
+ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)\r
   // Extract cpu_id and cluster_id from ARM_SCC_CFGREG48\r
   // with cpu_id[0:3] and cluster_id[4:7]\r
-  LoadConstantToReg (ARM_CTA15A7_SCC_CFGREG48, r0)\r
+  MOV32 (r0, ARM_CTA15A7_SCC_CFGREG48)\r
   ldr   r0, [r0]\r
   lsr   r0, #24\r
 \r