Re: [PATCH 3/3] ArmPkg: remove LoadConstantXxx() asm macros

[Leif Lindholm <leif.lindholm@linaro.org>]

On Fri, Oct 28, 2016 at 12:42:54PM +0100, Ard Biesheuvel wrote:
> This is ancient cruft that is no longer used, so remove it.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---
>  ArmPkg/Include/AsmMacroIoLib.h   | 33 --------------------
>  ArmPkg/Include/AsmMacroIoLib.inc | 10 ------
>  ArmPkg/Include/AsmMacroIoLibV8.h | 30 ------------------
>  3 files changed, 73 deletions(-)
> 
> diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
> index 936e01e3388f..16d2a307291c 100644
> --- a/ArmPkg/Include/AsmMacroIoLib.h
> +++ b/ArmPkg/Include/AsmMacroIoLib.h
> @@ -19,39 +19,6 @@
>  #ifndef __MACRO_IO_LIB_H__
>  #define __MACRO_IO_LIB_H__
>  
> -#if defined(__APPLE__)
> -
> -//
> -//  ldr reg, =expr does not work with current Apple tool chain. So do the work our selves
> -//
> -
> -// load _Reg with _Data
> -#define LoadConstantToReg(_Data, _Reg)  \
> -  ldr  _Reg, [pc, #0]   ;               \
> -  b    1f               ;               \
> -  .long (_Data)         ;               \
> -1:
> -
> -#elif defined (__GNUC__)
> -
> -#define LoadConstantToReg(Data, Reg) \
> -  ldr  Reg, =Data
> -
> -#else
> -
> -//
> -// Use ARM assembly macros, form armasam
> -//
> -//  Less magic in the macros if ldr reg, =expr works
> -//
> -
> -// load _Reg with _Data
> -
> -
> -#define LoadConstantToReg(Data, Reg)  LoadConstantToRegMacro Data, Reg
> -
> -#endif
> -
>  #define _ASM_FUNC(Name, Section)    \
>    .global   Name                  ; \
>    .section  #Section, "ax"        ; \
> diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc
> index 4bc3146fb399..ce7a1488daea 100644
> --- a/ArmPkg/Include/AsmMacroIoLib.inc
> +++ b/ArmPkg/Include/AsmMacroIoLib.inc
> @@ -17,16 +17,6 @@
>  
>  
>    MACRO
> -  LoadConstantMacro $Data
> -  ldr  r0, =($Data)
> -  MEND
> -
> -  MACRO
> -  LoadConstantToRegMacro $Data, $Reg
> -  ldr  $Reg, =($Data)
> -  MEND
> -
> -  MACRO
>    adrll   $Reg, $Symbol
>    add     $Reg, pc, #-8
>    RELOC   R_ARM_ALU_PC_G0_NC, $Symbol
> diff --git a/ArmPkg/Include/AsmMacroIoLibV8.h b/ArmPkg/Include/AsmMacroIoLibV8.h
> index e9285f78e7d6..db43d3b52e5a 100644
> --- a/ArmPkg/Include/AsmMacroIoLibV8.h
> +++ b/ArmPkg/Include/AsmMacroIoLibV8.h
> @@ -42,36 +42,6 @@
>          cbnz   SAFE_XREG, 1f        ;\
>          b      .                    ;// We should never get here
>  
> -#if defined(__clang__)
> -
> -// load x0 with _Data
> -#define LoadConstant(_Data)              \
> -  ldr  x0, 1f                          ; \
> -  b    2f                              ; \
> -.align(8)                              ; \
> -1:                                       \
> -  .8byte (_Data)                       ; \
> -2:
> -
> -// load _Reg with _Data
> -#define LoadConstantToReg(_Data, _Reg)    \
> -  ldr  _Reg, 1f                         ; \
> -  b    2f                               ; \
> -.align(8)                               ; \
> -1:                                        \
> -  .8byte (_Data)                        ; \
> -2:
> -
> -#elif defined (__GNUC__)
> -
> -#define LoadConstant(Data) \
> -  ldr  x0, =Data
> -
> -#define LoadConstantToReg(Data, Reg) \
> -  ldr  Reg, =Data
> -
> -#endif // __GNUC__
> -
>  #define _ASM_FUNC(Name, Section)    \
>    .global   Name                  ; \
>    .section  #Section, "ax"        ; \
> -- 
> 2.7.4
>