1. Updated function headers for all assembly function

2. Optimized register usage in SetMemXX functions in all lib instances
3. Fixed a logical error in CopyMem for all lib instances


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

34 files changed, 228 insertions, 115 deletions

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
index 428bb6a51b..7901b82a44 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
@@ -27,11 +27,17 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
-    #.MODEL flat,C
-    .code: 
-
 .global _InternalMemCompareMem
+
+#------------------------------------------------------------------------------
+# INTN
+# EFIAPI
+# InternalMemCompareMem (
+#   IN      CONST VOID                *DestinationBuffer,
+#   IN      CONST VOID                *SourceBuffer,
+#   IN      UINTN                     Length
+#   );
+#------------------------------------------------------------------------------
 _InternalMemCompareMem:
     push    %esi
     push    %edi
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
index 3cf6fe7f73..1d0e7fad39 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
@@ -31,6 +31,15 @@
     .model  flat,C

     .code

 

+;------------------------------------------------------------------------------

+; INTN

+; EFIAPI

+; InternalMemCompareMem (

+;   IN      CONST VOID                *DestinationBuffer,

+;   IN      CONST VOID                *SourceBuffer,

+;   IN      UINTN                     Length

+;   );

+;------------------------------------------------------------------------------

 InternalMemCompareMem   PROC    USES    esi edi

     mov     esi, [esp + 12]

     mov     edi, [esp + 16]

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S
index deb9860339..9ef9286051 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.S
@@ -21,32 +21,29 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
-    #.MODEL flat,C
-    .xmm: 
-    .code: 
+.global _InternalMemCopyMem
 
 #------------------------------------------------------------------------------
 #  VOID *
-#  _mem_CopyMem (
+#  EFIAPI
+#  InternalMemCopyMem (
 #    IN VOID   *Destination,
 #    IN VOID   *Source,
 #    IN UINTN  Count
-#    )
+#    );
 #------------------------------------------------------------------------------
-.global _InternalMemCopyMem
 _InternalMemCopyMem:
     push    %esi
     push    %edi
     movl    16(%esp), %esi              # esi <- Source
     movl    12(%esp), %edi              # edi <- Destination
     movl    20(%esp), %edx              # edx <- Count
-    leal    -1(%edi,%edx,), %eax        # eax <- End of Destination
+    leal    -1(%esi,%edx,), %eax        # eax <- End of Source
     cmpl    %edi, %esi
     jae     L0
-    cmpl    %esi, %eax                  # Overlapped?
+    cmpl    %edi, %eax                  # Overlapped?
     jae     @CopyBackward               # Copy backward if overlapped
-L0: 
+L0:
     xorl    %ecx, %ecx
     subl    %edi, %ecx
     andl    $15, %ecx                   # ecx + edi aligns on 16-byte boundary
@@ -56,16 +53,16 @@ L0:
     subl    %ecx, %edx                  # edx <- remaining bytes to copy
     rep
     movsb
-L1: 
+L1:
     movl    %edx, %ecx
     andl    $15, %edx
     shrl    $4, %ecx                    # ecx <- # of DQwords to copy
     jz      @CopyBytes
     addl    $-16, %esp
     movdqu  %xmm0, (%esp)
-L2: 
+L2:
     movdqu  (%esi), %xmm0
-    movntdq %xmm0, (%edi) 
+    movntdq %xmm0, (%edi)
     addl    $16, %esi
     addl    $16, %edi
     loop    L2
@@ -73,11 +70,11 @@ L2:
     movdqu  (%esp),%xmm0
     addl    $16, %esp                   # stack cleanup
     jmp     @CopyBytes
-@CopyBackward: 
-    movl    %eax, %edi                  # edi <- Last byte in Destination
-    leal    -1(%esi,%edx,), %esi        # esi <- Last byte in Source
+@CopyBackward:
+    movl    %eax, %esi                  # esi <- Last byte in Source
+    leal    -1(%edi,%edx,), %edi        # edi <- Last byte in Destination
     std
-@CopyBytes: 
+@CopyBytes:
     movl    %edx, %ecx
     rep
     movsb
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
index 6127cc2188..77fb786d98 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CopyMem.asm
@@ -28,20 +28,20 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_CopyMem (

+;  InternalMemCopyMem (

 ;    IN VOID   *Destination,

 ;    IN VOID   *Source,

 ;    IN UINTN  Count

-;    )

+;    );

 ;------------------------------------------------------------------------------

 InternalMemCopyMem  PROC    USES    esi edi

     mov     esi, [esp + 16]             ; esi <- Source

     mov     edi, [esp + 12]             ; edi <- Destination

     mov     edx, [esp + 20]             ; edx <- Count

