ArmVirtPkg: clean up assembly source files

This updates all assembly source files under ArmVirtPkg to mark
exported functions as ASM_FUNC(), which puts them in a separate
section, allowing the linker to prune code that is left unused.

At the same time, clean up the code to get rid of LoadConstantToReg()
instances involving symbol references, each of which emits an absolute
literal, and hence and entry in the PE/COFF .reloc table.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

3 files changed, 15 insertions, 56 deletions

diff --git a/ArmVirtPkg/Library/ArmVirtPlatformLib/AARCH64/VirtHelper.S b/ArmVirtPkg/Library/ArmVirtPlatformLib/AARCH64/VirtHelper.S
index 14200fc17..1d8fe2592 100644
--- a/ArmVirtPkg/Library/ArmVirtPlatformLib/AARCH64/VirtHelper.S
+++ b/ArmVirtPkg/Library/ArmVirtPlatformLib/AARCH64/VirtHelper.S
@@ -1,5 +1,6 @@
 #

 #  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

+#  Copyright (c) 2016, Linaro Limited. All rights reserved.

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -12,41 +13,24 @@
 #

 

 #include <AsmMacroIoLibV8.h>

-#include <Base.h>

 #include <Library/ArmLib.h>

-#include <Library/PcdLib.h>

-#include <AutoGen.h>

 

-.text

-.align 2

-

-GCC_ASM_EXPORT(ArmPlatformPeiBootAction)

-GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)

-GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)

-GCC_ASM_EXPORT(ArmPlatformGetCorePosition)

-GCC_ASM_EXPORT(ArmGetPhysAddrTop)

-

-GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCore)

-GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)

-GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdCoreCount)

-

-ASM_PFX(ArmPlatformPeiBootAction):

+ASM_FUNC(ArmPlatformPeiBootAction)

   ret

 

 //UINTN

 //ArmPlatformGetPrimaryCoreMpId (

 //  VOID

 //  );

-ASM_PFX(ArmPlatformGetPrimaryCoreMpId):

-  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, x0)

-  ldrh   w0, [x0]

+ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)

+  MOV32  (w0, FixedPcdGet32 (PcdArmPrimaryCore))

   ret

 

 //UINTN

 //ArmPlatformIsPrimaryCore (

 //  IN UINTN MpId

 //  );

-ASM_PFX(ArmPlatformIsPrimaryCore):

+ASM_FUNC(ArmPlatformIsPrimaryCore)

   mov   x0, #1

   ret

 

@@ -55,7 +39,7 @@ ASM_PFX(ArmPlatformIsPrimaryCore):
 //  IN UINTN MpId

 //  );

 // With this function: CorePos = (ClusterId * 4) + CoreId

-ASM_PFX(ArmPlatformGetCorePosition):

+ASM_FUNC(ArmPlatformGetCorePosition)

   and   x1, x0, #ARM_CORE_MASK

   and   x0, x0, #ARM_CLUSTER_MASK

   add   x0, x1, x0, LSR #6

@@ -65,7 +49,7 @@ ASM_PFX(ArmPlatformGetCorePosition):
 //GetPhysAddrTop (

 //  VOID

 //  );

-ASM_PFX(ArmGetPhysAddrTop):

+ASM_FUNC(ArmGetPhysAddrTop)

   mrs   x0, id_aa64mmfr0_el1

   adr   x1, .LPARanges

   and   x0, x0, #7

diff --git a/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.S b/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.S
index 255f99598..4a4db3721 100644
--- a/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.S
+++ b/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.S
@@ -1,6 +1,6 @@
 #

 #  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

-#  Copyright (c) 2014, Linaro Limited. All rights reserved.

+#  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -13,41 +13,24 @@
 #

 

 #include <AsmMacroIoLib.h>

-#include <Base.h>

 #include <Library/ArmLib.h>

-#include <Library/PcdLib.h>

-#include <AutoGen.h>

 

-.text

-.align 2

-

-GCC_ASM_EXPORT(ArmPlatformPeiBootAction)

-GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore)

-GCC_ASM_EXPORT(ArmPlatformGetPrimaryCoreMpId)

-GCC_ASM_EXPORT(ArmPlatformGetCorePosition)

-GCC_ASM_EXPORT(ArmGetPhysAddrTop)

-

-GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCore)

-GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdArmPrimaryCoreMask)

-GCC_ASM_IMPORT(_gPcd_FixedAtBuild_PcdCoreCount)

-

-ASM_PFX(ArmPlatformPeiBootAction):

+ASM_FUNC(ArmPlatformPeiBootAction)

   bx    lr

 

 //UINTN

 //ArmPlatformGetPrimaryCoreMpId (

 //  VOID

 //  );

-ASM_PFX(ArmPlatformGetPrimaryCoreMpId):

-  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r0)

-  ldr    r0, [r0]

+ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)

+  MOV32  (r0, FixedPcdGet32 (PcdArmPrimaryCore))

   bx     lr

 

 //UINTN

 //ArmPlatformIsPrimaryCore (

 //  IN UINTN MpId

 //  );

-ASM_PFX(ArmPlatformIsPrimaryCore):

+ASM_FUNC(ArmPlatformIsPrimaryCore)

   mov   r0, #1

   bx    lr

 

@@ -56,7 +39,7 @@ ASM_PFX(ArmPlatformIsPrimaryCore):
 //  IN UINTN MpId

 //  );

 // With this function: CorePos = (ClusterId * 4) + CoreId

-ASM_PFX(ArmPlatformGetCorePosition):

+ASM_FUNC(ArmPlatformGetCorePosition)

   and   r1, r0, #ARM_CORE_MASK

   and   r0, r0, #ARM_CLUSTER_MASK

   add   r0, r1, r0, LSR #6

@@ -66,7 +49,7 @@ ASM_PFX(ArmPlatformGetCorePosition):
 //GetPhysAddrTop (

 //  VOID

 //  );

-ASM_PFX(ArmGetPhysAddrTop):

+ASM_FUNC(ArmGetPhysAddrTop)

   mov   r0, #0x00000000

   mov   r1, #0x10000

   bx    lr

diff --git a/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm b/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm
index 7882e6321..b476516f2 100644
--- a/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm
+++ b/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm
@@ -11,10 +11,7 @@
 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 //

 

-#include <AsmMacroIoLib.h>

-#include <Base.h>

 #include <Library/ArmLib.h>

-#include <Library/PcdLib.h>

 #include <AutoGen.h>

 

   INCLUDE AsmMacroIoLib.inc

@@ -25,10 +22,6 @@
   EXPORT  ArmPlatformGetCorePosition

   EXPORT  ArmGetPhysAddrTop

 

-  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCore

-  IMPORT  _gPcd_FixedAtBuild_PcdArmPrimaryCoreMask

-  IMPORT  _gPcd_FixedAtBuild_PcdCoreCount

-

   AREA VirtHelper, CODE, READONLY

 

 ArmPlatformPeiBootAction FUNCTION

@@ -40,8 +33,7 @@ ArmPlatformPeiBootAction FUNCTION
 //  VOID

 //  );

 ArmPlatformGetPrimaryCoreMpId FUNCTION

-  LoadConstantToReg (_gPcd_FixedAtBuild_PcdArmPrimaryCore, r0)

-  ldr    r0, [r0]

+  MOV32  r0, FixedPcdGet32 (PcdArmPrimaryCore)

   bx     lr

   ENDFUNC