X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ArmPkg%2FInclude%2FAsmMacroIoLib.h;h=16d2a307291c32aa8f8fc7c40834cedf6ebda627;hb=301402fa4797ac3a141e575329ca2ea91756414c;hp=551b87803d19c4c277c1c3a3d99c3789f098cb13;hpb=874883a49d0e85cd5494ab880776c4d103bce80a;p=mirror_edk2.git

diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
index 551b87803d..16d2a30729 100644
--- a/ArmPkg/Include/AsmMacroIoLib.h
+++ b/ArmPkg/Include/AsmMacroIoLib.h
@@ -3,6 +3,7 @@
 
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
   Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
+  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -18,37 +19,27 @@
 #ifndef __MACRO_IO_LIB_H__
 #define __MACRO_IO_LIB_H__
 
-#if defined(__APPLE__)
+#define _ASM_FUNC(Name, Section)    \
+  .global   Name                  ; \
+  .section  #Section, "ax"        ; \
+  .type     Name, %function       ; \
+  .p2align  2                     ; \
+  Name:
 
-//
-//  ldr reg, =expr does not work with current Apple tool chain. So do the work our selves
-//
+#define ASM_FUNC(Name)            _ASM_FUNC(ASM_PFX(Name), .text. ## Name)
 
-// load _Reg with _Data
-#define LoadConstantToReg(_Data, _Reg)  \
-  ldr  _Reg, [pc, #0]   ;               \
-  b    1f               ;               \
-  .long (_Data)         ;               \
-1:
+#define MOV32(Reg, Val)                       \
+  movw      Reg, #(Val) & 0xffff            ; \
+  movt      Reg, #(Val) >> 16
 
-#elif defined (__GNUC__)
+#define ADRL(Reg, Sym)                        \
+  movw      Reg, #:lower16:(Sym) - (. + 16) ; \
+  movt      Reg, #:upper16:(Sym) - (. + 12) ; \
+  add       Reg, Reg, pc
 
-#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 LDRL(Reg, Sym)                        \
+  movw      Reg, #:lower16:(Sym) - (. + 16) ; \
+  movt      Reg, #:upper16:(Sym) - (. + 12) ; \
+  ldr       Reg, [pc, Reg]
 
 #endif