add corresponding .S files for BaseMemoryLibXXX X64 arch. Note that we use ".intel_syntax noprefix" directive to simplify the .S implementation.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6184 6f19259b-4bc3-4df7-8a09-765794883524

12 files changed, 45 insertions, 58 deletions

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
index d88db0ff69..7841967821 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+++ b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
@@ -32,6 +32,18 @@
 

 [Sources.common]

   MemLibInternals.h

+  ScanMem64Wrapper.c

+  ScanMem32Wrapper.c

+  ScanMem16Wrapper.c

+  ScanMem8Wrapper.c

+  ZeroMemWrapper.c

+  CompareMemWrapper.c

+  SetMem64Wrapper.c

+  SetMem32Wrapper.c

+  SetMem16Wrapper.c

+  SetMemWrapper.c

+  CopyMemWrapper.c

+  MemLibGuid.c

 

 [Sources.Ia32]

   Ia32/ScanMem64.S

@@ -56,18 +68,6 @@
   Ia32/SetMem16.asm

   Ia32/SetMem.asm

   Ia32/CopyMem.asm

-  ScanMem64Wrapper.c

-  ScanMem32Wrapper.c

-  ScanMem16Wrapper.c

-  ScanMem8Wrapper.c

-  ZeroMemWrapper.c

-  CompareMemWrapper.c

-  SetMem64Wrapper.c

-  SetMem32Wrapper.c

-  SetMem16Wrapper.c

-  SetMemWrapper.c

-  CopyMemWrapper.c

-  MemLibGuid.c

 

 [Sources.X64]

   X64/ScanMem64.S

@@ -92,19 +92,6 @@
   X64/SetMem16.asm

   X64/SetMem.asm

   X64/CopyMem.asm

-  ScanMem64Wrapper.c

-  ScanMem32Wrapper.c

-  ScanMem16Wrapper.c

-  ScanMem8Wrapper.c

-  ZeroMemWrapper.c

-  CompareMemWrapper.c

-  SetMem64Wrapper.c

-  SetMem32Wrapper.c

-  SetMem16Wrapper.c

-  SetMemWrapper.c

-  CopyMemWrapper.c

-  MemLibGuid.c

-

 

 [Packages]

   MdePkg/MdePkg.dec

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/CompareMem.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/CompareMem.S
index 46dfe0a23c..5580d6237a 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/CompareMem.S
@@ -42,9 +42,9 @@
 #   IN      UINTN                     Length
 #   );
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemCompareMem
-_InternalMemCompareMem:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemCompareMem)
+ASM_PFX(InternalMemCompareMem):
     push    rsi
     push    rdi
     mov     rsi, rcx
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/CopyMem.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/CopyMem.S
index fe67040ff6..3e7a396b5b 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/CopyMem.S
@@ -34,9 +34,9 @@
 #    IN UINTN  Count
 #    )
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemCopyMem
-_InternalMemCopyMem:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemCopyMem)
+ASM_PFX(InternalMemCopyMem):
     push    rsi
     push    rdi
     mov     rsi, rdx                    # rsi <- Source
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem16.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem16.S
index f56b9e96d8..9a94f5d936 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem16.S
@@ -42,9 +42,9 @@
 #   IN      UINT16                    Value
 #   );
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemScanMem16
-_InternalMemScanMem16:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemScanMem16)
+ASM_PFX(InternalMemScanMem16):
     push    rdi
     mov     rdi, rcx
     mov     rax, r8
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem32.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem32.S
index ef9cd758cf..86a6503fb3 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem32.S
@@ -42,9 +42,9 @@
 #   IN      UINT32                    Value
 #   );
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemScanMem32
-_InternalMemScanMem32:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemScanMem32)
+ASM_PFX(InternalMemScanMem32):
     push    rdi
     mov     rdi, rcx
     mov     rax, r8
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem64.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem64.S
index ee2ce39ba1..f05f7b2b2b 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem64.S
@@ -42,9 +42,9 @@
 #   IN      UINT64                    Value
 #   );
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemScanMem64
-_InternalMemScanMem64:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemScanMem64)
+ASM_PFX(InternalMemScanMem64):
     push    rdi
     mov     rdi, rcx
     mov     rax, r8
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem8.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem8.S
index 4ff3a959c8..1d8b4e1b23 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/ScanMem8.S
@@ -42,9 +42,9 @@
 #   IN      UINT8                     Value
 #   );
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemScanMem8
-_InternalMemScanMem8:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemScanMem8)
+ASM_PFX(InternalMemScanMem8):
     push    rdi
     mov     rdi, rcx
     mov     rcx, rdx
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem.S
index d9f8b06e0c..e252f1a995 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem.S
@@ -34,9 +34,9 @@
 #    IN UINT8  Value
 #    )
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemSetMem
-_InternalMemSetMem:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemSetMem)
+ASM_PFX(InternalMemSetMem):
     push    rdi
     mov     rax, r8    # rax = Value
     mov     rdi, rcx   # rdi = Buffer
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem16.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem16.S
index 5f196462c6..0fb9deeb75 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem16.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem16.S
@@ -34,9 +34,9 @@
 #    IN UINT16 Value
 #    )
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemSetMem16
-_InternalMemSetMem16:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemSetMem16)
+ASM_PFX(InternalMemSetMem16):
     push    rdi
     mov     rdi, rcx
     mov     rax, r8
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem32.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem32.S
index 72243ae8c2..00fec5c969 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem32.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem32.S
@@ -34,9 +34,9 @@
 #    IN UINT32 Value
 #    );
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemSetMem32
-_InternalMemSetMem32:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemSetMem32)
+ASM_PFX(InternalMemSetMem32):
     push    rdi
     mov     rdi, rcx
     mov     rax, r8
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem64.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem64.S
index a8a4a0b5a0..359cbb1633 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem64.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/SetMem64.S
@@ -33,9 +33,9 @@
 #    IN UINT64 Value
 #    )
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemSetMem64
-_InternalMemSetMem64:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemSetMem64)
+ASM_PFX(InternalMemSetMem64):
     push    rdi
     mov     rdi, rcx
     mov     rax, r8
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/ZeroMem.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/ZeroMem.S
index 6233b0632a..97c3130709 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/ZeroMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/ZeroMem.S
@@ -32,9 +32,9 @@
 #    IN UINTN  Count
 #    );
 #------------------------------------------------------------------------------
-.intel_syntax
-.globl _InternalMemZeroMem
-_InternalMemZeroMem:
+.intel_syntax noprefix
+.globl ASM_PFX(InternalMemZeroMem)
+ASM_PFX(InternalMemZeroMem):
     push    rdi
     push    rcx
     xor     rax, rax