From: oliviermartin Date: Wed, 4 Jul 2012 20:10:18 +0000 (+0000) Subject: ArmPkg/AsmMacroIoLib: Renamed 'GetCorePositionInStack' macro into 'GetCorePositionFro... X-Git-Tag: edk2-stable201903~13285 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=a32dae4878f692ede61536ca900d342d636848ca ArmPkg/AsmMacroIoLib: Renamed 'GetCorePositionInStack' macro into 'GetCorePositionFromMpId' Signed-off-by: Olivier Martin git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13493 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h index a4ae22dca0..0276275a41 100644 --- a/ArmPkg/Include/AsmMacroIoLib.h +++ b/ArmPkg/Include/AsmMacroIoLib.h @@ -122,7 +122,7 @@ // Convert the (ClusterId,CoreId) into a Core Position // We assume there are 4 cores per cluster -#define GetCorePositionInStack(Pos, MpId, Tmp) \ +#define GetCorePositionFromMpId(Pos, MpId, Tmp) \ lsr Pos, MpId, #6 ; \ and Tmp, MpId, #3 ; \ add Pos, Pos, Tmp @@ -193,7 +193,7 @@ _SetPrimaryStackEnd: #define LoadConstantToReg(Data, Reg) \ ldr Reg, =Data -#define GetCorePositionInStack(Pos, MpId, Tmp) \ +#define GetCorePositionFromMpId(Pos, MpId, Tmp) \ lsr Pos, MpId, #6 ; \ and Tmp, MpId, #3 ; \ add Pos, Pos, Tmp @@ -274,7 +274,7 @@ _SetPrimaryStackEnd: // conditional load testing eq flag #define LoadConstantToRegIfEq(Data, Reg) LoadConstantToRegIfEqMacro Data, Reg -#define GetCorePositionInStack(Pos, MpId, Tmp) GetCorePositionInStack Pos, MpId, Tmp +#define GetCorePositionFromMpId(Pos, MpId, Tmp) GetCorePositionFromMpId Pos, MpId, Tmp #define SetPrimaryStack(StackTop,GlobalSize,Tmp) SetPrimaryStack StackTop, GlobalSize, Tmp diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc index a847579a37..5ed9e05775 100644 --- a/ArmPkg/Include/AsmMacroIoLib.inc +++ b/ArmPkg/Include/AsmMacroIoLib.inc @@ -81,7 +81,7 @@ MEND MACRO - GetCorePositionInStack $Pos, $MpId, $Tmp + GetCorePositionFromMpId $Pos, $MpId, $Tmp lsr $Pos, $MpId, #6 and $Tmp, $MpId, #3 add $Pos, $Pos, $Tmp diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S index 737b6ac19d..f902a251c2 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S @@ -46,7 +46,7 @@ _SetupSecondaryCoreStack: // r1 contains the base of the secondary stacks // Get the Core Position (ClusterId * 4) + CoreId - GetCorePositionInStack(r0, r5, r2) + GetCorePositionFromMpId(r0, r5, r2) // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack add r0, r0, #1 diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm index 60f6051b90..a3dd1fb2c6 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm @@ -48,7 +48,7 @@ _SetupSecondaryCoreStack // r1 contains the base of the secondary stacks // Get the Core Position (ClusterId * 4) + CoreId - GetCorePositionInStack(r0, r5, r2) + GetCorePositionFromMpId(r0, r5, r2) // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack add r0, r0, #1 diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S index bff240a660..845ae208b2 100755 --- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S @@ -131,7 +131,7 @@ _SetupSecondaryCoreStack: // r1 = The base of the secondary Stacks // Get the position of the cores (ClusterId * 4) + CoreId - GetCorePositionInStack(r0, r5, r4) + GetCorePositionFromMpId(r0, r5, r4) // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack add r0, r0, #1 // Get the offset for the Secondary Stack diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm index e0b622103f..780371c15c 100644 --- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm +++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm @@ -132,7 +132,7 @@ _SetupSecondaryCoreStack // r1 = The base of the secondary Stacks // Get the position of the cores (ClusterId * 4) + CoreId - GetCorePositionInStack(r0, r5, r4) + GetCorePositionFromMpId(r0, r5, r4) // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack add r0, r0, #1 // Get the offset for the Secondary Stack diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/SecEntryPoint.S index ed7448af21..0c42a7baa5 100644 --- a/ArmPlatformPkg/Sec/SecEntryPoint.S +++ b/ArmPlatformPkg/Sec/SecEntryPoint.S @@ -99,7 +99,7 @@ _SetupSecondaryCoreStack: add r1, r1, r2 // Get the Core Position (ClusterId * 4) + CoreId - GetCorePositionInStack(r0, r5, r2) + GetCorePositionFromMpId(r0, r5, r2) // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack add r0, r0, #1 diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.asm b/ArmPlatformPkg/Sec/SecEntryPoint.asm index 30cf19245c..6af11bb506 100644 --- a/ArmPlatformPkg/Sec/SecEntryPoint.asm +++ b/ArmPlatformPkg/Sec/SecEntryPoint.asm @@ -101,7 +101,7 @@ _SetupSecondaryCoreStack add r1, r1, r2 // Get the Core Position (ClusterId * 4) + CoreId - GetCorePositionInStack(r0, r5, r2) + GetCorePositionFromMpId(r0, r5, r2) // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack add r0, r0, #1