-    lea     eax, [edi + edx - 1]        ; eax <- End of Destination

+    lea     eax, [esi + edx - 1]        ; eax <- End of Source

     cmp     esi, edi

     jae     @F

-    cmp     eax, esi                    ; Overlapped?

+    cmp     eax, edi                    ; Overlapped?

     jae     @CopyBackward               ; Copy backward if overlapped

 @@:

     xor     ecx, ecx

@@ -70,8 +70,8 @@ InternalMemCopyMem  PROC    USES    esi edi
     add     esp, 16                     ; stack cleanup

     jmp     @CopyBytes

 @CopyBackward:

-    mov     edi, eax                    ; edi <- Last byte in Destination

-    lea     esi, [esi + edx - 1]        ; esi <- Last byte in Source

+    mov     esi, eax                    ; esi <- Last byte in Source

+    lea     edi, [edi + edx - 1]        ; edi <- Last byte in Destination

     std

 @CopyBytes:

     mov     ecx, edx

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
index c433a28b72..1e83064573 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
@@ -27,11 +27,17 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
-    #.MODEL flat,C
-    .code: 
-
 .global _InternalMemScanMem16
+
+#------------------------------------------------------------------------------
+# CONST VOID *
+# EFIAPI
+# InternalMemScanMem16 (
+#   IN      CONST VOID                *Buffer,
+#   IN      UINTN                     Length,
+#   IN      UINT16                    Value
+#   );
+#------------------------------------------------------------------------------
 _InternalMemScanMem16:
     push    %edi
     movl    12(%esp), %ecx
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
index 7071942ede..57fab61b77 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
@@ -31,6 +31,15 @@
     .model  flat,C

     .code

 

+;------------------------------------------------------------------------------

+; CONST VOID *

+; EFIAPI

+; InternalMemScanMem16 (

+;   IN      CONST VOID                *Buffer,

+;   IN      UINTN                     Length,

+;   IN      UINT16                    Value

+;   );

+;------------------------------------------------------------------------------

 InternalMemScanMem16    PROC    USES    edi

     mov     ecx, [esp + 12]

     mov     edi, [esp + 8]

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
index 1de283c788..b7b93d9c0c 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
@@ -27,17 +27,23 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
-    #.MODEL flat,C
-    .code: 
-
 .global _InternalMemScanMem32
+
+#------------------------------------------------------------------------------
+# CONST VOID *
+# EFIAPI
+# InternalMemScanMem32 (
+#   IN      CONST VOID                *Buffer,
+#   IN      UINTN                     Length,
+#   IN      UINT32                    Value
+#   );
+#------------------------------------------------------------------------------
 _InternalMemScanMem32:
     push    %edi
     movl    12(%esp), %ecx
     movl    8(%esp), %edi
     movl    16(%esp), %eax
-    repnz   scasl
+    repne   scasl
     leal    -4(%edi), %eax
     cmovnz  %ecx, %eax
     pop     %edi
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
index e6aaf02bc3..6ac857ce16 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
@@ -31,6 +31,15 @@
     .model  flat,C

     .code

 

+;------------------------------------------------------------------------------

+; CONST VOID *

+; EFIAPI

+; InternalMemScanMem32 (

+;   IN      CONST VOID                *Buffer,

+;   IN      UINTN                     Length,

+;   IN      UINT32                    Value

+;   );

+;------------------------------------------------------------------------------

 InternalMemScanMem32    PROC    USES    edi

     mov     ecx, [esp + 12]

     mov     edi, [esp + 8]

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
index 00f6d74436..6bbb18a334 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
@@ -27,18 +27,24 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
-    #.MODEL flat,C
-    .code: 
-
 .global _InternalMemScanMem64
+
+#------------------------------------------------------------------------------
+# CONST VOID *
+# EFIAPI
+# InternalMemScanMem64 (
+#   IN      CONST VOID                *Buffer,
+#   IN      UINTN                     Length,
+#   IN      UINT64                    Value
+#   );
+#------------------------------------------------------------------------------
 _InternalMemScanMem64:
     push    %edi
     movl    12(%esp), %ecx
     movl    16(%esp), %eax
     movl    20(%esp), %edx
     movl    8(%esp), %edi
