From 85c25283ed338da9485e16918e6e21d8212efa76 Mon Sep 17 00:00:00 2001 From: eric_tian Date: Thu, 31 Jul 2008 06:23:32 +0000 Subject: [PATCH] Gcc cleanup for baselib & basememorylib in mdepkg/library/ git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5587 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Library/BaseLib/X64/CpuBreakpoint.S | 4 +-- MdePkg/Library/BaseLib/X64/CpuId.S | 4 +-- MdePkg/Library/BaseLib/X64/CpuIdEx.S | 4 +-- MdePkg/Library/BaseLib/X64/CpuPause.S | 4 +-- MdePkg/Library/BaseLib/X64/CpuSleep.S | 4 +-- .../Library/BaseLib/X64/DisableInterrupts.S | 4 +-- MdePkg/Library/BaseLib/X64/DisablePaging64.S | 4 +-- .../BaseLib/X64/EnableDisableInterrupts.S | 6 ++-- MdePkg/Library/BaseLib/X64/EnableInterrupts.S | 4 +-- MdePkg/Library/BaseLib/X64/EnablePaging64.S | 4 +-- MdePkg/Library/BaseLib/X64/FlushCacheLine.S | 4 +-- MdePkg/Library/BaseLib/X64/FxRestore.S | 4 +-- MdePkg/Library/BaseLib/X64/FxSave.S | 4 +-- .../X64/InterlockedCompareExchange32.S | 4 +-- .../X64/InterlockedCompareExchange64.S | 6 ++-- .../BaseLib/X64/InterlockedDecrement.S | 4 +-- .../BaseLib/X64/InterlockedIncrement.S | 4 +-- MdePkg/Library/BaseLib/X64/Invd.S | 4 +-- MdePkg/Library/BaseLib/X64/LongJump.S | 4 +-- MdePkg/Library/BaseLib/X64/Monitor.S | 6 ++-- MdePkg/Library/BaseLib/X64/Mwait.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadCr0.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadCr2.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadCr3.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadCr4.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadCs.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadDr0.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadDr1.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadDr2.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadDr3.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadDr4.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadDr5.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadDr6.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadDr7.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadDs.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadEflags.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadEs.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadFs.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadGdtr.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadGs.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadIdtr.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadLdtr.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadMm0.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadMm1.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadMm2.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadMm3.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadMm4.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadMm5.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadMm6.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadMm7.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadMsr64.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadPmc.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadSs.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadTr.S | 6 ++-- MdePkg/Library/BaseLib/X64/ReadTsc.S | 6 ++-- MdePkg/Library/BaseLib/X64/SetJump.S | 8 +++--- MdePkg/Library/BaseLib/X64/SwitchStack.S | 10 +++---- MdePkg/Library/BaseLib/X64/Wbinvd.S | 6 ++-- MdePkg/Library/BaseLib/X64/WriteCr0.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteCr2.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteCr3.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteCr4.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteDr0.S | 6 ++-- MdePkg/Library/BaseLib/X64/WriteDr1.S | 6 ++-- MdePkg/Library/BaseLib/X64/WriteDr2.S | 6 ++-- MdePkg/Library/BaseLib/X64/WriteDr3.S | 6 ++-- MdePkg/Library/BaseLib/X64/WriteDr4.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteDr5.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteDr6.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteDr7.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteGdtr.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteIdtr.S | 6 ++-- MdePkg/Library/BaseLib/X64/WriteLdtr.S | 6 ++-- MdePkg/Library/BaseLib/X64/WriteMm0.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteMm1.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteMm2.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteMm3.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteMm4.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteMm5.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteMm6.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteMm7.S | 4 +-- MdePkg/Library/BaseLib/X64/WriteMsr64.S | 6 ++-- .../BaseMemoryLibOptDxe/Ia32/CompareMem.S | 4 +-- .../BaseMemoryLibOptDxe/Ia32/CopyMem.S | 4 +-- .../BaseMemoryLibOptDxe/Ia32/ScanMem16.S | 4 +-- .../BaseMemoryLibOptDxe/Ia32/ScanMem32.S | 4 +-- .../BaseMemoryLibOptDxe/Ia32/ScanMem64.S | 4 +-- .../BaseMemoryLibOptDxe/Ia32/ScanMem8.S | 4 +-- .../Library/BaseMemoryLibOptDxe/Ia32/SetMem.S | 18 ++++++------ .../BaseMemoryLibOptDxe/Ia32/SetMem16.S | 4 +-- .../BaseMemoryLibOptDxe/Ia32/SetMem32.S | 4 +-- .../BaseMemoryLibOptDxe/Ia32/SetMem64.S | 4 +-- .../BaseMemoryLibOptDxe/Ia32/ZeroMem.S | 4 +-- .../BaseMemoryLibOptPei/Ia32/CompareMem.S | 4 +-- .../BaseMemoryLibOptPei/Ia32/CopyMem.S | 28 +++++++++---------- .../BaseMemoryLibOptPei/Ia32/ScanMem16.S | 4 +-- .../BaseMemoryLibOptPei/Ia32/ScanMem32.S | 4 +-- .../BaseMemoryLibOptPei/Ia32/ScanMem64.S | 4 +-- .../BaseMemoryLibOptPei/Ia32/ScanMem8.S | 4 +-- .../Library/BaseMemoryLibOptPei/Ia32/SetMem.S | 23 ++++++--------- .../BaseMemoryLibOptPei/Ia32/SetMem16.S | 4 +-- .../BaseMemoryLibOptPei/Ia32/SetMem32.S | 4 +-- .../BaseMemoryLibOptPei/Ia32/SetMem64.S | 4 +-- .../BaseMemoryLibOptPei/Ia32/ZeroMem.S | 4 +-- 104 files changed, 285 insertions(+), 290 deletions(-) diff --git a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.S b/MdePkg/Library/BaseLib/X64/CpuBreakpoint.S index 710006bdd1..a4ac2f16f7 100644 --- a/MdePkg/Library/BaseLib/X64/CpuBreakpoint.S +++ b/MdePkg/Library/BaseLib/X64/CpuBreakpoint.S @@ -19,7 +19,7 @@ # #------------------------------------------------------------------------------ -.global _CpuBreakpoint -_CpuBreakpoint: +.global ASM_PFX(CpuBreakpoint) +ASM_PFX(CpuBreakpoint): int $0x3 ret diff --git a/MdePkg/Library/BaseLib/X64/CpuId.S b/MdePkg/Library/BaseLib/X64/CpuId.S index 98d7faaa06..bd0d8d0ae3 100644 --- a/MdePkg/Library/BaseLib/X64/CpuId.S +++ b/MdePkg/Library/BaseLib/X64/CpuId.S @@ -32,8 +32,8 @@ # OUT UINT32 *RegisterOutEdx OPTIONAL # ) #------------------------------------------------------------------------------ -.global _AsmCpuid; -_AsmCpuid: +.global ASM_PFX(AsmCpuid) +ASM_PFX(AsmCpuid): push %rbx mov %ecx, %eax push %rax # save Index on stack diff --git a/MdePkg/Library/BaseLib/X64/CpuIdEx.S b/MdePkg/Library/BaseLib/X64/CpuIdEx.S index e5317e04cb..d7154eb4fc 100644 --- a/MdePkg/Library/BaseLib/X64/CpuIdEx.S +++ b/MdePkg/Library/BaseLib/X64/CpuIdEx.S @@ -33,8 +33,8 @@ # OUT UINT32 *RegisterOutEdx OPTIONAL # ) #------------------------------------------------------------------------------ -.global _AsmCpuidEx -_AsmCpuidEx: +.global ASM_PFX(AsmCpuidEx) +ASM_PFX(AsmCpuidEx): push %rbx movl %ecx,%eax movl %edx,%ecx diff --git a/MdePkg/Library/BaseLib/X64/CpuPause.S b/MdePkg/Library/BaseLib/X64/CpuPause.S index 0ecaa85b61..f71fdec354 100644 --- a/MdePkg/Library/BaseLib/X64/CpuPause.S +++ b/MdePkg/Library/BaseLib/X64/CpuPause.S @@ -28,7 +28,7 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _CpuPause; -_CpuPause: +.global ASM_PFX(CpuPause) +ASM_PFX(CpuPause): pause ret diff --git a/MdePkg/Library/BaseLib/X64/CpuSleep.S b/MdePkg/Library/BaseLib/X64/CpuSleep.S index 681e4c12c3..658cb1aeff 100644 --- a/MdePkg/Library/BaseLib/X64/CpuSleep.S +++ b/MdePkg/Library/BaseLib/X64/CpuSleep.S @@ -28,7 +28,7 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _CpuSleep; -_CpuSleep: +.global ASM_PFX(CpuSleep) +ASM_PFX(CpuSleep): hlt ret diff --git a/MdePkg/Library/BaseLib/X64/DisableInterrupts.S b/MdePkg/Library/BaseLib/X64/DisableInterrupts.S index da16886b8b..eff3ccc3c7 100644 --- a/MdePkg/Library/BaseLib/X64/DisableInterrupts.S +++ b/MdePkg/Library/BaseLib/X64/DisableInterrupts.S @@ -29,7 +29,7 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _DisableInterrupts; -_DisableInterrupts: +.global ASM_PFX(DisableInterrupts) +ASM_PFX(DisableInterrupts): cli ret diff --git a/MdePkg/Library/BaseLib/X64/DisablePaging64.S b/MdePkg/Library/BaseLib/X64/DisablePaging64.S index d23313de38..4ca4145fa2 100644 --- a/MdePkg/Library/BaseLib/X64/DisablePaging64.S +++ b/MdePkg/Library/BaseLib/X64/DisablePaging64.S @@ -35,8 +35,8 @@ # ); #------------------------------------------------------------------------------ -.global _InternalX86DisablePaging64 -_InternalX86DisablePaging64: +.global ASM_PFX(InternalX86DisablePaging64) +ASM_PFX(InternalX86DisablePaging64): cli shl $0x20,%rcx lea (%rip), %eax diff --git a/MdePkg/Library/BaseLib/X64/EnableDisableInterrupts.S b/MdePkg/Library/BaseLib/X64/EnableDisableInterrupts.S index 581b7bb345..d87d778cd2 100644 --- a/MdePkg/Library/BaseLib/X64/EnableDisableInterrupts.S +++ b/MdePkg/Library/BaseLib/X64/EnableDisableInterrupts.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _EnableDisableInterrupts; -.align 16; -_EnableDisableInterrupts: +.global ASM_PFX(EnableDisableInterrupts) +.align 16 +ASM_PFX(EnableDisableInterrupts): sti cli ret diff --git a/MdePkg/Library/BaseLib/X64/EnableInterrupts.S b/MdePkg/Library/BaseLib/X64/EnableInterrupts.S index b81bcd0747..220976fe20 100644 --- a/MdePkg/Library/BaseLib/X64/EnableInterrupts.S +++ b/MdePkg/Library/BaseLib/X64/EnableInterrupts.S @@ -29,7 +29,7 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _EnableInterrupts; -_EnableInterrupts: +.global ASM_PFX(EnableInterrupts) +ASM_PFX(EnableInterrupts): sti ret diff --git a/MdePkg/Library/BaseLib/X64/EnablePaging64.S b/MdePkg/Library/BaseLib/X64/EnablePaging64.S index 15209c0030..452bd39acc 100644 --- a/MdePkg/Library/BaseLib/X64/EnablePaging64.S +++ b/MdePkg/Library/BaseLib/X64/EnablePaging64.S @@ -33,8 +33,8 @@ # IN UINT64 NewStack %r8 # ); #------------------------------------------------------------------------------ -.global _InternalX86EnablePaging64; -_InternalX86EnablePaging64: +.global ASM_PFX(InternalX86EnablePaging64) +ASM_PFX(InternalX86EnablePaging64): cli pop %rax callq Base diff --git a/MdePkg/Library/BaseLib/X64/FlushCacheLine.S b/MdePkg/Library/BaseLib/X64/FlushCacheLine.S index 4c5a52fbf5..0d05d41f65 100644 --- a/MdePkg/Library/BaseLib/X64/FlushCacheLine.S +++ b/MdePkg/Library/BaseLib/X64/FlushCacheLine.S @@ -29,8 +29,8 @@ # IN VOID *LinearAddress # ); #------------------------------------------------------------------------------ -.global _AsmFlushCacheLine; -_AsmFlushCacheLine: +.global ASM_PFX(AsmFlushCacheLine) +ASM_PFX(AsmFlushCacheLine): clflush (%rdi) mov %rdi, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/FxRestore.S b/MdePkg/Library/BaseLib/X64/FxRestore.S index cc9750c57c..4497fe6f48 100644 --- a/MdePkg/Library/BaseLib/X64/FxRestore.S +++ b/MdePkg/Library/BaseLib/X64/FxRestore.S @@ -29,7 +29,7 @@ # IN CONST IA32_FX_BUFFER *Buffer # )# #------------------------------------------------------------------------------ -.global _InternalX86FxRestore; -_InternalX86FxRestore: +.global ASM_PFX(InternalX86FxRestore) +ASM_PFX(InternalX86FxRestore): fxrstor (%rcx) ret diff --git a/MdePkg/Library/BaseLib/X64/FxSave.S b/MdePkg/Library/BaseLib/X64/FxSave.S index 432d7b9c13..0e8e1fc2d7 100644 --- a/MdePkg/Library/BaseLib/X64/FxSave.S +++ b/MdePkg/Library/BaseLib/X64/FxSave.S @@ -29,7 +29,7 @@ # OUT IA32_FX_BUFFER *Buffer # ); #------------------------------------------------------------------------------ -.global _InternalX86FxSave; -_InternalX86FxSave: +.global ASM_PFX(InternalX86FxSave) +ASM_PFX(InternalX86FxSave): fxsave (%rcx) ret diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.S b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.S index cd85279c73..d248a10369 100644 --- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.S +++ b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange32.S @@ -30,8 +30,8 @@ # IN UINT32 ExchangeValue # ); #------------------------------------------------------------------------------ -.global _InternalSyncCompareExchange32; -_InternalSyncCompareExchange32: +.global ASM_PFX(InternalSyncCompareExchange32) +ASM_PFX(InternalSyncCompareExchange32): mov %edx, %eax lock cmpxchg %r8d, (%rcx) ret diff --git a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.S b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.S index ae27964292..95f9d0501b 100644 --- a/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.S +++ b/MdePkg/Library/BaseLib/X64/InterlockedCompareExchange64.S @@ -31,9 +31,9 @@ # IN UINT64 ExchangeValue # ); #------------------------------------------------------------------------------ -.global _InternalSyncCompareExchange64; -.align 16; -_InternalSyncCompareExchange64: +.global ASM_PFX(InternalSyncCompareExchange64) +.align 16 +ASM_PFX(InternalSyncCompareExchange64): mov %rsi, %rax lock cmpxchg %rdx,(%rdi) ret diff --git a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.S b/MdePkg/Library/BaseLib/X64/InterlockedDecrement.S index 59ca54bb9f..c3075bf902 100644 --- a/MdePkg/Library/BaseLib/X64/InterlockedDecrement.S +++ b/MdePkg/Library/BaseLib/X64/InterlockedDecrement.S @@ -29,8 +29,8 @@ # IN UINT32 *Value # ); #------------------------------------------------------------------------------ -.global _InternalSyncDecrement; -_InternalSyncDecrement: +.global ASM_PFX(InternalSyncDecrement) +ASM_PFX(InternalSyncDecrement): lock decl (%rcx) mov (%rcx), %eax ret diff --git a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.S b/MdePkg/Library/BaseLib/X64/InterlockedIncrement.S index df4cb974b6..6b95ed429f 100644 --- a/MdePkg/Library/BaseLib/X64/InterlockedIncrement.S +++ b/MdePkg/Library/BaseLib/X64/InterlockedIncrement.S @@ -29,8 +29,8 @@ # IN UINT32 *Value # ); #------------------------------------------------------------------------------ -.global _InternalSyncIncrement; -_InternalSyncIncrement: +.global ASM_PFX(InternalSyncIncrement) +ASM_PFX(InternalSyncIncrement): lock incl (%rcx) mov (%rcx), %eax ret diff --git a/MdePkg/Library/BaseLib/X64/Invd.S b/MdePkg/Library/BaseLib/X64/Invd.S index 030ae454e6..fc1cad6e59 100644 --- a/MdePkg/Library/BaseLib/X64/Invd.S +++ b/MdePkg/Library/BaseLib/X64/Invd.S @@ -29,7 +29,7 @@ # VOID # )# #------------------------------------------------------------------------------ -.global _AsmInvd; -_AsmInvd: +.global ASM_PFX(AsmInvd) +ASM_PFX(AsmInvd): invd ret diff --git a/MdePkg/Library/BaseLib/X64/LongJump.S b/MdePkg/Library/BaseLib/X64/LongJump.S index 1a6f859c8e..1d6a916e04 100644 --- a/MdePkg/Library/BaseLib/X64/LongJump.S +++ b/MdePkg/Library/BaseLib/X64/LongJump.S @@ -27,8 +27,8 @@ # IN UINTN Value # ); #------------------------------------------------------------------------------ -.global _InternalLongJump -_InternalLongJump: +.global ASM_PFX(InternalLongJump) +ASM_PFX(InternalLongJump): mov (%rcx), %rbx mov 0x8(%rcx), %rsp mov 0x10(%rcx), %rbp diff --git a/MdePkg/Library/BaseLib/X64/Monitor.S b/MdePkg/Library/BaseLib/X64/Monitor.S index 13da27d8ad..f31cbeb7f7 100644 --- a/MdePkg/Library/BaseLib/X64/Monitor.S +++ b/MdePkg/Library/BaseLib/X64/Monitor.S @@ -31,9 +31,9 @@ # IN UINTN Edx # ); #------------------------------------------------------------------------------ -.global _AsmMonitor; -.align 16; -_AsmMonitor: +.global ASM_PFX(AsmMonitor) +.align 16 +ASM_PFX(AsmMonitor): mov %ecx,%eax mov %edx,%ecx mov %r8d,%edx diff --git a/MdePkg/Library/BaseLib/X64/Mwait.S b/MdePkg/Library/BaseLib/X64/Mwait.S index a32d004a18..ac5f54900f 100644 --- a/MdePkg/Library/BaseLib/X64/Mwait.S +++ b/MdePkg/Library/BaseLib/X64/Mwait.S @@ -30,9 +30,9 @@ # IN UINTN Ecx # ); #------------------------------------------------------------------------------ -.global _AsmMwait; -.align 16; -_AsmMwait: +.global ASM_PFX(AsmMwait) +.align 16 +ASM_PFX(AsmMwait): mov %ecx,%eax mov %edx,%ecx mwait %rax,%rcx diff --git a/MdePkg/Library/BaseLib/X64/ReadCr0.S b/MdePkg/Library/BaseLib/X64/ReadCr0.S index fa916d09fb..723869ad56 100644 --- a/MdePkg/Library/BaseLib/X64/ReadCr0.S +++ b/MdePkg/Library/BaseLib/X64/ReadCr0.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadCr0; -.align 16; -_AsmReadCr0: +.global ASM_PFX(AsmReadCr0) +.align 16 +ASM_PFX(AsmReadCr0): mov %cr0, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadCr2.S b/MdePkg/Library/BaseLib/X64/ReadCr2.S index 96361bef72..e286cdcab4 100644 --- a/MdePkg/Library/BaseLib/X64/ReadCr2.S +++ b/MdePkg/Library/BaseLib/X64/ReadCr2.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadCr2; -.align 16; -_AsmReadCr2: +.global ASM_PFX(AsmReadCr2 +.align 16 +ASM_PFX(AsmReadCr2): mov %cr2, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadCr3.S b/MdePkg/Library/BaseLib/X64/ReadCr3.S index 480486f093..6de241b395 100644 --- a/MdePkg/Library/BaseLib/X64/ReadCr3.S +++ b/MdePkg/Library/BaseLib/X64/ReadCr3.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadCr3; -.align 16; -_AsmReadCr3: +.global ASM_PFX(AsmReadCr3) +.align 16 +ASM_PFX(AsmReadCr3): mov %cr3, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadCr4.S b/MdePkg/Library/BaseLib/X64/ReadCr4.S index e89b5cdab6..467ab14ee9 100644 --- a/MdePkg/Library/BaseLib/X64/ReadCr4.S +++ b/MdePkg/Library/BaseLib/X64/ReadCr4.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadCr4; -.align 16; -_AsmReadCr4: +.global ASM_PFX(AsmReadCr4) +.align 16 +ASM_PFX(AsmReadCr4): mov %cr4, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadCs.S b/MdePkg/Library/BaseLib/X64/ReadCs.S index 677747b813..88ad7da4f8 100644 --- a/MdePkg/Library/BaseLib/X64/ReadCs.S +++ b/MdePkg/Library/BaseLib/X64/ReadCs.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadCs; -.align 16; -_AsmReadCs: +.global ASM_PFX(AsmReadCs) +.align 16 +ASM_PFX(AsmReadCs): mov %cs, %eax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadDr0.S b/MdePkg/Library/BaseLib/X64/ReadDr0.S index 1b441c344d..2e537a4da6 100644 --- a/MdePkg/Library/BaseLib/X64/ReadDr0.S +++ b/MdePkg/Library/BaseLib/X64/ReadDr0.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadDr0; -.align 16; -_AsmReadDr0: +.global ASM_PFX(AsmReadDr0) +.align 16 +ASM_PFX(AsmReadDr0): mov %dr0, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadDr1.S b/MdePkg/Library/BaseLib/X64/ReadDr1.S index 5151a80d9c..6295c4bc02 100644 --- a/MdePkg/Library/BaseLib/X64/ReadDr1.S +++ b/MdePkg/Library/BaseLib/X64/ReadDr1.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadDr1; -.align 16; -_AsmReadDr1: +.global ASM_PFX(AsmReadDr1) +.align 16 +ASM_PFX(AsmReadDr1): mov %dr1, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadDr2.S b/MdePkg/Library/BaseLib/X64/ReadDr2.S index f4516afd4d..2942e5c775 100644 --- a/MdePkg/Library/BaseLib/X64/ReadDr2.S +++ b/MdePkg/Library/BaseLib/X64/ReadDr2.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadDr2; -.align 16; -_AsmReadDr2: +.global ASM_PFX(AsmReadDr2) +.align 16 +ASM_PFX(AsmReadDr2): mov %dr2, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadDr3.S b/MdePkg/Library/BaseLib/X64/ReadDr3.S index c5c679c96e..9907963414 100644 --- a/MdePkg/Library/BaseLib/X64/ReadDr3.S +++ b/MdePkg/Library/BaseLib/X64/ReadDr3.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadDr3; -.align 16; -_AsmReadDr3: +.global ASM_PFX(AsmReadDr3) +.align 16 +ASM_PFX(AsmReadDr3): mov %dr3, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadDr4.S b/MdePkg/Library/BaseLib/X64/ReadDr4.S index f98c9ed35d..d1bd8ea34f 100644 --- a/MdePkg/Library/BaseLib/X64/ReadDr4.S +++ b/MdePkg/Library/BaseLib/X64/ReadDr4.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadDr4; -.align 16; -_AsmReadDr4: +.global ASM_PFX(AsmReadDr4) +.align 16 +ASM_PFX(AsmReadDr4): #DB 0fh, 21h, 0e0h mov %dr4, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadDr5.S b/MdePkg/Library/BaseLib/X64/ReadDr5.S index 421f57a418..94475addea 100644 --- a/MdePkg/Library/BaseLib/X64/ReadDr5.S +++ b/MdePkg/Library/BaseLib/X64/ReadDr5.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadDr5; -.align 16; -_AsmReadDr5: +.global ASM_PFX(AsmReadDr5) +.align 16 +ASM_PFX(AsmReadDr5): mov %dr5, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadDr6.S b/MdePkg/Library/BaseLib/X64/ReadDr6.S index 6a159d8762..ef0dc71697 100644 --- a/MdePkg/Library/BaseLib/X64/ReadDr6.S +++ b/MdePkg/Library/BaseLib/X64/ReadDr6.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadDr6; -.align 16; -_AsmReadDr6: +.global ASM_PFX(AsmReadDr6) +.align 16 +ASM_PFX(AsmReadDr6): mov %dr6, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadDr7.S b/MdePkg/Library/BaseLib/X64/ReadDr7.S index 9ffb09d13a..60c9ed9c53 100644 --- a/MdePkg/Library/BaseLib/X64/ReadDr7.S +++ b/MdePkg/Library/BaseLib/X64/ReadDr7.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadDr7; -.align 16; -_AsmReadDr7: +.global ASM_PFX(AsmReadDr7) +.align 16 +ASM_PFX(AsmReadDr7): mov %dr7, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadDs.S b/MdePkg/Library/BaseLib/X64/ReadDs.S index 58bee11beb..c9ef401efc 100644 --- a/MdePkg/Library/BaseLib/X64/ReadDs.S +++ b/MdePkg/Library/BaseLib/X64/ReadDs.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadDs; -.align 16; -_AsmReadDs: +.global ASM_PFX(AsmReadDs) +.align 16 +ASM_PFX(AsmReadDs): movl %ds, %eax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadEflags.S b/MdePkg/Library/BaseLib/X64/ReadEflags.S index e895387673..e5bd4bde3e 100644 --- a/MdePkg/Library/BaseLib/X64/ReadEflags.S +++ b/MdePkg/Library/BaseLib/X64/ReadEflags.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadEflags; -.align 16; -_AsmReadEflags: +.global ASM_PFX(AsmReadEflags) +.align 16 +ASM_PFX(AsmReadEflags): pushfq pop %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadEs.S b/MdePkg/Library/BaseLib/X64/ReadEs.S index 93df650371..f98e577f9c 100644 --- a/MdePkg/Library/BaseLib/X64/ReadEs.S +++ b/MdePkg/Library/BaseLib/X64/ReadEs.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadEs; -.align 16; -_AsmReadEs: +.global ASM_PFX(AsmReadEs) +.align 16 +ASM_PFX(AsmReadEs): mov %es, %eax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadFs.S b/MdePkg/Library/BaseLib/X64/ReadFs.S index ff658e1248..28b288f2dd 100644 --- a/MdePkg/Library/BaseLib/X64/ReadFs.S +++ b/MdePkg/Library/BaseLib/X64/ReadFs.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadFs; -.align 16; -_AsmReadFs: +.global ASM_PFX(AsmReadFs) +.align 16 +ASM_PFX(AsmReadFs): mov %fs, %eax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadGdtr.S b/MdePkg/Library/BaseLib/X64/ReadGdtr.S index c271a02d78..08f3fdf3b5 100644 --- a/MdePkg/Library/BaseLib/X64/ReadGdtr.S +++ b/MdePkg/Library/BaseLib/X64/ReadGdtr.S @@ -29,8 +29,8 @@ # OUT IA32_DESCRIPTOR *Gdtr # ); #------------------------------------------------------------------------------ -.global _InternalX86ReadGdtr; -.align 16; -_InternalX86ReadGdtr: +.global ASM_PFX(InternalX86ReadGdtr) +.align 16 +ASM_PFX(InternalX86ReadGdtr): sgdt (%rcx) ret diff --git a/MdePkg/Library/BaseLib/X64/ReadGs.S b/MdePkg/Library/BaseLib/X64/ReadGs.S index f92776c35d..cb119e8989 100644 --- a/MdePkg/Library/BaseLib/X64/ReadGs.S +++ b/MdePkg/Library/BaseLib/X64/ReadGs.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadGs; -.align 16; -_AsmReadGs: +.global ASM_PFX(AsmReadGs) +.align 16 +ASM_PFX(AsmReadGs): mov %gs, %eax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadIdtr.S b/MdePkg/Library/BaseLib/X64/ReadIdtr.S index cd7c09e6b7..04f08e6f11 100644 --- a/MdePkg/Library/BaseLib/X64/ReadIdtr.S +++ b/MdePkg/Library/BaseLib/X64/ReadIdtr.S @@ -29,8 +29,8 @@ # OUT IA32_DESCRIPTOR *Idtr # ); #------------------------------------------------------------------------------ -.global _InternalX86ReadIdtr; -.align 16; -_InternalX86ReadIdtr: +.global ASM_PFX(InternalX86ReadIdtr) +.align 16 +ASM_PFX(InternalX86ReadIdtr): sidt (%rcx) ret diff --git a/MdePkg/Library/BaseLib/X64/ReadLdtr.S b/MdePkg/Library/BaseLib/X64/ReadLdtr.S index fac8e25d74..ed53d8d845 100644 --- a/MdePkg/Library/BaseLib/X64/ReadLdtr.S +++ b/MdePkg/Library/BaseLib/X64/ReadLdtr.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadLdtr; -.align 16; -_AsmReadLdtr: +.global ASM_PFX(AsmReadLdtr) +.align 16 +ASM_PFX(AsmReadLdtr): sldt %eax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadMm0.S b/MdePkg/Library/BaseLib/X64/ReadMm0.S index b5912ca0b4..8af42c7276 100644 --- a/MdePkg/Library/BaseLib/X64/ReadMm0.S +++ b/MdePkg/Library/BaseLib/X64/ReadMm0.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadMm0; -.align 16; -_AsmReadMm0: +.global ASM_PFX(AsmReadMm0) +.align 16 +ASM_PFX(AsmReadMm0: #DB 48h, 0fh, 7eh, 0c0h movd %mm0, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadMm1.S b/MdePkg/Library/BaseLib/X64/ReadMm1.S index 1f26cd4483..6af2b17039 100644 --- a/MdePkg/Library/BaseLib/X64/ReadMm1.S +++ b/MdePkg/Library/BaseLib/X64/ReadMm1.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadMm1; -.align 16; -_AsmReadMm1: +.global ASM_PFX(AsmReadMm1) +.align 16 +ASM_PFX(AsmReadMm1): #DB 48h, 0fh, 7eh, 0c8h movd %mm1, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadMm2.S b/MdePkg/Library/BaseLib/X64/ReadMm2.S index ef864af090..d80ad64eec 100644 --- a/MdePkg/Library/BaseLib/X64/ReadMm2.S +++ b/MdePkg/Library/BaseLib/X64/ReadMm2.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadMm2; -.align 16; -_AsmReadMm2: +.global ASM_PFX(AsmReadMm2) +.align 16 +ASM_PFX(AsmReadMm2): #DB 48h, 0fh, 7eh, 0d0h movd %mm2, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadMm3.S b/MdePkg/Library/BaseLib/X64/ReadMm3.S index bd76cb20a2..7885952ed6 100644 --- a/MdePkg/Library/BaseLib/X64/ReadMm3.S +++ b/MdePkg/Library/BaseLib/X64/ReadMm3.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadMm3; -.align 16; -_AsmReadMm3: +.global ASM_PFX(AsmReadMm3) +.align 16 +ASM_PFX(AsmReadMm3): #DB 48h, 0fh, 7eh, 0d8h movd %mm3, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadMm4.S b/MdePkg/Library/BaseLib/X64/ReadMm4.S index 99d766887c..8c9830cc97 100644 --- a/MdePkg/Library/BaseLib/X64/ReadMm4.S +++ b/MdePkg/Library/BaseLib/X64/ReadMm4.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadMm4; -.align 16; -_AsmReadMm4: +.global ASM_PFX(AsmReadMm4) +.align 16 +ASM_PFX(AsmReadMm4): #DB 48h, 0fh, 7eh, 0e0h movd %mm4, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadMm5.S b/MdePkg/Library/BaseLib/X64/ReadMm5.S index 7a01c53ca5..19f0fa4c5e 100644 --- a/MdePkg/Library/BaseLib/X64/ReadMm5.S +++ b/MdePkg/Library/BaseLib/X64/ReadMm5.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadMm5; -.align 16; -_AsmReadMm5: +.global ASM_PFX(AsmReadMm5) +.align 16 +ASM_PFX(AsmReadMm5): #DB 48h, 0fh, 7eh, 0e8h movd %mm5, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadMm6.S b/MdePkg/Library/BaseLib/X64/ReadMm6.S index 0c7ea79858..49cf4f3626 100644 --- a/MdePkg/Library/BaseLib/X64/ReadMm6.S +++ b/MdePkg/Library/BaseLib/X64/ReadMm6.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadMm6; -.align 16; -_AsmReadMm6: +.global ASM_PFX(AsmReadMm6) +.align 16 +ASM_PFX(AsmReadMm6): #DB 48h, 0fh, 7eh, 0f0h movd %mm6, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadMm7.S b/MdePkg/Library/BaseLib/X64/ReadMm7.S index 68f1dbdd30..94abd776b4 100644 --- a/MdePkg/Library/BaseLib/X64/ReadMm7.S +++ b/MdePkg/Library/BaseLib/X64/ReadMm7.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadMm7; -.align 16; -_AsmReadMm7: +.global ASM_PFX(AsmReadMm7) +.align 16 +ASM_PFX(AsmReadMm7): #DB 48h, 0fh, 7eh, 0f8h movd %mm7, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadMsr64.S b/MdePkg/Library/BaseLib/X64/ReadMsr64.S index ac101cd670..bcb3836943 100644 --- a/MdePkg/Library/BaseLib/X64/ReadMsr64.S +++ b/MdePkg/Library/BaseLib/X64/ReadMsr64.S @@ -29,9 +29,9 @@ # IN UINT32 Index # ); #------------------------------------------------------------------------------ -.global _AsmReadMsr64; -.align 16; -_AsmReadMsr64: +.global ASM_PFX(AsmReadMsr64) +.align 16 +ASM_PFX(AsmReadMsr64): rdmsr # edx & eax are zero extended shl $0x20, %rdx or %rdx, %rax diff --git a/MdePkg/Library/BaseLib/X64/ReadPmc.S b/MdePkg/Library/BaseLib/X64/ReadPmc.S index 115f6335c7..3a75dbc543 100644 --- a/MdePkg/Library/BaseLib/X64/ReadPmc.S +++ b/MdePkg/Library/BaseLib/X64/ReadPmc.S @@ -29,9 +29,9 @@ # IN UINT32 PmcIndex # ); #------------------------------------------------------------------------------ -.global _AsmReadPmc; -.align 16; -_AsmReadPmc: +.global ASM_PFX(AsmReadPmc) +.align 16 +ASM_PFX(AsmReadPmc): rdpmc shl $0x20, %rdx or %rdx, %rax diff --git a/MdePkg/Library/BaseLib/X64/ReadSs.S b/MdePkg/Library/BaseLib/X64/ReadSs.S index a93a7032cf..4e429ad396 100644 --- a/MdePkg/Library/BaseLib/X64/ReadSs.S +++ b/MdePkg/Library/BaseLib/X64/ReadSs.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadSs; -.align 16; -_AsmReadSs: +.global ASM_PFX(AsmReadSs) +.align 16 +ASM_PFX(AsmReadSs): movl %ss, %eax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadTr.S b/MdePkg/Library/BaseLib/X64/ReadTr.S index 5e3146bf27..ce463d2681 100644 --- a/MdePkg/Library/BaseLib/X64/ReadTr.S +++ b/MdePkg/Library/BaseLib/X64/ReadTr.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadTr; -.align 16; -_AsmReadTr: +.global ASM_PFX(AsmReadTr) +.align 16 +ASM_PFX(AsmReadTr): str %eax ret diff --git a/MdePkg/Library/BaseLib/X64/ReadTsc.S b/MdePkg/Library/BaseLib/X64/ReadTsc.S index 776ffc2265..2f47083674 100644 --- a/MdePkg/Library/BaseLib/X64/ReadTsc.S +++ b/MdePkg/Library/BaseLib/X64/ReadTsc.S @@ -29,9 +29,9 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmReadTsc; -.align 16; -_AsmReadTsc: +.global ASM_PFX(AsmReadTsc) +.align 16 +ASM_PFX(AsmReadTsc): rdtsc shl $0x20, %rdx or %rdx, %rax diff --git a/MdePkg/Library/BaseLib/X64/SetJump.S b/MdePkg/Library/BaseLib/X64/SetJump.S index eaaa43bf98..727a2a5c86 100644 --- a/MdePkg/Library/BaseLib/X64/SetJump.S +++ b/MdePkg/Library/BaseLib/X64/SetJump.S @@ -19,12 +19,12 @@ # #------------------------------------------------------------------------------ -.extern InternalAssertJumpBuffer; -.global _SetJump; -_SetJump: +.extern ASM_PFX(InternalAssertJumpBuffer) +.global ASM_PFX(SetJump) +ASM_PFX(SetJump): push %rcx add $0xffffffffffffffe0,%rsp - call _InternalAssertJumpBuffer + call ASM_PFX(InternalAssertJumpBuffer) add $0x20,%rsp pop %rcx pop %rdx diff --git a/MdePkg/Library/BaseLib/X64/SwitchStack.S b/MdePkg/Library/BaseLib/X64/SwitchStack.S index 9aee37b0e9..20c02d5b43 100644 --- a/MdePkg/Library/BaseLib/X64/SwitchStack.S +++ b/MdePkg/Library/BaseLib/X64/SwitchStack.S @@ -35,14 +35,14 @@ # None # #------------------------------------------------------------------------------ -.global _InternalSwitchStack; -_InternalSwitchStack: +.global ASM_PFX(InternalSwitchStack) +ASM_PFX(InternalSwitchStack): mov %rcx, %rax mov %rdx, %rcx mov %r8, %rdx - # - # Reserve space for register parameters (rcx, rdx, r8 & r9) on the stack, - # in case the callee wishes to spill them. + # + # Reserve space for register parameters (rcx, rdx, r8 & r9) on the stack, + # in case the callee wishes to spill them. # lea -0x20(%r9), %rsp call *%rax diff --git a/MdePkg/Library/BaseLib/X64/Wbinvd.S b/MdePkg/Library/BaseLib/X64/Wbinvd.S index a4b9704d2d..d21c8a7549 100644 --- a/MdePkg/Library/BaseLib/X64/Wbinvd.S +++ b/MdePkg/Library/BaseLib/X64/Wbinvd.S @@ -29,8 +29,8 @@ # VOID # ); #------------------------------------------------------------------------------ -.global _AsmWbinvd; -.align 16; -_AsmWbinvd: +.global ASM_PFX(AsmWbinvd) +.align 16 +ASM_PFX(AsmWbinvd): wbinvd ret diff --git a/MdePkg/Library/BaseLib/X64/WriteCr0.S b/MdePkg/Library/BaseLib/X64/WriteCr0.S index f77dc815bf..91976fcfef 100644 --- a/MdePkg/Library/BaseLib/X64/WriteCr0.S +++ b/MdePkg/Library/BaseLib/X64/WriteCr0.S @@ -29,8 +29,8 @@ # UINTN Cr0 # ); #------------------------------------------------------------------------------ -.global _AsmWriteCr0; -_AsmWriteCr0: +.global ASM_PFX(AsmWriteCr0) +ASM_PFX(AsmWriteCr0): mov %rcx,%cr0 mov %rcx,%rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteCr2.S b/MdePkg/Library/BaseLib/X64/WriteCr2.S index 9fc14c605c..3a8eac8556 100644 --- a/MdePkg/Library/BaseLib/X64/WriteCr2.S +++ b/MdePkg/Library/BaseLib/X64/WriteCr2.S @@ -29,8 +29,8 @@ # UINTN Cr2 # ); #------------------------------------------------------------------------------ -.global _AsmWriteCr2; -_AsmWriteCr2: +.global ASM_PFX(AsmWriteCr2) +ASM_PFX(AsmWriteCr2): mov %rcx,%cr2 mov %rcx,%rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteCr3.S b/MdePkg/Library/BaseLib/X64/WriteCr3.S index 880ed9737b..6c28ec649d 100644 --- a/MdePkg/Library/BaseLib/X64/WriteCr3.S +++ b/MdePkg/Library/BaseLib/X64/WriteCr3.S @@ -29,8 +29,8 @@ # UINTN Cr3 # ); #------------------------------------------------------------------------------ -.global _AsmWriteCr3; -_AsmWriteCr3: +.global ASM_PFX(AsmWriteCr3) +ASM_PFX(AsmWriteCr3): mov %rcx,%cr3 mov %rcx,%rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteCr4.S b/MdePkg/Library/BaseLib/X64/WriteCr4.S index 046936352f..b25e178784 100644 --- a/MdePkg/Library/BaseLib/X64/WriteCr4.S +++ b/MdePkg/Library/BaseLib/X64/WriteCr4.S @@ -29,8 +29,8 @@ # UINTN Cr4 # ); #------------------------------------------------------------------------------ -.global _AsmWriteCr4; -_AsmWriteCr4: +.global ASM_PFX(AsmWriteCr4) +ASM_PFX(AsmWriteCr4): mov %rcx,%cr4 mov %rcx,%rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteDr0.S b/MdePkg/Library/BaseLib/X64/WriteDr0.S index 080e56aeb5..1fd9fca561 100644 --- a/MdePkg/Library/BaseLib/X64/WriteDr0.S +++ b/MdePkg/Library/BaseLib/X64/WriteDr0.S @@ -29,9 +29,9 @@ # UINTN Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteDr0; -.align 16; -_AsmWriteDr0: +.global ASM_PFX(AsmWriteDr0) +.align 16 +ASM_PFX(AsmWriteDr0): mov %rcx, %dr0 mov %rcx, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteDr1.S b/MdePkg/Library/BaseLib/X64/WriteDr1.S index c69b5e2bf4..5d75a97151 100644 --- a/MdePkg/Library/BaseLib/X64/WriteDr1.S +++ b/MdePkg/Library/BaseLib/X64/WriteDr1.S @@ -29,9 +29,9 @@ # UINTN Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteDr1; -.align 16; -_AsmWriteDr1: +.global ASM_PFX(AsmWriteDr1) +.align 16 +ASM_PFX(AsmWriteDr1): mov %rcx, %dr1 mov %rcx, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteDr2.S b/MdePkg/Library/BaseLib/X64/WriteDr2.S index ee4b669ea0..bdbaa09d7c 100644 --- a/MdePkg/Library/BaseLib/X64/WriteDr2.S +++ b/MdePkg/Library/BaseLib/X64/WriteDr2.S @@ -29,9 +29,9 @@ # UINTN Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteDr2; -.align 16; -_AsmWriteDr2: +.global ASM_PFX(AsmWriteDr2) +.align 16 +ASM_PFX(AsmWriteDr2): mov %rcx, %dr2 mov %rcx, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteDr3.S b/MdePkg/Library/BaseLib/X64/WriteDr3.S index bcda6c3f0d..555284e321 100644 --- a/MdePkg/Library/BaseLib/X64/WriteDr3.S +++ b/MdePkg/Library/BaseLib/X64/WriteDr3.S @@ -29,9 +29,9 @@ # UINTN Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteDr3; -.align 16; -_AsmWriteDr3: +.global ASM_PFX(AsmWriteDr3) +.align 16 +ASM_PFX(AsmWriteDr3): mov %rcx, %dr3 mov %rcx, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteDr4.S b/MdePkg/Library/BaseLib/X64/WriteDr4.S index b6b4e7821c..116aef9a20 100644 --- a/MdePkg/Library/BaseLib/X64/WriteDr4.S +++ b/MdePkg/Library/BaseLib/X64/WriteDr4.S @@ -29,8 +29,8 @@ # IN UINTN Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteDr4; -_AsmWriteDr4: +.global ASM_PFX(AsmWriteDr4) +ASM_PFX(AsmWriteDr4): mov %rcx, %dr4 mov %rcx, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteDr5.S b/MdePkg/Library/BaseLib/X64/WriteDr5.S index 7539095890..ccd7d209e5 100644 --- a/MdePkg/Library/BaseLib/X64/WriteDr5.S +++ b/MdePkg/Library/BaseLib/X64/WriteDr5.S @@ -29,8 +29,8 @@ # IN UINTN Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteDr5; -_AsmWriteDr5: +.global ASM_PFX(AsmWriteDr5) +ASM_PFX(AsmWriteDr5): mov %rcx, %dr5 mov %rcx, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteDr6.S b/MdePkg/Library/BaseLib/X64/WriteDr6.S index 862726079e..b4dddeefaf 100644 --- a/MdePkg/Library/BaseLib/X64/WriteDr6.S +++ b/MdePkg/Library/BaseLib/X64/WriteDr6.S @@ -29,8 +29,8 @@ # IN UINTN Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteDr6; -_AsmWriteDr6: +.global ASM_PFX(AsmWriteDr6) +ASM_PFX(AsmWriteDr6): mov %rcx, %dr6 mov %rcx, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteDr7.S b/MdePkg/Library/BaseLib/X64/WriteDr7.S index 8699d9536f..466fdef18c 100644 --- a/MdePkg/Library/BaseLib/X64/WriteDr7.S +++ b/MdePkg/Library/BaseLib/X64/WriteDr7.S @@ -29,8 +29,8 @@ # IN UINTN Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteDr7; -_AsmWriteDr7: +.global ASM_PFX(AsmWriteDr7) +ASM_PFX(AsmWriteDr7): mov %rcx, %dr7 mov %rcx, %rax ret diff --git a/MdePkg/Library/BaseLib/X64/WriteGdtr.S b/MdePkg/Library/BaseLib/X64/WriteGdtr.S index 1e9d84b426..d816df5441 100644 --- a/MdePkg/Library/BaseLib/X64/WriteGdtr.S +++ b/MdePkg/Library/BaseLib/X64/WriteGdtr.S @@ -29,7 +29,7 @@ # IN CONST IA32_DESCRIPTOR *Idtr # ); #------------------------------------------------------------------------------ -.global _InternalX86WriteGdtr; -_InternalX86WriteGdtr: +.global ASM_PFX(InternalX86WriteGdtr) +ASM_PFX(InternalX86WriteGdtr): lgdt (%rcx) ret diff --git a/MdePkg/Library/BaseLib/X64/WriteIdtr.S b/MdePkg/Library/BaseLib/X64/WriteIdtr.S index feb085ff58..d3b9018e32 100644 --- a/MdePkg/Library/BaseLib/X64/WriteIdtr.S +++ b/MdePkg/Library/BaseLib/X64/WriteIdtr.S @@ -29,8 +29,8 @@ # IN CONST IA32_DESCRIPTOR *Idtr # ); #------------------------------------------------------------------------------ -.global _InternalX86WriteIdtr; -.align 16; -_InternalX86WriteIdtr: +.global ASM_PFX(InternalX86WriteIdtr) +.align 16 +ASM_PFX(InternalX86WriteIdtr): lidt (%rcx) ret diff --git a/MdePkg/Library/BaseLib/X64/WriteLdtr.S b/MdePkg/Library/BaseLib/X64/WriteLdtr.S index c07ab831f9..82c74813fc 100644 --- a/MdePkg/Library/BaseLib/X64/WriteLdtr.S +++ b/MdePkg/Library/BaseLib/X64/WriteLdtr.S @@ -29,8 +29,8 @@ # IN UINT16 Ldtr # ); #------------------------------------------------------------------------------ -.global _AsmWriteLdtr; -.align 16; -_AsmWriteLdtr: +.global ASM_PFX(AsmWriteLdtr) +.align 16 +ASM_PFX(AsmWriteLdtr): lldt %cx ret diff --git a/MdePkg/Library/BaseLib/X64/WriteMm0.S b/MdePkg/Library/BaseLib/X64/WriteMm0.S index 2d805a14dc..03b0ae09c6 100644 --- a/MdePkg/Library/BaseLib/X64/WriteMm0.S +++ b/MdePkg/Library/BaseLib/X64/WriteMm0.S @@ -29,7 +29,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteMm0; -_AsmWriteMm0: +.global ASM_PFX(AsmWriteMm0) +ASM_PFX(AsmWriteMm0): movd %rcx, %xmm0 ret diff --git a/MdePkg/Library/BaseLib/X64/WriteMm1.S b/MdePkg/Library/BaseLib/X64/WriteMm1.S index ff8162e727..1fe0711e3d 100644 --- a/MdePkg/Library/BaseLib/X64/WriteMm1.S +++ b/MdePkg/Library/BaseLib/X64/WriteMm1.S @@ -29,7 +29,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteMm1; -_AsmWriteMm1: +.global ASM_PFX(AsmWriteMm1) +ASM_PFX(AsmWriteMm1): movd %rcx, %mm1 ret diff --git a/MdePkg/Library/BaseLib/X64/WriteMm2.S b/MdePkg/Library/BaseLib/X64/WriteMm2.S index a98e73650c..d71524e7ce 100644 --- a/MdePkg/Library/BaseLib/X64/WriteMm2.S +++ b/MdePkg/Library/BaseLib/X64/WriteMm2.S @@ -29,7 +29,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteMm2; -_AsmWriteMm2: +.global ASM_PFX(AsmWriteMm2) +ASM_PFX(AsmWriteMm2): movd %rcx, %mm2 ret diff --git a/MdePkg/Library/BaseLib/X64/WriteMm3.S b/MdePkg/Library/BaseLib/X64/WriteMm3.S index 81561e3594..c5747e853b 100644 --- a/MdePkg/Library/BaseLib/X64/WriteMm3.S +++ b/MdePkg/Library/BaseLib/X64/WriteMm3.S @@ -29,7 +29,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteMm3; -_AsmWriteMm3: +.global ASM_PFX(AsmWriteMm3) +ASM_PFX(AsmWriteMm3): movd %rcx, %mm3 ret diff --git a/MdePkg/Library/BaseLib/X64/WriteMm4.S b/MdePkg/Library/BaseLib/X64/WriteMm4.S index 124d946dde..fdeb1ebe90 100644 --- a/MdePkg/Library/BaseLib/X64/WriteMm4.S +++ b/MdePkg/Library/BaseLib/X64/WriteMm4.S @@ -29,7 +29,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteMm4; -_AsmWriteMm4: +.global ASM_PFX(AsmWriteMm4) +ASM_PFX(AsmWriteMm4): movd %rcx, %mm4 ret diff --git a/MdePkg/Library/BaseLib/X64/WriteMm5.S b/MdePkg/Library/BaseLib/X64/WriteMm5.S index 0935ddc0b1..78d4fcba3f 100644 --- a/MdePkg/Library/BaseLib/X64/WriteMm5.S +++ b/MdePkg/Library/BaseLib/X64/WriteMm5.S @@ -29,7 +29,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteMm5; -_AsmWriteMm5: +.global ASM_PFX(AsmWriteMm5) +ASM_PFX(AsmWriteMm5): movd %rcx, %mm5 ret diff --git a/MdePkg/Library/BaseLib/X64/WriteMm6.S b/MdePkg/Library/BaseLib/X64/WriteMm6.S index 02b50cf055..31bb40d422 100644 --- a/MdePkg/Library/BaseLib/X64/WriteMm6.S +++ b/MdePkg/Library/BaseLib/X64/WriteMm6.S @@ -29,7 +29,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteMm6; -_AsmWriteMm6: +.global ASM_PFX(AsmWriteMm6) +ASM_PFX(AsmWriteMm6): movd %rcx, %mm6 ret diff --git a/MdePkg/Library/BaseLib/X64/WriteMm7.S b/MdePkg/Library/BaseLib/X64/WriteMm7.S index 60292721e8..cf4777bd0f 100644 --- a/MdePkg/Library/BaseLib/X64/WriteMm7.S +++ b/MdePkg/Library/BaseLib/X64/WriteMm7.S @@ -29,7 +29,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -.global _AsmWriteMm7; -_AsmWriteMm7: +.global ASM_PFX(AsmWriteMm7) +ASM_PFX(AsmWriteMm7): movd %rcx, %mm7 ret diff --git a/MdePkg/Library/BaseLib/X64/WriteMsr64.S b/MdePkg/Library/BaseLib/X64/WriteMsr64.S index 88ff48bf26..2b0a557128 100644 --- a/MdePkg/Library/BaseLib/X64/WriteMsr64.S +++ b/MdePkg/Library/BaseLib/X64/WriteMsr64.S @@ -31,9 +31,9 @@ # ); # TODO: #------------------------------------------------------------------------------ -.global _AsmWriteMsr64; -.align 16; -_AsmWriteMsr64: +.global ASM_PFX(AsmWriteMsr64) +.align 16 +ASM_PFX(AsmWriteMsr64): mov %rdx, %rax shr $0x20, %rdx wrmsr diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.S index 725367b2f9..2b1014ad42 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemCompareMem +.globl ASM_PFX(InternalMemCompareMem) #------------------------------------------------------------------------------ # INTN @@ -38,7 +38,7 @@ # IN UINTN Length # ); #------------------------------------------------------------------------------ -_InternalMemCompareMem: +ASM_PFX(InternalMemCompareMem): push %esi push %edi movl 12(%esp), %esi diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CopyMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CopyMem.S index ddbcbaf1b1..292b83b2e0 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CopyMem.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CopyMem.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemCopyMem +.globl ASM_PFX(InternalMemCopyMem) #------------------------------------------------------------------------------ # VOID * @@ -32,7 +32,7 @@ # IN UINTN Count # ); #------------------------------------------------------------------------------ -_InternalMemCopyMem: +ASM_PFX(InternalMemCopyMem): push %esi push %edi movl 16(%esp), %esi # esi <- Source diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.S index 5e65b9667a..e944052645 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemScanMem16 +.globl ASM_PFX(InternalMemScanMem16) #------------------------------------------------------------------------------ # CONST VOID * @@ -38,7 +38,7 @@ # IN UINT16 Value # ); #------------------------------------------------------------------------------ -_InternalMemScanMem16: +ASM_PFX(InternalMemScanMem16): push %edi movl 12(%esp), %ecx movl 8(%esp), %edi diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.S index 5d46ed2bc1..00461db1c6 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemScanMem32 +.globl ASM_PFX(InternalMemScanMem32) #------------------------------------------------------------------------------ # CONST VOID * @@ -38,7 +38,7 @@ # IN UINT32 Value # ); #------------------------------------------------------------------------------ -_InternalMemScanMem32: +ASM_PFX(InternalMemScanMem32): push %edi movl 12(%esp), %ecx movl 8(%esp), %edi diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.S index 3ba69650ab..2e5c6ee28b 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemScanMem64 +.globl ASM_PFX(InternalMemScanMem64) #------------------------------------------------------------------------------ # CONST VOID * @@ -38,7 +38,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -_InternalMemScanMem64: +ASM_PFX(InternalMemScanMem64): push %edi movl 12(%esp), %ecx movl 16(%esp), %eax diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.S index 7a834a5635..36f88bfe6f 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemScanMem8 +.globl ASM_PFX(InternalMemScanMem8) #------------------------------------------------------------------------------ # CONST VOID * @@ -38,7 +38,7 @@ # IN UINT8 Value # ); #------------------------------------------------------------------------------ -_InternalMemScanMem8: +ASM_PFX(InternalMemScanMem8): push %edi movl 12(%esp), %ecx movl 8(%esp), %edi diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem.S index c46fde6439..1c56a8d22d 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem.S @@ -24,7 +24,7 @@ .386: .code: -.globl _InternalMemSetMem +.globl ASM_PFX(InternalMemSetMem) #------------------------------------------------------------------------------ # VOID * @@ -34,20 +34,20 @@ # IN UINT8 Value # ) #------------------------------------------------------------------------------ -_InternalMemSetMem: +ASM_PFX(InternalMemSetMem): push %edi movl 12(%esp),%ecx movb 16(%esp),%al - movb %ah, %al + movb %ah, %al shrd $16, %eax, %edx shld $16, %edx, %eax - movl %edx, %ecx + movl %edx, %ecx movl 8(%esp),%edi - shrd $2, %ecx, %ecx - rep - stosl - movl %ecx, %edx - andl $3, %ecx + shrd $2, %ecx, %ecx + rep + stosl + movl %ecx, %edx + andl $3, %ecx rep stosb movl 8(%esp),%eax diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem16.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem16.S index 6e7c136222..86000519ac 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem16.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem16.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemSetMem16 +.globl ASM_PFX(InternalMemSetMem16) #------------------------------------------------------------------------------ # VOID * @@ -31,7 +31,7 @@ # IN UINT16 Value # ) #------------------------------------------------------------------------------ -_InternalMemSetMem16: +ASM_PFX(InternalMemSetMem16): push %edi movl 16(%esp), %eax movl 8(%esp), %edi diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem32.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem32.S index 455af20573..e75bf4d9e6 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem32.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem32.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemSetMem32 +.globl ASM_PFX(InternalMemSetMem32) #------------------------------------------------------------------------------ # VOID * @@ -31,7 +31,7 @@ # IN UINT32 Value # ) #------------------------------------------------------------------------------ -_InternalMemSetMem32: +ASM_PFX(InternalMemSetMem32): push %edi movl 16(%esp),%eax movl 8(%esp),%edi diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem64.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem64.S index b4afff0fd4..3405819d48 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem64.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/SetMem64.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemSetMem64 +.globl ASM_PFX(InternalMemSetMem64) #------------------------------------------------------------------------------ # VOID * @@ -31,7 +31,7 @@ # IN UINT64 Value # ) #------------------------------------------------------------------------------ -_InternalMemSetMem64: +ASM_PFX(InternalMemSetMem64): push %edi movl 12(%esp), %ecx movl 16(%esp), %eax diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ZeroMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ZeroMem.S index 8465d7cf65..d5e6b2f53c 100644 --- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ZeroMem.S +++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ZeroMem.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemZeroMem +.globl ASM_PFX(InternalMemZeroMem) #------------------------------------------------------------------------------ # VOID * @@ -30,7 +30,7 @@ # IN UINTN Count # ); #------------------------------------------------------------------------------ -_InternalMemZeroMem: +ASM_PFX(InternalMemZeroMem): push %edi xorl %eax,%eax movl 8(%esp),%edi diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.S index 725367b2f9..2b1014ad42 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemCompareMem +.globl ASM_PFX(InternalMemCompareMem) #------------------------------------------------------------------------------ # INTN @@ -38,7 +38,7 @@ # IN UINTN Length # ); #------------------------------------------------------------------------------ -_InternalMemCompareMem: +ASM_PFX(InternalMemCompareMem): push %esi push %edi movl 12(%esp), %esi diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CopyMem.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CopyMem.S index 6f19826956..5621f7ee5b 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CopyMem.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CopyMem.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemCopyMem +.globl ASM_PFX(InternalMemCopyMem) #------------------------------------------------------------------------------ # VOID * @@ -32,30 +32,30 @@ # IN UINTN Count # ); #------------------------------------------------------------------------------ -_InternalMemCopyMem: +ASM_PFX(InternalMemCopyMem): push %esi push %edi movl 16(%esp), %esi # esi <- Source movl 12(%esp), %edi # edi <- Destination movl 20(%esp), %edx # edx <- Count - cmpl %esi, %edi - je L_CopyDone + cmpl %esi, %edi + je L_CopyDone cmpl $0, %edx - je L_CopyDone + je L_CopyDone leal -1(%esi, %edx), %eax # eax <- End of Source - cmpl %esi, %edi - jae L_CopyBytes - cmpl %eax, %edi - jb L_CopyBytes # Copy backward if overlapped - movl %esi, %eax # esi <- End of Source + cmpl %edi, %esi + jae L_CopyBytes + cmpl %edi, %eax + jb L_CopyBytes # Copy backward if overlapped + movl %eax, %esi # esi <- End of Source leal -1(%edi, %edx), %edi # edi <- End of Destination - std -L_CopyBytes: - movl %ecx, %edx + std +L_CopyBytes: + movl %edx, %ecx rep movsb # Copy bytes backward cld -L_CopyDone: +L_CopyDone: movl 12(%esp), %eax # eax <- Destination as return value pop %edi pop %esi diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.S index 5e65b9667a..e944052645 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemScanMem16 +.globl ASM_PFX(InternalMemScanMem16) #------------------------------------------------------------------------------ # CONST VOID * @@ -38,7 +38,7 @@ # IN UINT16 Value # ); #------------------------------------------------------------------------------ -_InternalMemScanMem16: +ASM_PFX(InternalMemScanMem16): push %edi movl 12(%esp), %ecx movl 8(%esp), %edi diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.S index 5d46ed2bc1..00461db1c6 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemScanMem32 +.globl ASM_PFX(InternalMemScanMem32) #------------------------------------------------------------------------------ # CONST VOID * @@ -38,7 +38,7 @@ # IN UINT32 Value # ); #------------------------------------------------------------------------------ -_InternalMemScanMem32: +ASM_PFX(InternalMemScanMem32): push %edi movl 12(%esp), %ecx movl 8(%esp), %edi diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.S index 3ba69650ab..2e5c6ee28b 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemScanMem64 +.globl ASM_PFX(InternalMemScanMem64) #------------------------------------------------------------------------------ # CONST VOID * @@ -38,7 +38,7 @@ # IN UINT64 Value # ); #------------------------------------------------------------------------------ -_InternalMemScanMem64: +ASM_PFX(InternalMemScanMem64): push %edi movl 12(%esp), %ecx movl 16(%esp), %eax diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.S index 7a834a5635..36f88bfe6f 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.S @@ -27,7 +27,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemScanMem8 +.globl ASM_PFX(InternalMemScanMem8) #------------------------------------------------------------------------------ # CONST VOID * @@ -38,7 +38,7 @@ # IN UINT8 Value # ); #------------------------------------------------------------------------------ -_InternalMemScanMem8: +ASM_PFX(InternalMemScanMem8): push %edi movl 12(%esp), %ecx movl 8(%esp), %edi diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem.S index aa803ca580..64fdfaff5d 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem.S @@ -21,10 +21,7 @@ # #------------------------------------------------------------------------------ - .386: - .code: - -.globl _InternalMemSetMem +.globl ASM_PFX(InternalMemSetMem) #------------------------------------------------------------------------------ # VOID * @@ -34,22 +31,20 @@ # IN UINT8 Value # ) #------------------------------------------------------------------------------ -_InternalMemSetMem: +ASM_PFX(InternalMemSetMem): push %edi movl 12(%esp),%ecx movb 16(%esp),%al - movb %ah, %al + movb %al, %ah shrd $16, %eax, %edx shld $16, %edx, %eax - movl %edx, %ecx + movl %ecx, %edx movl 8(%esp),%edi - shrd $2, %ecx, %ecx - rep - stosl - movl %ecx, %edx - andl $3, %ecx - rep - stosb + shr $2, %ecx + rep stosl + movl %edx, %ecx + andl $3, %ecx + rep stosb movl 8(%esp),%eax pop %edi ret diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem16.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem16.S index 6e7c136222..86000519ac 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem16.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem16.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemSetMem16 +.globl ASM_PFX(InternalMemSetMem16) #------------------------------------------------------------------------------ # VOID * @@ -31,7 +31,7 @@ # IN UINT16 Value # ) #------------------------------------------------------------------------------ -_InternalMemSetMem16: +ASM_PFX(InternalMemSetMem16): push %edi movl 16(%esp), %eax movl 8(%esp), %edi diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem32.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem32.S index 455af20573..e75bf4d9e6 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem32.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem32.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemSetMem32 +.globl ASM_PFX(InternalMemSetMem32) #------------------------------------------------------------------------------ # VOID * @@ -31,7 +31,7 @@ # IN UINT32 Value # ) #------------------------------------------------------------------------------ -_InternalMemSetMem32: +ASM_PFX(InternalMemSetMem32): push %edi movl 16(%esp),%eax movl 8(%esp),%edi diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem64.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem64.S index b4afff0fd4..3405819d48 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem64.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem64.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemSetMem64 +.globl ASM_PFX(InternalMemSetMem64) #------------------------------------------------------------------------------ # VOID * @@ -31,7 +31,7 @@ # IN UINT64 Value # ) #------------------------------------------------------------------------------ -_InternalMemSetMem64: +ASM_PFX(InternalMemSetMem64): push %edi movl 12(%esp), %ecx movl 16(%esp), %eax diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ZeroMem.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ZeroMem.S index 8465d7cf65..d5e6b2f53c 100644 --- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ZeroMem.S +++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ZeroMem.S @@ -21,7 +21,7 @@ # #------------------------------------------------------------------------------ -.globl _InternalMemZeroMem +.globl ASM_PFX(InternalMemZeroMem) #------------------------------------------------------------------------------ # VOID * @@ -30,7 +30,7 @@ # IN UINTN Count # ); #------------------------------------------------------------------------------ -_InternalMemZeroMem: +ASM_PFX(InternalMemZeroMem): push %edi xorl %eax,%eax movl 8(%esp),%edi -- 2.39.2