diff options
68 files changed, 65 insertions, 98 deletions
diff --git a/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S b/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S index 7316502d23..504f026a1d 100644 --- a/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S +++ b/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S @@ -5,7 +5,7 @@ #
#
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#if !defined(__clang__)
diff --git a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S index 8c43a613dc..33c0a58464 100644 --- a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S +++ b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S @@ -5,7 +5,7 @@ #
#
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#include <Library/ArmLib.h>
// For the moment we assume this will run in SVC mode on ARMv7
diff --git a/ArmPkg/Drivers/ArmPsciMpServicesDxe/MpFuncs.S b/ArmPkg/Drivers/ArmPsciMpServicesDxe/MpFuncs.S index f73edc1792..7a52a406e7 100644 --- a/ArmPkg/Drivers/ArmPsciMpServicesDxe/MpFuncs.S +++ b/ArmPkg/Drivers/ArmPsciMpServicesDxe/MpFuncs.S @@ -7,7 +7,7 @@ .text
.align 3
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#include <IndustryStandard/ArmStdSmc.h>
#include <Library/ArmLib.h>
diff --git a/ArmPkg/Include/AsmMacroIoLib.inc b/ArmPkg/Include/AsmMacroIoLib.inc deleted file mode 100644 index 66b8d3d33b..0000000000 --- a/ArmPkg/Include/AsmMacroIoLib.inc +++ /dev/null @@ -1,33 +0,0 @@ -;%HEADER%
-;/** @file
-; Macros to work around lack of Apple support for LDR register, =expr
-;
-; Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
-; Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>
-;
-; SPDX-License-Identifier: BSD-2-Clause-Patent
-;
-;**/
-
-
- MACRO
- adrll $Reg, $Symbol
- add $Reg, pc, #-8
- RELOC R_ARM_ALU_PC_G0_NC, $Symbol
- add $Reg, $Reg, #-4
- RELOC R_ARM_ALU_PC_G1_NC, $Symbol
- add $Reg, $Reg, #0
- RELOC R_ARM_ALU_PC_G2, $Symbol
- MEND
-
- MACRO
- ldrl $Reg, $Symbol
- add $Reg, pc, #-8
- RELOC R_ARM_ALU_PC_G0_NC, $Symbol
- add $Reg, $Reg, #-4
- RELOC R_ARM_ALU_PC_G1_NC, $Symbol
- ldr $Reg, [$Reg, #0]
- RELOC R_ARM_LDR_PC_G2, $Symbol
- MEND
-
- END
diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S index de9d3316de..5dc6899773 100644 --- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S +++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S @@ -9,7 +9,7 @@ #include <AArch64/AArch64.h>
#include <Library/PcdLib.h>
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#include <Protocol/DebugSupport.h> // for exception type definitions
/*
diff --git a/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S index 39d956a022..57c2d75885 100644 --- a/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S +++ b/ArmPkg/Library/ArmHvcLib/AArch64/ArmHvc.S @@ -6,7 +6,7 @@ //
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(ArmCallHvc)
// Push x0 on the stack - The stack must always be quad-word aligned
diff --git a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S index 0a5a959196..9676529c17 100644 --- a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S +++ b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S @@ -6,7 +6,7 @@ //
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.arch_extension virt
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimerSupport.S b/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimerSupport.S index 574e0d5933..be6f073c48 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimerSupport.S +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64ArchTimerSupport.S @@ -7,7 +7,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(ArmReadCntFrq)
mrs x0, cntfrq_el0 // Read CNTFRQ
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S index 1ec868ee12..19c77d31b5 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S @@ -10,7 +10,7 @@ #------------------------------------------------------------------------------
#include <AArch64/AArch64.h>
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
.set CTRL_M_BIT, (1 << 0)
.set CTRL_A_BIT, (1 << 1)
diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S index ec34200d4d..d35730704d 100644 --- a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S +++ b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S @@ -8,7 +8,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
.set DAIF_RD_FIQ_BIT, (1 << 6)
.set DAIF_RD_IRQ_BIT, (1 << 7)
diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S index 0ae75e4cb9..1459805664 100644 --- a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S +++ b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S @@ -8,7 +8,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
.set MPIDR_U_BIT, (30)
.set MPIDR_U_MASK, (1 << MPIDR_U_BIT)
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S index 7e032dd07c..86635cc093 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S +++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S @@ -8,7 +8,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(ArmReadMidr)
mrc p15,0,R0,c0,c0,0
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S index d843f91dfc..d207876a21 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S +++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S @@ -8,7 +8,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(ArmIsMpCore)
mrc p15,0,R0,c0,c0,5
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S index 7abaa79639..2ad9b480d1 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S +++ b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimerSupport.S @@ -7,7 +7,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(ArmReadCntFrq)
mrc p15, 0, r0, c14, c0, 0 @ Read CNTFRQ
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S index 1f396adffc..70b27da70c 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S +++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Support.S @@ -8,7 +8,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.set DC_ON, (0x1<<2)
.set IC_ON, (0x1<<12)
diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S index 0332cf7ce1..9720414154 100644 --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibReplaceEntry.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
.set CTRL_M_BIT, (1 << 0)
diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibV7Support.S b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibV7Support.S index a97e3fabb2..05f553aba6 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibV7Support.S +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibV7Support.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.text
.align 2
diff --git a/ArmPkg/Library/ArmMonitorLib/AArch64/ArmMonitorLib.S b/ArmPkg/Library/ArmMonitorLib/AArch64/ArmMonitorLib.S index a99adf00ad..6ca1be5ba8 100644 --- a/ArmPkg/Library/ArmMonitorLib/AArch64/ArmMonitorLib.S +++ b/ArmPkg/Library/ArmMonitorLib/AArch64/ArmMonitorLib.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
/** Monitor call.
diff --git a/ArmPkg/Library/ArmMonitorLib/Arm/ArmMonitorLib.S b/ArmPkg/Library/ArmMonitorLib/Arm/ArmMonitorLib.S index 9029059cf4..f3605cb8d9 100644 --- a/ArmPkg/Library/ArmMonitorLib/Arm/ArmMonitorLib.S +++ b/ArmPkg/Library/ArmMonitorLib/Arm/ArmMonitorLib.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
/** Monitor call.
diff --git a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S index 4a8c2a8f59..a4443a41fe 100644 --- a/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S +++ b/ArmPkg/Library/ArmSmcLib/AArch64/ArmSmc.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(ArmCallSmc)
// Push x0 on the stack - The stack must always be quad-word aligned
diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S index d218e7e709..4b3d0db697 100644 --- a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S +++ b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.arch_extension sec
diff --git a/ArmPkg/Library/ArmSvcLib/AArch64/ArmSvc.S b/ArmPkg/Library/ArmSvcLib/AArch64/ArmSvc.S index bdba9d7fe9..6bcb10e88a 100644 --- a/ArmPkg/Library/ArmSvcLib/AArch64/ArmSvc.S +++ b/ArmPkg/Library/ArmSvcLib/AArch64/ArmSvc.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
.text
.align 3
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/ashlti3.S b/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/ashlti3.S index c2e20069b4..77348a0cff 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/ashlti3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/ashlti3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__ashlti3)
# return if shift is 0
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S index dee659b663..f5f14509c5 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__ashldi3)
cmp r2, #31
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S index d60c1c64fe..855497e7d1 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__ashrdi3)
cmp r2, #31
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S index 493392a9f9..54a7f3cd83 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__clzsi2)
@ frame_needed = 1, uses_anonymous_args = 0
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S index 5b21ec749e..d1ff500d5d 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__ctzsi2)
uxth r3, r0
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S index f809a7dfef..c1c3c77b25 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__divdi3)
@ args = 0, pretend = 0, frame = 0
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S index 45c0fcc3f7..eb4c30f6a2 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__divsi3)
eor r3, r0, r0, asr #31
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S index feeea9edd1..27201de4be 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#
#UINT64
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S index 9f4dddad79..15c99c5099 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S @@ -6,7 +6,7 @@ //
//------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
//
// A pair of (unsigned) long longs is returned in {{r0, r1}, {r2, r3}},
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S index cc63a15b3c..d0a4acd8bd 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#
#VOID
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S index 246d5651e8..af6fd27028 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#VOID
#EFIAPI
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S index 829d8deb07..288573c855 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__lshrdi3)
cmp r2, #31
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S index f9f1932c6d..d8588d3d98 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
# VOID
# EFIAPI
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S index faf077dc6b..e208f8fd28 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__moddi3)
stmfd sp!, {r4, r5, r7, lr}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S index b3299851bd..d67f88f717 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__modsi3)
stmfd sp!, {r4, r5, r7, lr}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S index adee64782e..6fdc527ecc 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__muldi3)
stmfd sp!, {r4, r5, r6, r7, lr}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S index e6d55673cb..32870878b3 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S @@ -7,7 +7,7 @@ #**/
#
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.syntax unified
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S index fbf72dd5f1..040d65d6dc 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S @@ -7,7 +7,7 @@ #**/
#
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.syntax unified
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S index aea048f4fb..08fec9a8a0 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S @@ -7,7 +7,7 @@ #**/
#
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.syntax unified
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S index 22aeacdeca..a94b368ef9 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S @@ -7,7 +7,7 @@ #**/
#
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.syntax unified
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S index 681e3cf6e9..8d199fb0e2 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__ucmpdi2)
stmfd sp!, {r4, r5, r8, lr}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S index 505ae545f1..ccb6f6c6c0 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__udivdi3)
stmfd sp!, {r7, lr}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S index a74db6fad1..edee8fc336 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.syntax unified
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S index e1f7da782a..100a6a00d8 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
.syntax unified
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S index 3f26e2c5c8..b22a785e08 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__umoddi3)
stmfd sp!, {r7, lr}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S index b48b25b7dc..ee548afe17 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(__umodsi3)
stmfd sp!, {r4, r5, r7, lr}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S index e8a1dbad86..132975c6a1 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#
#UINT32
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S index 9432ac4317..2c56ba3e06 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#
#UINT32
diff --git a/ArmPkg/Library/SemihostLib/AArch64/GccSemihost.S b/ArmPkg/Library/SemihostLib/AArch64/GccSemihost.S index a443075639..10ecbcade6 100644 --- a/ArmPkg/Library/SemihostLib/AArch64/GccSemihost.S +++ b/ArmPkg/Library/SemihostLib/AArch64/GccSemihost.S @@ -7,7 +7,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(GccSemihostCall)
hlt #0xf000
diff --git a/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S b/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S index d6f81ec2c9..da02a1f1cf 100644 --- a/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S +++ b/ArmPkg/Library/SemihostLib/Arm/GccSemihost.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
/*
Semihosting operation request mechanism
diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S b/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S index 1eeb7fed6f..873729343c 100644 --- a/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S +++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/AArch64/ArmPlatformHelper.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#include <Library/ArmLib.h>
ASM_FUNC(ArmPlatformPeiBootAction)
diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S index 342d6d5e0a..0e11c34af5 100644 --- a/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S +++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/Arm/ArmPlatformHelper.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#include <Library/ArmLib.h>
ASM_FUNC(ArmPlatformPeiBootAction)
diff --git a/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S index efb6c5ade9..7263ee9374 100644 --- a/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PeilessSec/AArch64/ModuleEntryPoint.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions
diff --git a/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S index ab5b023fa9..fc28939afe 100644 --- a/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PeilessSec/Arm/ModuleEntryPoint.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#include <Arm/AArch32.h>
diff --git a/ArmPlatformPkg/Sec/AArch64/Exception.S b/ArmPlatformPkg/Sec/AArch64/Exception.S index d0d6bc44f7..433761e3eb 100644 --- a/ArmPlatformPkg/Sec/AArch64/Exception.S +++ b/ArmPlatformPkg/Sec/AArch64/Exception.S @@ -6,7 +6,7 @@ #
#include <AArch64/AArch64.h>
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#include <Base.h>
#include <AutoGen.h>
diff --git a/ArmPlatformPkg/Sec/AArch64/Helper.S b/ArmPlatformPkg/Sec/AArch64/Helper.S index 9b81b96a49..c784c4a1cd 100644 --- a/ArmPlatformPkg/Sec/AArch64/Helper.S +++ b/ArmPlatformPkg/Sec/AArch64/Helper.S @@ -5,7 +5,7 @@ #
#=======================================================================================
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#include <AArch64/AArch64.h>
// Setup EL1 while in EL1
diff --git a/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S b/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S index 7addae6cff..154be1111d 100644 --- a/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S +++ b/ArmPlatformPkg/Sec/AArch64/ModuleEntryPoint.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions
diff --git a/ArmPlatformPkg/Sec/AArch64/SwitchStack.S b/ArmPlatformPkg/Sec/AArch64/SwitchStack.S index 308b8764fc..7074040435 100644 --- a/ArmPlatformPkg/Sec/AArch64/SwitchStack.S +++ b/ArmPlatformPkg/Sec/AArch64/SwitchStack.S @@ -8,7 +8,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
#/**
# This allows the caller to switch the stack and return
diff --git a/ArmPlatformPkg/Sec/Arm/Exception.S b/ArmPlatformPkg/Sec/Arm/Exception.S index 956ae84714..364b512604 100644 --- a/ArmPlatformPkg/Sec/Arm/Exception.S +++ b/ArmPlatformPkg/Sec/Arm/Exception.S @@ -5,7 +5,7 @@ #
#
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#include <Base.h>
#include <AutoGen.h>
diff --git a/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S index b3c67234e9..1207497dc7 100644 --- a/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S +++ b/ArmPlatformPkg/Sec/Arm/ModuleEntryPoint.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions
diff --git a/ArmPlatformPkg/Sec/Arm/SwitchStack.S b/ArmPlatformPkg/Sec/Arm/SwitchStack.S index d64772b8ed..028ee26e89 100644 --- a/ArmPlatformPkg/Sec/Arm/SwitchStack.S +++ b/ArmPlatformPkg/Sec/Arm/SwitchStack.S @@ -6,7 +6,7 @@ #
#------------------------------------------------------------------------------
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
#/**
# This allows the caller to switch the stack and return
diff --git a/ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S b/ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S index bdb460c7ee..f20395c38b 100644 --- a/ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S +++ b/ArmVirtPkg/Library/ArmPlatformLibQemu/AArch64/ArmPlatformHelper.S @@ -5,7 +5,7 @@ //
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
.macro mov_i, reg:req, imm:req
movz \reg, :abs_g1:\imm
diff --git a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S index fc06c28daa..06a0020f25 100644 --- a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S +++ b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S @@ -6,7 +6,7 @@ //
//
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
//
diff --git a/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S index f0536c65eb..cfb5de864f 100644 --- a/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S +++ b/ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S @@ -6,7 +6,7 @@ //
//
-#include <AsmMacroIoLib.h>
+#include <AsmMacroLib.h>
ASM_FUNC(_ModuleEntryPoint)
// Do early platform specific actions
diff --git a/ArmPkg/Include/AsmMacroIoLibV8.h b/MdePkg/Include/AArch64/AsmMacroLib.h index a5c8635840..a5c8635840 100644 --- a/ArmPkg/Include/AsmMacroIoLibV8.h +++ b/MdePkg/Include/AArch64/AsmMacroLib.h diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/MdePkg/Include/Arm/AsmMacroLib.h index 2493a15b7b..2493a15b7b 100644 --- a/ArmPkg/Include/AsmMacroIoLib.h +++ b/MdePkg/Include/Arm/AsmMacroLib.h |