MdeModulePkg/FaultTolerantWriteDxe: implement standalone MM version

[mirror_edk2.git] / ArmPkg / Include / AsmMacroIoLib.h

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