//\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
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
// 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
_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
_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
\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
\r
_NeverReturn:\r
b _NeverReturn\r
+\r
+ASM_PFX(mSystemMemoryEnd): .8byte 0\r
//\r
\r
#include <AsmMacroIoLib.h>\r
-#include <Base.h>\r
-#include <Library/PcdLib.h>\r
-#include <AutoGen.h>\r
\r
#include <Chipset/ArmV7.h>\r
\r
-.text\r
-.align 3\r
-\r
-GCC_ASM_IMPORT(CEntryPoint)\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
GCC_ASM_EXPORT(mSystemMemoryEnd)\r
\r
-StartupAddr: .word CEntryPoint\r
-mSystemMemoryEnd: .8byte 0\r
-\r
-\r
-ASM_PFX(_ModuleEntryPoint):\r
+ASM_FUNC(_ModuleEntryPoint)\r
// Do early platform specific actions\r
bl ASM_PFX(ArmPlatformPeiBootAction)\r
\r
cmp r1, #0\r
bne _SetupStackPosition\r
\r
- LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), r1)\r
- LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), r2)\r
- sub r2, r2, #1\r
- add r1, r1, r2\r
+ MOV32 (r1, FixedPcdGet32(PcdSystemMemoryBase) + FixedPcdGet32(PcdSystemMemorySize) - 1)\r
+\r
// Update the global variable\r
adr r2, mSystemMemoryEnd\r
str r1, [r2]\r
// r1 = SystemMemoryTop\r
\r
// Calculate Top of the Firmware Device\r
- LoadConstantToReg (FixedPcdGet32(PcdFdBaseAddress), r2)\r
- LoadConstantToReg (FixedPcdGet32(PcdFdSize), r3)\r
- sub r3, r3, #1\r
+ MOV32 (r2, FixedPcdGet32(PcdFdBaseAddress))\r
+ MOV32 (r3, FixedPcdGet32(PcdFdSize) - 1)\r
add r3, r3, r2 // r3 = FdTop = PcdFdBaseAddress + PcdFdSize\r
\r
// UEFI Memory Size (stacks are allocated in this region)\r
- LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryUefiRegionSize), r4)\r
+ MOV32 (r4, FixedPcdGet32(PcdSystemMemoryUefiRegionSize))\r
\r
//\r
// Reserve the memory for the UEFI region (contain stacks on its top)\r
_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, r9)\r
- and r9, r9, r1\r
- sub r1, r1, r9\r
+ MOV32 (r9, ~EFI_PAGE_MASK & 0xFFFFFFFF)\r
+ and r1, r1, r9\r
\r
_GetBaseUefiMemory:\r
// Calculate the Base of the UEFI Memory\r
_GetStackBase:\r
// r1 = The top of the Mpcore Stacks\r
// Stack for the primary core = PrimaryCoreStack\r
- LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)\r
+ MOV32 (r2, FixedPcdGet32(PcdCPUCorePrimaryStackSize))\r
sub r10, r1, r2\r
\r
// Stack for the secondary core = Number of Cores - 1\r
- LoadConstantToReg (FixedPcdGet32(PcdCoreCount), r0)\r
- sub r0, r0, #1\r
- LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r1)\r
- mul r1, r1, r0\r
+ MOV32 (r0, (FixedPcdGet32(PcdCoreCount) - 1) * FixedPcdGet32(PcdCPUCoreSecondaryStackSize))\r
sub r10, r10, r1\r
\r
// r10 = The base of the MpCore Stacks (primary stack & secondary stacks)\r
mov r0, r10\r
mov r1, r8\r
//ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize)\r
- LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)\r
- LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r3)\r
+ MOV32 (r2, FixedPcdGet32(PcdCPUCorePrimaryStackSize))\r
+ MOV32 (r3, FixedPcdGet32(PcdCPUCoreSecondaryStackSize))\r
bl ASM_PFX(ArmPlatformStackSet)\r
\r
// Is it the Primary Core ?\r
\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 r4, StartupAddr\r
+ ldr r4, =ASM_PFX(CEntryPoint)\r
\r
// Jump to PrePiCore C code\r
// r0 = MpId\r
_NeverReturn:\r
b _NeverReturn\r
\r
+ASM_PFX(mSystemMemoryEnd): .8byte 0\r