tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmPlatformPkg/ArmPlatformLibNull: switch to ASM_FUNC() asm macro 

Annotate functions with ASM_FUNC() so that they are emitted into
separate sections.

While we're at it, replace some inefficient uses of LoadConstantToReg()

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
Ard Biesheuvel 2016-08-10 16:54:12 +02:00
parent 04209b5354
commit c17ae4cf8e
2 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S
View File

@ -14,18 +14,7 @@
#include <AsmMacroIoLibV8.h> #include <AsmMacroIoLibV8.h>
#include <Library/ArmLib.h> #include <Library/ArmLib.h>
.text ASM_FUNC(ArmPlatformPeiBootAction)
.align 2
GCC_ASM_EXPORT(ArmPlatformPeiBootAction)
GCC_ASM_EXPORT(ArmPlatformGetCorePosition)
GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)
GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)
GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCore)
GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)
ASM_PFX(ArmPlatformPeiBootAction):
ret ret
//UINTN //UINTN
@ -33,7 +22,7 @@ ASM_PFX(ArmPlatformPeiBootAction):
// IN UINTN MpId // IN UINTN MpId
// ); // );
// With this function: CorePos = (ClusterId * 4) + CoreId // With this function: CorePos = (ClusterId * 4) + CoreId
ASM_PFX(ArmPlatformGetCorePosition): ASM_FUNC(ArmPlatformGetCorePosition)
and x1, x0, #ARM_CORE_MASK and x1, x0, #ARM_CORE_MASK
and x0, x0, #ARM_CLUSTER_MASK and x0, x0, #ARM_CLUSTER_MASK
add x0, x1, x0, LSR #6 add x0, x1, x0, LSR #6
@ -43,21 +32,18 @@ ASM_PFX(ArmPlatformGetCorePosition):
//ArmPlatformGetPrimaryCoreMpId ( //ArmPlatformGetPrimaryCoreMpId (
// VOID // VOID
// ); // );
ASM_PFX(ArmPlatformGetPrimaryCoreMpId): ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)
LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, x0) MOV32 (w0, FixedPcdGet32 (PcdArmPrimaryCore))
ldrh w0, [x0]
ret ret
//UINTN //UINTN
//ArmPlatformIsPrimaryCore ( //ArmPlatformIsPrimaryCore (
// IN UINTN MpId // IN UINTN MpId
// ); // );
ASM_PFX(ArmPlatformIsPrimaryCore): ASM_FUNC(ArmPlatformIsPrimaryCore)
LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, x1) MOV32 (w1, FixedPcdGet32 (PcdArmPrimaryCoreMask))
ldrh w1, [x1]
and x0, x0, x1 and x0, x0, x1
LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, x1) MOV32 (w1, FixedPcdGet32 (PcdArmPrimaryCore))
ldrh w1, [x1]
cmp w0, w1 cmp w0, w1
mov x0, #1 mov x0, #1
mov x1, #0 mov x1, #0

28
ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S
View File

@ -14,25 +14,14 @@
#include <AsmMacroIoLib.h> #include <AsmMacroIoLib.h>
#include <Library/ArmLib.h> #include <Library/ArmLib.h>
.text ASM_FUNC(ArmPlatformPeiBootAction)
.align 2
GCC_ASM_EXPORT(ArmPlatformPeiBootAction)
GCC_ASM_EXPORT(ArmPlatformGetCorePosition)
GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)
GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)
GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCore)
GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)
ASM_PFX(ArmPlatformPeiBootAction):
bx lr bx lr
//UINTN //UINTN
//ArmPlatformGetCorePosition ( //ArmPlatformGetCorePosition (
// IN UINTN MpId // IN UINTN MpId
// ); // );
ASM_PFX(ArmPlatformGetCorePosition): ASM_FUNC(ArmPlatformGetCorePosition)
and r1, r0, #ARM_CORE_MASK and r1, r0, #ARM_CORE_MASK
and r0, r0, #ARM_CLUSTER_MASK and r0, r0, #ARM_CLUSTER_MASK
add r0, r1, r0, LSR #7 add r0, r1, r0, LSR #7
@ -42,21 +31,18 @@ ASM_PFX(ArmPlatformGetCorePosition):
//ArmPlatformGetPrimaryCoreMpId ( //ArmPlatformGetPrimaryCoreMpId (
// VOID // VOID
// ); // );
ASM_PFX(ArmPlatformGetPrimaryCoreMpId): ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)
LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r0) MOV32 (r0, FixedPcdGet32 (PcdArmPrimaryCore))
ldr r0, [r0]
bx lr bx lr
//UINTN //UINTN
//ArmPlatformIsPrimaryCore ( //ArmPlatformIsPrimaryCore (
// IN UINTN MpId // IN UINTN MpId
// ); // );
ASM_PFX(ArmPlatformIsPrimaryCore): ASM_FUNC(ArmPlatformIsPrimaryCore)
LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask, r1) MOV32 (r1, FixedPcdGet32 (PcdArmPrimaryCoreMask))
ldr r1, [r1]
and r0, r0, r1 and r0, r0, r1
LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r1) MOV32 (r1, FixedPcdGet32 (PcdArmPrimaryCore))
ldr r1, [r1]
cmp r0, r1 cmp r0, r1
moveq r0, #1 moveq r0, #1
movne r0, #0 movne r0, #0