diff options
| author | Leendert van Doorn <leendert@paramecium.org> | 2016-03-24 15:30:08 -0500 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-03-25 07:17:28 +0100 |
| commit | 91673dfdfe78906023f07e585002689e8baf654e (patch) | |
| tree | 9e312d40a4e42f84df1e612653afe4c8735c7308 /ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S | |
| parent | 7e5a6e394c65a295a761162621c546b1fea0b280 (diff) | |
| download | edk2-91673dfdfe78906023f07e585002689e8baf654e.zip edk2-91673dfdfe78906023f07e585002689e8baf654e.tar.gz edk2-91673dfdfe78906023f07e585002689e8baf654e.tar.bz2 | |
ArmPlatformPkg: fixups for 64-bit pointers
This retypes some stack base PCD as 64-bit, and fixes up a number of references
to 64-bit PCDs (including the retypes ones), to use the correct PcdGet64()
accessors. Note that, in the case of FixedPcdGet64, this does not actually
caused any problems, since that resolves to an immediate value. But the
generic PcdGetxx accessors should be typed according to the size of the PCD.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leo Duran <leo.duran@amd.com>
[ard.biesheuvel: fixed up some instances in the 32-bit ARM code]
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S')
| -rw-r--r-- | ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S index f63fd44..9538c70 100644 --- a/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PrePi/AArch64/ModuleEntryPoint.S @@ -49,8 +49,8 @@ _SystemMemoryEndInit: cmp x1, #0
bne _SetupStackPosition
- LoadConstantToReg (FixedPcdGet32(PcdSystemMemoryBase), x1)
- LoadConstantToReg (FixedPcdGet32(PcdSystemMemorySize), x2)
+ LoadConstantToReg (FixedPcdGet64(PcdSystemMemoryBase), x1)
+ LoadConstantToReg (FixedPcdGet64(PcdSystemMemorySize), x2)
sub x2, x2, #1
add x1, x1, x2
// Update the global variable
@@ -61,7 +61,7 @@ _SetupStackPosition: // r1 = SystemMemoryTop
// Calculate Top of the Firmware Device
- LoadConstantToReg (FixedPcdGet32(PcdFdBaseAddress), x2)
+ LoadConstantToReg (FixedPcdGet64(PcdFdBaseAddress), x2)
LoadConstantToReg (FixedPcdGet32(PcdFdSize), x3)
sub x3, x3, #1
add x3, x3, x2 // x3 = FdTop = PcdFdBaseAddress + PcdFdSize
|