-L0: 
+L0:
     cmpl    (%edi), %eax
     leal    8(%edi), %edi
     loopne  L0
@@ -46,7 +52,7 @@ L0:
     cmpl    -4(%edi), %edx
     jecxz   L1
     jne     L0
-L1: 
+L1:
     leal    -8(%edi), %eax
     cmovne  %ecx, %eax
     pop     %edi
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
index f9725a4a5d..ca54f13738 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
@@ -31,6 +31,15 @@
     .model  flat,C

     .code

 

+;------------------------------------------------------------------------------

+; CONST VOID *

+; EFIAPI

+; InternalMemScanMem64 (

+;   IN      CONST VOID                *Buffer,

+;   IN      UINTN                     Length,

+;   IN      UINT64                    Value

+;   );

+;------------------------------------------------------------------------------

 InternalMemScanMem64    PROC    USES    edi

     mov     ecx, [esp + 12]

     mov     eax, [esp + 16]

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
index 57640378b4..fe678fac26 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
@@ -27,11 +27,17 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
-    #.MODEL flat,C
-    .code: 
-
 .global _InternalMemScanMem8
+
+#------------------------------------------------------------------------------
+# CONST VOID *
+# EFIAPI
+# InternalMemScanMem8 (
+#   IN      CONST VOID                *Buffer,
+#   IN      UINTN                     Length,
+#   IN      UINT8                     Value
+#   );
+#------------------------------------------------------------------------------
 _InternalMemScanMem8:
     push    %edi
     movl    12(%esp), %ecx
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
index 6ae1900189..a3f65b64fa 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
@@ -31,6 +31,15 @@
     .model  flat,C

     .code

 

+;------------------------------------------------------------------------------

+; CONST VOID *

+; EFIAPI

+; InternalMemScanMem8 (

+;   IN      CONST VOID                *Buffer,

+;   IN      UINTN                     Length,

+;   IN      UINT8                     Value

+;   );

+;------------------------------------------------------------------------------

 InternalMemScanMem8 PROC    USES    edi

     mov     ecx, [esp + 12]

     mov     edi, [esp + 8]

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
index e778cd8b86..d73ebfb710 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.S
@@ -21,10 +21,10 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
+    .686:
     #.MODEL flat,C
-    .xmm: 
-    .code: 
+    .xmm:
+    .code:
 
 #------------------------------------------------------------------------------
 #  VOID *
@@ -32,7 +32,7 @@
 #    IN VOID   *Buffer,
 #    IN UINTN  Count,
 #    IN UINT8  Value
-#    )
+#    );
 #------------------------------------------------------------------------------
 .global _InternalMemSetMem
 _InternalMemSetMem:
@@ -49,7 +49,7 @@ _InternalMemSetMem:
     subl    %ecx, %edx
     rep
     stosb
-L0: 
+L0:
     movl    %edx, %ecx
     andl    $15, %edx
     shrl    $4, %ecx                    # ecx <- # of DQwords to set
@@ -60,14 +60,14 @@ L0:
     movd    %eax, %xmm0
     pshuflw $0, %xmm0, %xmm0
     movlhps %xmm0, %xmm0
-L1: 
+L1:
     movntdq %xmm0, (%edi)
     addl    $16, %edi
     loop   L1
     mfence
     movdqu  (%esp), %xmm0
     addl    $16, %esp                   # stack cleanup
-@SetBytes: 
+@SetBytes:
     movl    %edx, %ecx
     rep
     stosb
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
index 62b10cff0a..a4de29c521 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem.asm
@@ -28,11 +28,12 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_SetMem (

+;  EFIAPI

+;  InternalMemSetMem (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count,

 ;    IN UINT8  Value

-;    )

+;    );

 ;------------------------------------------------------------------------------

 InternalMemSetMem   PROC    USES    edi

     mov     edx, [esp + 12]             ; edx <- Count

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S
index 27110b32d3..21e3935b99 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.S
@@ -21,20 +21,17 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
-    #.MODEL flat,C
-    .xmm: 
-    .code: 
+.global _InternalMemSetMem16
 
 #------------------------------------------------------------------------------
 #  VOID *
-#  _mem_SetMem16 (
+#  EFIAPI
+#  InternalMemSetMem16 (
 #    IN VOID   *Buffer,
 #    IN UINTN  Count,
 #    IN UINT16 Value
 #    )
 #------------------------------------------------------------------------------
