sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ArmVirtPkg/PrePi: use correct callee saved regs

Browse Source 
Both the ARM and the AARCH64 versions of the PrePi code (shared between
ArmVirtQemuKernel and ArmVirtXen) 'preserve' values across a function
call using registers that are not in fact callee saved. So fix that.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ard Biesheuvel
2016-08-05 16:41:32 +02:00
parent af90df3cb0
commit 298f836123
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S
View File

@@ -154,17 +154,17 @@ _GetStackBase:
// r1 = The top of the Mpcore Stacks
// Stack for the primary core = PrimaryCoreStack
LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)
sub r12, r1, r2
sub r9, r1, r2
// Stack for the secondary core = Number of Cores - 1
LoadConstantToReg (FixedPcdGet32(PcdCoreCount), r0)
sub r0, r0, #1
LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r1)
mul r1, r1, r0
sub r12, r12, r1
sub r9, r9, r1
// r12 = The base of the MpCore Stacks (primary stack & secondary stacks)
mov r0, r12
// r9 = The base of the MpCore Stacks (primary stack & secondary stacks)
mov r0, r9
mov r1, r10
//ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize)
LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)
@@ -180,7 +180,7 @@ _GetStackBase:
_PrepareArguments:
mov r0, r10
mov r1, r11
mov r2, r12
mov r2, r9
// Move sec startup address into a data register
// Ensure we're jumping to FV version of the code (not boot remapped alias)