ArmPlatformPkg/ArmJunoLib: switch to ASM_FUNC() asm macro

Annotate functions with ASM_FUNC() so that they are emitted into
separate sections.

While we're at it, replace some inefficient uses of LoadConstantToReg()

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPlatformPkg/ArmJunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S b/ArmPlatformPkg/ArmJunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S
index 73b249ca5ffd0c08a415f647279be60a8373c584..4bdf08d1a98a802a3270f5a7f1d114971d4c3baf 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S
+++ b/ArmPlatformPkg/ArmJunoPkg/Library/ArmJunoLib/AArch64/ArmJunoHelper.S
@@ -15,25 +15,12 @@
 #include <AsmMacroIoLibV8.h>\r
 #include <Library/ArmLib.h>\r
 \r
-.text\r
-.align 3\r
-\r
-GCC_ASM_EXPORT(ArmPlatformPeiBootAction)\r
-GCC_ASM_EXPORT(ArmPlatformGetCorePosition)\r
-GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)\r
-GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)\r
-\r
-GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)\r
-\r
-\r
-PrimaryCoreMpid:  .word    0x0\r
-\r
 //UINTN\r
 //ArmPlatformGetCorePosition (\r
 //  IN UINTN MpId\r
 //  );\r
 // With this function: CorePos = (ClusterId * 2) + CoreId\r
-ASM_PFX(ArmPlatformGetCorePosition):\r
+ASM_FUNC(ArmPlatformGetCorePosition)\r
   and   x1, x0, #ARM_CORE_MASK\r
   and   x0, x0, #ARM_CLUSTER_MASK\r
   add   x0, x1, x0, LSR #7\r
@@ -43,33 +30,29 @@ ASM_PFX(ArmPlatformGetCorePosition):
 //ArmPlatformGetPrimaryCoreMpId (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmPlatformGetPrimaryCoreMpId):\r
-  ldr   x0, =PrimaryCoreMpid\r
-  ldrh  w0, [x0]\r
+ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)\r
+  ldr   w0, PrimaryCoreMpid\r
   ret\r
 \r
 //UINTN\r
 //ArmPlatformIsPrimaryCore (\r
 //  IN UINTN MpId\r
 //  );\r
-ASM_PFX(ArmPlatformIsPrimaryCore):\r
-  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, x1)\r
-  ldrh  w1, [x1]\r
+ASM_FUNC(ArmPlatformIsPrimaryCore)\r
+  MOV32 (w1, FixedPcdGet32 (PcdArmPrimaryCoreMask))\r
   and   x0, x0, x1\r
 \r
-  ldr   x1, =PrimaryCoreMpid\r
-  ldrh  w1, [x1]\r
+  ldr   w1, PrimaryCoreMpid\r
 \r
   cmp   w0, w1\r
-  mov   x0, #1\r
-  mov   x1, #0\r
-  csel  x0, x0, x1, eq\r
+  cset  x0, eq\r
   ret\r
 \r
-ASM_PFX(ArmPlatformPeiBootAction):\r
+ASM_FUNC(ArmPlatformPeiBootAction)\r
   // The trusted firmware passes the primary CPU MPID through x0 register.\r
   // Save it in a variable.\r
-  ldr  x1, =PrimaryCoreMpid\r
+  adr  x1, PrimaryCoreMpid\r
   str  w0, [x1]\r
   ret\r
 \r
+PrimaryCoreMpid:  .word    0x0\r

diff --git a/ArmPlatformPkg/ArmJunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S b/ArmPlatformPkg/ArmJunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S
index 2efb5451b88b883ea63c067fbc9a0de4bf429a08..a7e904eac697193e576511439c91e99d6f0378f4 100644 (file)
--- a/ArmPlatformPkg/ArmJunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S
+++ b/ArmPlatformPkg/ArmJunoPkg/Library/ArmJunoLib/Arm/ArmJunoHelper.S
@@ -12,22 +12,9 @@
 *\r
 **/\r
 \r
-#include <AsmMacroIoLibV8.h>\r
+#include <AsmMacroIoLib.h>\r
 #include <Library/ArmLib.h>\r
 \r
-.text\r
-.align 3\r
-\r
-GCC_ASM_EXPORT(ArmPlatformPeiBootAction)\r
-GCC_ASM_EXPORT(ArmPlatformGetCorePosition)\r
-GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)\r
-GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)\r
-\r
-GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)\r
-\r
-\r
-PrimaryCoreMpid:  .word    0x0\r
-\r
 //\r
 // Return the core position from the value of its MpId register\r
 //\r
@@ -41,7 +28,7 @@ PrimaryCoreMpid:  .word    0x0
 //  IN UINTN MpId\r
 //  );\r
 // With this function: CorePos = (ClusterId * 2) + CoreId\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
@@ -59,9 +46,8 @@ ASM_PFX(ArmPlatformGetCorePosition):
 //ArmPlatformGetPrimaryCoreMpId (\r
 //  VOID\r
 //  );\r
-ASM_PFX(ArmPlatformGetPrimaryCoreMpId):\r
-  ldr   r0, =PrimaryCoreMpid\r
-  ldr   r0, [r0]\r
+ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)\r
+  LDRL  (r0, PrimaryCoreMpid)\r
   bx    lr\r
 \r
 //\r
@@ -77,13 +63,11 @@ ASM_PFX(ArmPlatformGetPrimaryCoreMpId):
 //ArmPlatformIsPrimaryCore (\r
 //  IN UINTN MpId\r
 //  );\r
-ASM_PFX(ArmPlatformIsPrimaryCore):\r
-  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r1)\r
-  ldr   r1, [r1]\r
+ASM_FUNC(ArmPlatformIsPrimaryCore)\r
+  MOV32 (r1, FixedPcdGet32 (PcdArmPrimaryCoreMask))\r
   and   r0, r0, r1\r
 \r
-  ldr   r1, =PrimaryCoreMpid\r
-  ldr   r1, [r1]\r
+  LDRL  (r1, PrimaryCoreMpid)\r
 \r
   cmp   r0, r1\r
   moveq r0, #1\r
@@ -97,9 +81,11 @@ ASM_PFX(ArmPlatformIsPrimaryCore):
 // or PrePeiCore modules. It allows to retrieve arguments passed to\r
 // the UEFI firmware through the CPU registers.\r
 //\r
-ASM_PFX(ArmPlatformPeiBootAction):\r
+ASM_FUNC(ArmPlatformPeiBootAction)\r
   // The trusted firmware passes the primary CPU MPID through r0 register.\r
   // Save it in a variable.\r
-  ldr  r1, =PrimaryCoreMpid\r
+  adr  r1, PrimaryCoreMpid\r
   str  r0, [r1]\r
   bx   lr\r
+\r
+PrimaryCoreMpid:  .word    0x0\r