Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ArmPkg/AsmMacroIoLib: Renamed 'GetCorePositionInStack' macro into 'GetCorePositionFromMpId' 

Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13493 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
oliviermartin 2012-07-04 20:10:18 +00:00
parent a75568e9c9
commit a32dae4878
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ArmPkg/Include/AsmMacroIoLib.h
View File

@ -122,7 +122,7 @@
// Convert the (ClusterId,CoreId) into a Core Position // Convert the (ClusterId,CoreId) into a Core Position
// We assume there are 4 cores per cluster // We assume there are 4 cores per cluster
#define GetCorePositionInStack(Pos, MpId, Tmp) \ #define GetCorePositionFromMpId(Pos, MpId, Tmp) \
lsr Pos, MpId, #6 ; \ lsr Pos, MpId, #6 ; \
and Tmp, MpId, #3 ; \ and Tmp, MpId, #3 ; \
add Pos, Pos, Tmp add Pos, Pos, Tmp
@ -193,7 +193,7 @@ _SetPrimaryStackEnd:
#define LoadConstantToReg(Data, Reg) \ #define LoadConstantToReg(Data, Reg) \
ldr Reg, =Data ldr Reg, =Data
#define GetCorePositionInStack(Pos, MpId, Tmp) \ #define GetCorePositionFromMpId(Pos, MpId, Tmp) \
lsr Pos, MpId, #6 ; \ lsr Pos, MpId, #6 ; \
and Tmp, MpId, #3 ; \ and Tmp, MpId, #3 ; \
add Pos, Pos, Tmp add Pos, Pos, Tmp
@ -274,7 +274,7 @@ _SetPrimaryStackEnd:
// conditional load testing eq flag // conditional load testing eq flag
#define LoadConstantToRegIfEq(Data, Reg) LoadConstantToRegIfEqMacro Data, Reg #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 #define SetPrimaryStack(StackTop,GlobalSize,Tmp) SetPrimaryStack StackTop, GlobalSize, Tmp

2
ArmPkg/Include/AsmMacroIoLib.inc
View File

@ -81,7 +81,7 @@
MEND MEND
MACRO MACRO
GetCorePositionInStack $Pos, $MpId, $Tmp GetCorePositionFromMpId $Pos, $MpId, $Tmp
lsr $Pos, $MpId, #6 lsr $Pos, $MpId, #6
and $Tmp, $MpId, #3 and $Tmp, $MpId, #3
add $Pos, $Pos, $Tmp add $Pos, $Pos, $Tmp

2
ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
View File

@ -46,7 +46,7 @@ _SetupSecondaryCoreStack:
// r1 contains the base of the secondary stacks // r1 contains the base of the secondary stacks
// Get the Core Position (ClusterId * 4) + CoreId // 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 // 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 add r0, r0, #1

2
ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
View File

@ -48,7 +48,7 @@ _SetupSecondaryCoreStack
// r1 contains the base of the secondary stacks // r1 contains the base of the secondary stacks
// Get the Core Position (ClusterId * 4) + CoreId // 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 // 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 add r0, r0, #1

2
ArmPlatformPkg/PrePi/ModuleEntryPoint.S
View File

@ -131,7 +131,7 @@ _SetupSecondaryCoreStack:
// r1 = The base of the secondary Stacks // r1 = The base of the secondary Stacks
// Get the position of the cores (ClusterId * 4) + CoreId // 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 // 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 add r0, r0, #1
// Get the offset for the Secondary Stack // Get the offset for the Secondary Stack

2
ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
View File

@ -132,7 +132,7 @@ _SetupSecondaryCoreStack
// r1 = The base of the secondary Stacks // r1 = The base of the secondary Stacks
// Get the position of the cores (ClusterId * 4) + CoreId // 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 // 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 add r0, r0, #1
// Get the offset for the Secondary Stack // Get the offset for the Secondary Stack

2
ArmPlatformPkg/Sec/SecEntryPoint.S
View File

@ -99,7 +99,7 @@ _SetupSecondaryCoreStack:
add r1, r1, r2 add r1, r1, r2
// Get the Core Position (ClusterId * 4) + CoreId // 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 // 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 add r0, r0, #1

2
ArmPlatformPkg/Sec/SecEntryPoint.asm
View File

@ -101,7 +101,7 @@ _SetupSecondaryCoreStack
add r1, r1, r2 add r1, r1, r2
// Get the Core Position (ClusterId * 4) + CoreId // 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 // 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 add r0, r0, #1