-.global _InternalMemSetMem16
 _InternalMemSetMem16:
     push    %edi
     movl    12(%esp), %edx
@@ -50,7 +47,7 @@ _InternalMemSetMem16:
     subl    %ecx, %edx
     rep
     stosw
-L0: 
+L0:
     movl    %edx, %ecx
     andl    $7, %edx
     shrl    $3, %ecx
@@ -63,7 +60,7 @@ L1:
     addl    $16, %edi
     loop    L1
     mfence
-@SetWords: 
+@SetWords:
     movl    %edx, %ecx
     rep
     stosw
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
index 3fabb00d31..a709899fe2 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem16.asm
@@ -28,11 +28,12 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_SetMem16 (

+;  EFIAPI

+;  InternalMemSetMem16 (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count,

 ;    IN UINT16 Value

-;    )

+;    );

 ;------------------------------------------------------------------------------

 InternalMemSetMem16 PROC    USES    edi

     mov     edx, [esp + 12]

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S
index a1a6317115..b6823ad125 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.S
@@ -21,20 +21,17 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
-    #.MODEL flat,C
-    .xmm: 
-    .code: 
+.global _InternalMemSetMem32
 
 #------------------------------------------------------------------------------
 #  VOID *
-#  _mem_SetMem32 (
+#  EFIAPI
+#  InternalMemSetMem32 (
 #    IN VOID   *Buffer,
 #    IN UINTN  Count,
 #    IN UINT32 Value
-#    )
+#    );
 #------------------------------------------------------------------------------
-.global _InternalMemSetMem32
 _InternalMemSetMem32:
     push    %edi
     movl    12(%esp), %edx
@@ -50,19 +47,19 @@ _InternalMemSetMem32:
     subl    %ecx, %edx
     rep
     stosl
-L0: 
+L0:
     movl    %edx, %ecx
     andl    $3, %edx
     shrl    $2, %ecx
     jz      @SetDwords
     movd    %eax, %xmm0
     pshufd  $0, %xmm0, %xmm0
-L1: 
+L1:
     movntdq %xmm0, (%edi)
     addl    $16, %edi
     loop    L1
     mfence
-@SetDwords: 
+@SetDwords:
     movl    %edx, %ecx
     rep
     stosl
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
index a7f1f0e127..99954a5e4b 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem32.asm
@@ -28,11 +28,12 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_SetMem32 (

+;  EFIAPI

+;  InternalMemSetMem32 (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count,

 ;    IN UINT32 Value

-;    )

+;    );

 ;------------------------------------------------------------------------------

 InternalMemSetMem32 PROC    USES    edi

     mov     edx, [esp + 12]

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
index fa60007f5a..1f9e2f63a3 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.S
@@ -21,15 +21,17 @@
 #

 #------------------------------------------------------------------------------

 

+.globl _InternalMemSetMem64

+

 #------------------------------------------------------------------------------

 #  VOID *

+#  EFIAPI

 #  InternalMemSetMem64 (

 #    IN VOID   *Buffer,

 #    IN UINTN  Count,

 #    IN UINT64 Value

-#    )

+#    );

 #------------------------------------------------------------------------------

-.globl _InternalMemSetMem64

 _InternalMemSetMem64:

     movl    4(%esp), %eax

     movl    8(%esp), %ecx

@@ -40,20 +42,17 @@ _InternalMemSetMem64:
     movq    %xmm0, (%edx)

     addl    $8, %edx

     decl    %ecx

-L1: 

+L1:

     shrl    %ecx

     jz      @SetQwords

     movlhps %xmm0, %xmm0

-L2: 

+L2:

     movntdq %xmm0, (%edx)

     leal    16(%edx), %edx

     loop    L2

     mfence

-@SetQwords: 

+@SetQwords:

     jnc     L3

     movq    %xmm0, (%edx)

-L3: 

+L3:

     ret

-

-

-

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
index c5d75c6f2b..69406707a6 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/SetMem64.asm
@@ -28,6 +28,7 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

+;  EFIAPI

 ;  InternalMemSetMem64 (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count,

@@ -35,8 +36,8 @@
 ;    )

 ;------------------------------------------------------------------------------

 InternalMemSetMem64 PROC

-    mov     eax, [esp + 4]

-    mov     ecx, [esp + 8]

+    mov     eax, [esp + 4]              ; eax <- Buffer

