ArmPlatformPkg/PrePi: switch to ASM_FUNC() asm macro

[mirror_edk2.git] / ArmPlatformPkg / PrePi / AArch64 / ModuleEntryPoint.S

diff --git a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
index 9538c70a237c8617ca8b6cdb4a927415235495e8..d0530a874726752aa50ac9baed8d58f7f4bfc680 100644 (file)
--- a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S
@@ -12,24 +12,10 @@
 //\r
 \r
 #include <AsmMacroIoLibV8.h>\r
-#include <Base.h>\r
-#include <Library/PcdLib.h>\r
-#include <AutoGen.h>\r
-\r
-.text\r
-.align 3\r
-\r
-GCC_ASM_IMPORT(ArmPlatformIsPrimaryCore)\r
-GCC_ASM_IMPORT(ArmReadMpidr)\r
-GCC_ASM_IMPORT(ArmPlatformPeiBootAction)\r
-GCC_ASM_IMPORT(ArmPlatformStackSet)\r
-GCC_ASM_EXPORT(_ModuleEntryPoint)\r
-ASM_GLOBAL ASM_PFX(mSystemMemoryEnd)\r
 \r
-StartupAddr:                  .8byte ASM_PFX(CEntryPoint)\r
-ASM_PFX(mSystemMemoryEnd):    .8byte 0\r
+ASM_GLOBAL ASM_PFX(mSystemMemoryEnd)\r
 \r
-ASM_PFX(_ModuleEntryPoint):\r
+ASM_FUNC(_ModuleEntryPoint)\r
   // Do early platform specific actions\r
   bl    ASM_PFX(ArmPlatformPeiBootAction)\r
 \r
@@ -49,10 +35,8 @@ _SystemMemoryEndInit:
   cmp   x1, #0\r
   bne   _SetupStackPosition\r
 \r
-  LoadConstantToReg (FixedPcdGet64(PcdSystemMemoryBase), x1)\r
-  LoadConstantToReg (FixedPcdGet64(PcdSystemMemorySize), x2)\r
-  sub   x2, x2, #1\r
-  add   x1, x1, x2\r
+  MOV64 (x1, FixedPcdGet64(PcdSystemMemoryBase) + FixedPcdGet64(PcdSystemMemorySize) - 1)\r
+\r
   // Update the global variable\r
   adr   x2, mSystemMemoryEnd\r
   str   x1, [x2]\r
@@ -61,13 +45,13 @@ _SetupStackPosition:
   // r1 = SystemMemoryTop\r
 \r
   // Calculate Top of the Firmware Device\r
-  LoadConstantToReg (FixedPcdGet64(PcdFdBaseAddress), x2)\r
-  LoadConstantToReg (FixedPcdGet32(PcdFdSize), x3)\r
+  MOV64 (x2, FixedPcdGet64(PcdFdBaseAddress))\r
+  MOV32 (x3, FixedPcdGet32(PcdFdSize) - 1)\r
   sub   x3, x3, #1\r
   add   x3, x3, x2      // x3 = FdTop = PcdFdBaseAddress + PcdFdSize\r
 \r
   // UEFI Memory Size (stacks are allocated in this region)\r
-  LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), x4)\r
+  MOV32 (x4, FixedPcdGet32(PcdSystemMemoryUefiRegionSize))\r
 \r
   //\r
   // Reserve the memory for the UEFI region (contain stacks on its top)\r
@@ -98,9 +82,7 @@ _SetupAlignedStack:
 _SetupOverflowStack:\r
   // Case memory at the top of the address space. Ensure the top of the stack is EFI_PAGE_SIZE\r
   // aligned (4KB)\r
-  LoadConstantToReg (EFI_PAGE_MASK, x11)\r
-  and   x11, x11, x1\r
-  sub   x1, x1, x11\r
+  and   x1, x1, ~EFI_PAGE_MASK\r
 \r
 _GetBaseUefiMemory:\r
   // Calculate the Base of the UEFI Memory\r
@@ -109,22 +91,19 @@ _GetBaseUefiMemory:
 _GetStackBase:\r
   // r1 = The top of the Mpcore Stacks\r
   // Stack for the primary core = PrimaryCoreStack\r
-  LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), x2)\r
+  MOV32 (x2, FixedPcdGet32(PcdCPUCorePrimaryStackSize))\r
   sub   x12, x1, x2\r
 \r
   // Stack for the secondary core = Number of Cores - 1\r
-  LoadConstantToReg (FixedPcdGet32(PcdCoreCount), x0)\r
-  sub   x0, x0, #1\r
-  LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), x1)\r
-  mul   x1, x1, x0\r
+  MOV32 (x1, (FixedPcdGet32(PcdCoreCount) - 1) * FixedPcdGet32(PcdCPUCoreSecondaryStackSize))\r
   sub   x12, x12, x1\r
 \r
   // x12 = The base of the MpCore Stacks (primary stack & secondary stacks)\r
   mov   x0, x12\r
   mov   x1, x10\r
   //ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize)\r
-  LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), x2)\r
-  LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), x3)\r
+  MOV32 (x2, FixedPcdGet32(PcdCPUCorePrimaryStackSize))\r
+  MOV32 (x3, FixedPcdGet32(PcdCPUCoreSecondaryStackSize))\r
   bl    ASM_PFX(ArmPlatformStackSet)\r
 \r
   // Is it the Primary Core ?\r
@@ -140,7 +119,7 @@ _PrepareArguments:
 \r
   // Move sec startup address into a data register\r
   // Ensure we're jumping to FV version of the code (not boot remapped alias)\r
-  ldr   x4, StartupAddr\r
+  ldr   x4, =ASM_PFX(CEntryPoint)\r
 \r
   // Jump to PrePiCore C code\r
   //    x0 = MpId\r
@@ -150,3 +129,5 @@ _PrepareArguments:
 \r
 _NeverReturn:\r
   b _NeverReturn\r
+\r
+ASM_PFX(mSystemMemoryEnd):    .8byte 0\r