ArmPkg/AsmMacroIoLib: Renamed 'GetCorePositionInStack' macro into 'GetCorePositionFro...

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

diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
index a4ae22dca03e4df6555f27a492f64b4a5f8a2284..0276275a41f09e8318c711d7fccd080333f2ab83 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLib.h
+++ b/ArmPkg/Include/AsmMacroIoLib.h
@@ -122,7 +122,7 @@
 \r
 // Convert the (ClusterId,CoreId) into a Core Position\r
 // We assume there are 4 cores per cluster\r
-#define GetCorePositionInStack(Pos, MpId, Tmp) \\r
+#define GetCorePositionFromMpId(Pos, MpId, Tmp) \\r
   lsr   Pos, MpId, #6 ;                        \\r
   and   Tmp, MpId, #3 ;                        \\r
   add   Pos, Pos, Tmp\r
@@ -193,7 +193,7 @@ _SetPrimaryStackEnd:
 #define LoadConstantToReg(Data, Reg) \\r
   ldr  Reg, =Data\r
   \r
-#define GetCorePositionInStack(Pos, MpId, Tmp) \\r
+#define GetCorePositionFromMpId(Pos, MpId, Tmp) \\r
   lsr   Pos, MpId, #6 ;                        \\r
   and   Tmp, MpId, #3 ;                        \\r
   add   Pos, Pos, Tmp\r
@@ -274,7 +274,7 @@ _SetPrimaryStackEnd:
 // conditional load testing eq flag\r
 #define LoadConstantToRegIfEq(Data, Reg)  LoadConstantToRegIfEqMacro Data, Reg\r
 \r
-#define GetCorePositionInStack(Pos, MpId, Tmp)  GetCorePositionInStack Pos, MpId, Tmp\r
+#define GetCorePositionFromMpId(Pos, MpId, Tmp)  GetCorePositionFromMpId Pos, MpId, Tmp\r
 \r
 #define SetPrimaryStack(StackTop,GlobalSize,Tmp) SetPrimaryStack StackTop, GlobalSize, Tmp\r
 \r

diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc
index a847579a37b5dd0681ae8aba4f72f59109b83b86..5ed9e05775d7f46c193db3a9584f9c48669e94d1 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLib.inc
+++ b/ArmPkg/Include/AsmMacroIoLib.inc
@@ -81,7 +81,7 @@
   MEND \r
   \r
   MACRO\r
-  GetCorePositionInStack $Pos, $MpId, $Tmp\r
+  GetCorePositionFromMpId $Pos, $MpId, $Tmp\r
   lsr   $Pos, $MpId, #6\r
   and   $Tmp, $MpId, #3\r
   add   $Pos, $Pos, $Tmp\r

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
index 737b6ac19d5d2b5311499bfb389c50c7a7f6e39c..f902a251c22c57f69183bbbfd5ee6936d9d1a9c7 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.S
@@ -46,7 +46,7 @@ _SetupSecondaryCoreStack:
   // r1 contains the base of the secondary stacks\r
 \r
   // Get the Core Position (ClusterId * 4) + CoreId\r
-  GetCorePositionInStack(r0, r5, r2)\r
+  GetCorePositionFromMpId(r0, r5, r2)\r
   // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack\r
   add   r0, r0, #1\r
 \r

diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
index 60f6051b90bb2c456f554f0bfd61efbe1eb620d4..a3dd1fb2c6e92e465bd3e7d4195db7d8e4dc83c8 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreEntryPoint.asm
@@ -48,7 +48,7 @@ _SetupSecondaryCoreStack
   // r1 contains the base of the secondary stacks\r
 \r
   // Get the Core Position (ClusterId * 4) + CoreId\r
-  GetCorePositionInStack(r0, r5, r2)\r
+  GetCorePositionFromMpId(r0, r5, r2)\r
   // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack\r
   add   r0, r0, #1\r
 \r

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
index bff240a660bc5ef775ee34cce16db967ceb3206d..845ae208b2cdeb7b0b749275954d7280ba857f7b 100755 (executable)
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
@@ -131,7 +131,7 @@ _SetupSecondaryCoreStack:
   // r1 = The base of the secondary Stacks\r
 \r
   // Get the position of the cores (ClusterId * 4) + CoreId\r
-  GetCorePositionInStack(r0, r5, r4)\r
+  GetCorePositionFromMpId(r0, r5, r4)\r
   // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack\r
   add   r0, r0, #1\r
   // Get the offset for the Secondary Stack\r

diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
index e0b622103f8e98d9aad45c5dc7a06090c91ff887..780371c15cf26ed144be16ac63f4f19ce08884d0 100644 (file)
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
@@ -132,7 +132,7 @@ _SetupSecondaryCoreStack
   // r1 = The base of the secondary Stacks\r
 \r
   // Get the position of the cores (ClusterId * 4) + CoreId\r
-  GetCorePositionInStack(r0, r5, r4)\r
+  GetCorePositionFromMpId(r0, r5, r4)\r
   // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack\r
   add   r0, r0, #1\r
   // Get the offset for the Secondary Stack\r

diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/SecEntryPoint.S
index ed7448af215c75a2387ed3886b0e125883eb73fd..0c42a7baa500c54b7daad77a77c7e8941d4b4b86 100644 (file)
--- a/ArmPlatformPkg/Sec/SecEntryPoint.S
+++ b/ArmPlatformPkg/Sec/SecEntryPoint.S
@@ -99,7 +99,7 @@ _SetupSecondaryCoreStack:
   add   r1, r1, r2\r
 \r
   // Get the Core Position (ClusterId * 4) + CoreId\r
-  GetCorePositionInStack(r0, r5, r2)\r
+  GetCorePositionFromMpId(r0, r5, r2)\r
   // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack\r
   add   r0, r0, #1\r
 \r

diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.asm b/ArmPlatformPkg/Sec/SecEntryPoint.asm
index 30cf19245cb8dd521726e50c4b3044d5ac211d78..6af11bb5063ef828846e8ff23c1864620f798052 100644 (file)
--- a/ArmPlatformPkg/Sec/SecEntryPoint.asm
+++ b/ArmPlatformPkg/Sec/SecEntryPoint.asm
@@ -101,7 +101,7 @@ _SetupSecondaryCoreStack
   add   r1, r1, r2\r
 \r
   // Get the Core Position (ClusterId * 4) + CoreId\r
-  GetCorePositionInStack(r0, r5, r2)\r
+  GetCorePositionFromMpId(r0, r5, r2)\r
   // The stack starts at the top of the stack region. Add '1' to the Core Position to get the top of the stack\r
   add   r0, r0, #1\r
 \r