+    mov     ecx, [esp + 8]              ; ecx <- Count

     test    al, 8

     mov     edx, eax

     movq    xmm0, [esp + 12]

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S
index f927f9128f..f57276091f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.S
@@ -21,19 +21,16 @@
 #
 #------------------------------------------------------------------------------
 
-    .686: 
-    #.MODEL flat,C
-    .xmm: 
-    .code: 
+.global _InternalMemZeroMem
 
 #------------------------------------------------------------------------------
 #  VOID *
-#  _mem_ZeroMem (
+#  EFIAPI
+#  InternalMemZeroMem (
 #    IN VOID   *Buffer,
 #    IN UINTN  Count
-#    )
+#    );
 #------------------------------------------------------------------------------
-.global _InternalMemZeroMem
 _InternalMemZeroMem:
     push    %edi
     movl    8(%esp), %edi
@@ -48,18 +45,18 @@ _InternalMemZeroMem:
     subl    %ecx, %edx
     rep
     stosb
-L0: 
+L0:
     movl    %edx, %ecx
     andl    $15, %edx
     shrl    $4, %ecx
     jz      @ZeroBytes
     pxor    %xmm0, %xmm0
-L1: 
+L1:
     movntdq %xmm0, (%edi)
     addl    $16, %edi
     loop    L1
     mfence
-@ZeroBytes: 
+@ZeroBytes:
     movl    %edx, %ecx
     rep
     stosb
diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
index b532382e2e..3792c88879 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ZeroMem.asm
@@ -28,10 +28,11 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_ZeroMem (

+;  EFIAPI

+;  InternalMemZeroMem (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count

-;    )

+;    );

 ;------------------------------------------------------------------------------

 InternalMemZeroMem  PROC    USES    edi

     mov     edi, [esp + 8]

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
index 08247681c5..e2ffb5c3c2 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
@@ -30,7 +30,7 @@
 

   This function fills Length bytes of Buffer with zeros, and returns Buffer.

   If Length > 0 and Buffer is NULL, then ASSERT().

-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT().

 

   @param  Buffer      Pointer to the target buffer to fill with zeros.

   @param  Length      Number of bytes in Buffer to fill with zeros.

@@ -47,5 +47,5 @@ ZeroMem (
 {

   ASSERT (!(Buffer == NULL && Length > 0));

   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));

-  return InternalMemSetMem (Buffer, Length, 0);

+  return InternalMemZeroMem (Buffer, Length);

 }

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm
index b8e289bb27..554bc07c64 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm
@@ -29,6 +29,15 @@
 

     .code

 

+;------------------------------------------------------------------------------

+; INTN

+; EFIAPI

+; InternalMemCompareMem (

+;   IN      CONST VOID                *DestinationBuffer,

+;   IN      CONST VOID                *SourceBuffer,

+;   IN      UINTN                     Length

+;   );

+;------------------------------------------------------------------------------

 InternalMemCompareMem   PROC    USES    rsi rdi

     mov     rsi, rcx

     mov     rdi, rdx

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/CopyMem.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/CopyMem.asm
index 955cd25f36..03ffe0c00f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/CopyMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/CopyMem.asm
@@ -25,20 +25,21 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_CopyMem (

+;  EFIAPI

+;  InternalMemCopyMem (

 ;    IN VOID   *Destination,

 ;    IN VOID   *Source,

 ;    IN UINTN  Count

-;    )

+;    );

 ;------------------------------------------------------------------------------

 InternalMemCopyMem  PROC    USES    rsi rdi

     mov     rsi, rdx                    ; rsi <- Source

     mov     rdi, rcx                    ; rdi <- Destination

-    lea     r9, [rdi + r8 - 1]          ; r9 <- Last byte of Destination

+    lea     r9, [rsi + r8 - 1]          ; r9 <- Last byte of Source

     cmp     rsi, rdi

     mov     rax, rdi                    ; rax <- Destination as return value

     jae     @F                          ; Copy forward if Source > Destination

-    cmp     r9, rsi                     ; Overlapped?

+    cmp     r9, rdi                     ; Overlapped?

     jae     @CopyBackward               ; Copy backward if overlapped

 @@:

     xor     rcx, rcx

@@ -65,8 +66,8 @@ InternalMemCopyMem  PROC    USES    rsi rdi
     movdqa  xmm0, [rsp + 18h]           ; restore xmm0

     jmp     @CopyBytes                  ; copy remaining bytes

 @CopyBackward:

