diff options
| author | Olivier Martin <olivier.martin@arm.com> | 2014-06-03 16:43:26 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-06-03 16:43:26 +0000 |
| commit | 5f1103bd1e247b129a05d19899af56b5d245f19c (patch) | |
| tree | a52b44fb90a584cfd0d1cc2fe6aad9e10266fa84 | |
| parent | ec17f0f56a1b6345baef5d73e6ed7bc2016f4b78 (diff) | |
| download | edk2-5f1103bd1e247b129a05d19899af56b5d245f19c.tar.gz edk2-5f1103bd1e247b129a05d19899af56b5d245f19c.tar.bz2 edk2-5f1103bd1e247b129a05d19899af56b5d245f19c.zip | |
ArmPkg/AsmMacroIoLib: Add support for ARM Compiler 6.00
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15554 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ArmPkg/Include/AsmMacroIoLibV8.h | 79 |
1 files changed, 27 insertions, 52 deletions
diff --git a/ArmPkg/Include/AsmMacroIoLibV8.h b/ArmPkg/Include/AsmMacroIoLibV8.h index 5ab1b5723e..2ee1081632 100644 --- a/ArmPkg/Include/AsmMacroIoLibV8.h +++ b/ArmPkg/Include/AsmMacroIoLibV8.h @@ -1,5 +1,5 @@ /** @file
- Macros to work around lack of Apple support for LDR register, =expr
+ Macros to work around lack of Clang support for LDR register, =expr
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Portions copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
@@ -18,54 +18,6 @@ #ifndef __MACRO_IO_LIBV8_H__
#define __MACRO_IO_LIBV8_H__
-#if defined (__GNUC__)
-
-#define MmioWrite32(Address, Data) \
- ldr x1, =Address ; \
- ldr w0, =Data ; \
- str w0, [x1]
-
-#define MmioOr32(Address, OrData) \
- ldr x1, =Address ; \
- ldr w2, =OrData ; \
- ldr w0, [x1] ; \
- orr w0, w0, w2 ; \
- str w0, [x1]
-
-#define MmioAnd32(Address, AndData) \
- ldr x1, =Address ; \
- ldr w2, =AndData ; \
- ldr w0, [x1] ; \
- and w0, w0, w2 ; \
- str w0, [x1]
-
-#define MmioAndThenOr32(Address, AndData, OrData) \
- ldr x1, =Address ; \
- ldr w0, [x1] ; \
- ldr w2, =AndData ; \
- and w0, w0, w2 ; \
- ldr w2, =OrData ; \
- orr w0, w0, w2 ; \
- str w0, [x1]
-
-#define MmioWriteFromReg32(Address, Reg) \
- ldr x1, =Address ; \
- str Reg, [x1]
-
-#define MmioRead32(Address) \
- ldr x1, =Address ; \
- ldr w0, [x1]
-
-#define MmioReadToReg32(Address, Reg) \
- ldr x1, =Address ; \
- ldr Reg, [x1]
-
-#define LoadConstant(Data) \
- ldr x0, =Data
-
-#define LoadConstantToReg(Data, Reg) \
- ldr Reg, =Data
-
#define SetPrimaryStack(StackTop, GlobalSize, Tmp, Tmp1) \
ands Tmp, GlobalSize, #15 ; \
mov Tmp1, #16 ; \
@@ -124,12 +76,35 @@ _InitializePrimaryStackEnd: cmp SAFE_XREG, #0x4 ;\
b.ne . ;// We should never get here
// EL1 code starts 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__)
-#else
+#define LoadConstant(Data) \
+ ldr x0, =Data
-#error RVCT AArch64 tool chain is not supported
+#define LoadConstantToReg(Data, Reg) \
+ ldr Reg, =Data
-#endif // __GNUC__
+#endif // __GNUC__
#endif // __MACRO_IO_LIBV8_H__
|