From a32dae4878f692ede61536ca900d342d636848ca Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Wed, 4 Jul 2012 20:10:18 +0000 Subject: 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 --- ArmPkg/Include/AsmMacroIoLib.h | 6 +++--- ArmPkg/Include/AsmMacroIoLib.inc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ArmPkg/Include') 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 -- cgit v1.2.3