From 2d45f194d98a1ff4f7d78b96a551d903969262b4 Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Fri, 10 May 2013 12:46:11 +0000 Subject: ARM Packages: Replaced the macro GetCorePositionFromMpId() by the ArmPlatformGetCorePosition() Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin Acked-by: Ryan Harkin Reviewed-by: Leif Lindholm git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14346 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPkg/Include/AsmMacroIoLib.h | 22 ---------------------- ArmPkg/Include/AsmMacroIoLib.inc | 11 ----------- 2 files changed, 33 deletions(-) (limited to 'ArmPkg') diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h index c507329..dac2e15 100644 --- a/ArmPkg/Include/AsmMacroIoLib.h +++ b/ArmPkg/Include/AsmMacroIoLib.h @@ -120,16 +120,6 @@ .long (_Data) ; \ 1: -// Convert the (ClusterId,CoreId) into a Core Position -// We assume there are 4 cores per cluster -// Note: 0xFFFF is the magic value for ARM_CORE_MASK | ARM_CLUSTER_MASK -#define GetCorePositionFromMpId(Pos, MpId, Tmp) \ - ldr Tmp, =0xFFFF \ - and MpId, Tmp \ - lsr Pos, MpId, #6 ; \ - and Tmp, MpId, #3 ; \ - add Pos, Pos, Tmp - // Reserve a region at the top of the Primary Core stack // for Global variables for the XIP phase #define SetPrimaryStack(StackTop, GlobalSize, Tmp) \ @@ -211,16 +201,6 @@ _InitializePrimaryStackEnd: #define LoadConstantToReg(Data, Reg) \ ldr Reg, =Data -// Convert the (ClusterId,CoreId) into a Core Position -// We assume there are 4 cores per cluster -// Note: 0xFFFF is the magic value for ARM_CORE_MASK | ARM_CLUSTER_MASK -#define GetCorePositionFromMpId(Pos, MpId, Tmp) \ - ldr Tmp, =0xFFFF ; \ - and MpId, Tmp ; \ - lsr Pos, MpId, #6 ; \ - and Tmp, MpId, #3 ; \ - add Pos, Pos, Tmp - #define SetPrimaryStack(StackTop, GlobalSize, Tmp) \ and Tmp, GlobalSize, #7 ; \ rsbne Tmp, Tmp, #8 ; \ @@ -313,8 +293,6 @@ _InitializePrimaryStackEnd: // conditional load testing eq flag #define LoadConstantToRegIfEq(Data, Reg) LoadConstantToRegIfEqMacro Data, Reg -#define GetCorePositionFromMpId(Pos, MpId, Tmp) GetCorePositionFromMpId Pos, MpId, Tmp - #define SetPrimaryStack(StackTop,GlobalSize,Tmp) SetPrimaryStack StackTop, GlobalSize, Tmp // Initialize the Global Variable with '0' diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc index 5796adc..54c32d4 100644 --- a/ArmPkg/Include/AsmMacroIoLib.inc +++ b/ArmPkg/Include/AsmMacroIoLib.inc @@ -80,17 +80,6 @@ ldr $Reg, =($Data) MEND - MACRO - GetCorePositionFromMpId $Pos, $MpId, $Tmp - ;Note: The ARM macro does not support the pre-processing. 0xFF and (0xFF << 8) are the values of - ; ARM_CORE_MASK and ARM_CLUSTER_MASK - mov $Tmp, #(0xFF :OR: (0xFF << 8)) - and $MpId, $Tmp - lsr $Pos, $MpId, #6 - and $Tmp, $MpId, #3 - add $Pos, $Pos, $Tmp - MEND - ; The reserved place must be 8-bytes aligned for pushing 64-bit variable on the stack ; Note: Global Size will be modified MACRO -- cgit v1.1