-    mov     rdi, r9                     ; rdi <- Last byte of Destination

-    lea     rsi, [rsi + r8 - 1]         ; rsi <- Last byte of Source

+    mov     rsi, r9                     ; rsi <- Last byte of Source

+    lea     rdi, [rdi + r8 - 1]         ; rdi <- Last byte of Destination

     std

 @CopyBytes:

     mov     rcx, r8

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm
index 6af88fae5b..a2538c2cca 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm
@@ -29,6 +29,15 @@
 

     .code

 

+;------------------------------------------------------------------------------

+; CONST VOID *

+; EFIAPI

+; InternalMemScanMem16 (

+;   IN      CONST VOID                *Buffer,

+;   IN      UINTN                     Length,

+;   IN      UINT16                    Value

+;   );

+;------------------------------------------------------------------------------

 InternalMemScanMem16    PROC    USES    rdi

     mov     rdi, rcx

     mov     rax, r8

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm
index f9c9feb00e..e0523d8547 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm
@@ -29,6 +29,15 @@
 

     .code

 

+;------------------------------------------------------------------------------

+; CONST VOID *

+; EFIAPI

+; InternalMemScanMem32 (

+;   IN      CONST VOID                *Buffer,

+;   IN      UINTN                     Length,

+;   IN      UINT32                    Value

+;   );

+;------------------------------------------------------------------------------

 InternalMemScanMem32    PROC    USES    rdi

     mov     rdi, rcx

     mov     rax, r8

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm
index 2f286c9e2f..0e7e9c782f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm
@@ -29,6 +29,15 @@
 

     .code

 

+;------------------------------------------------------------------------------

+; CONST VOID *

+; EFIAPI

+; InternalMemScanMem64 (

+;   IN      CONST VOID                *Buffer,

+;   IN      UINTN                     Length,

+;   IN      UINT64                    Value

+;   );

+;------------------------------------------------------------------------------

 InternalMemScanMem64    PROC    USES    rdi

     mov     rdi, rcx

     mov     rax, r8

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm
index 4027ece768..879273f960 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm
@@ -29,6 +29,15 @@
 

     .code

 

+;------------------------------------------------------------------------------

+; CONST VOID *

+; EFIAPI

+; InternalMemScanMem8 (

+;   IN      CONST VOID                *Buffer,

+;   IN      UINTN                     Length,

+;   IN      UINT8                     Value

+;   );

+;------------------------------------------------------------------------------

 InternalMemScanMem8 PROC    USES    rdi

     mov     rdi, rcx

     mov     rcx, rdx

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem.asm
index 2aba207ab9..25cfcf0d12 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem.asm
@@ -25,7 +25,7 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_SetMem (

+;  InternalMemSetMem (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count,

 ;    IN UINT8  Value

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem16.asm
index a2f4d0e538..77b8cf43aa 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem16.asm
@@ -25,7 +25,7 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_SetMem16 (

+;  InternalMemSetMem16 (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count,

 ;    IN UINT16 Value

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem32.asm
index 24207ec699..eba29bb88d 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem32.asm
@@ -25,7 +25,7 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_SetMem32 (

+;  InternalMemSetMem32 (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count,

 ;    IN UINT8  Value

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm
index ef94c562b5..a26b9412d4 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/SetMem64.asm
@@ -32,9 +32,10 @@
 ;    )

 ;------------------------------------------------------------------------------

 InternalMemSetMem64 PROC

-    mov     rax, rcx

+    mov     rax, rcx                    ; rax <- Buffer

+    xchg    rcx, rdx                    ; rcx <- Count & rdx <- Buffer

     test    dl, 8

-    xchg    rcx, rdx

+    movd    xmm0, r8

     jz      @F

     mov     [rdx], r8

     add     rdx, 8

@@ -42,7 +43,6 @@ InternalMemSetMem64 PROC
 @@:

     shr     rcx, 1

     jz      @SetQwords

-    movd    xmm0, r8

     movlhps xmm0, xmm0

 @@:

     movntdq [rdx], xmm0

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ZeroMem.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/ZeroMem.asm
index 6d0f99ba94..7eebd3a8ef 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ZeroMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/ZeroMem.asm
@@ -25,7 +25,7 @@
 

 ;------------------------------------------------------------------------------

 ;  VOID *

-;  _mem_ZeroMem (

+;  InternalMemZeroMem (

 ;    IN VOID   *Buffer,

 ;    IN UINTN  Count

 ;    )