clean up all of eight BaseMemoryLib instances in MdePkg with the following updates:

1.	Remove .intel_syntax directives in GCC assembly files. All these assembly files have been updated to use the preferred syntax for GAS
2.	Correct the incorrect comments for internal worker functions for SetMemXX() and ScanMemXX(). The Length parameter is actually the counter of 16-bit, 32-bit or 64-bit value. 
3.	Simplify the logic in ZeroMemoryWrapper.c for BaseMemoryLibOptPei instance to remove the conditional statement for zero length. This logic is already covered by worker function InternalMemZeroMem(). 
4.	Cleanup all the Wrapper C files in BaseMemoryLib instances. They are supposed to be shared by all these 8 BaseMemoryLib instances, but are out-of-sync after some maintenance. This patch re-syncs them and makes them exactly the same.
5.	Cleanup MemLibInternal.h so that it is shared by 6 BaseMemoryLib instance except for PeiMemoryLib and UefiMemoryLib.


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

24 files changed, 191 insertions, 220 deletions

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
index 3c8be6a76e..278ef3369e 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
@@ -9,9 +9,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-Copyright (c) 2006 - 2008, Intel Corporation

+Copyright (c) 2006 - 2009, Intel Corporation<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
index 831e491b50..5077820be0 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
index b14abbc75a..b315ff5322 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
index 9ecc390ac8..f40299b9ca 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
@@ -8,10 +8,8 @@
     BaseMemoryLibRepStr

     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

-    PeiMemoryLib

-    DxeMemoryLib

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -30,7 +28,6 @@
 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

 

-

 /**

   Copy Length bytes from Source to Destination.

 

@@ -52,9 +49,9 @@ InternalMemCopyMem (
 /**

   Set Buffer to Value for Size bytes.

 

-  @param  Buffer  Memory to set.

-  @param  Length  Number of bytes to set

-  @param  Value   Value of the set operation.

+  @param  Buffer   Memory to set.

+  @param  Length   Number of bytes to set

+  @param  Value    Value of the set operation.

 

   @return Buffer

 

@@ -71,7 +68,7 @@ InternalMemSetMem (
   Fills a target buffer with a 16-bit value, and returns the target buffer.

 

   @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

+  @param  Length  Count of 16-bit value to fill.

   @param  Value   Value with which to fill Length bytes of Buffer.

 

   @return Buffer

@@ -89,7 +86,7 @@ InternalMemSetMem16 (
   Fills a target buffer with a 32-bit value, and returns the target buffer.

 

   @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

+  @param  Length  Count of 32-bit value to fill.

   @param  Value   Value with which to fill Length bytes of Buffer.

 

   @return Buffer

@@ -107,7 +104,7 @@ InternalMemSetMem32 (
   Fills a target buffer with a 64-bit value, and returns the target buffer.

 

   @param  Buffer  Pointer to the target buffer to fill.

-  @param  Length  Number of bytes in Buffer to fill.

+  @param  Length  Count of 64-bit value to fill.

   @param  Value   Value with which to fill Length bytes of Buffer.

 

   @return Buffer

@@ -163,7 +160,7 @@ InternalMemCompareMem (
   matching 8-bit value in the target buffer.

 

   @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

+  @param  Length  Count of 8-bit value to scan. Must be non-zero.

   @param  Value   Value to search for in the target buffer.

 

   @return Pointer to the first occurrence or NULL if not found.

@@ -182,7 +179,7 @@ InternalMemScanMem8 (
   matching 16-bit value in the target buffer.

 

   @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

+  @param  Length  Count of 16-bit value to scan. Must be non-zero.

   @param  Value   Value to search for in the target buffer.

 

   @return Pointer to the first occurrence or NULL if not found.

@@ -201,7 +198,7 @@ InternalMemScanMem16 (
   matching 32-bit value in the target buffer.

 

   @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

+  @param  Length  Count of 32-bit value to scan. Must be non-zero.

   @param  Value   Value to search for in the target buffer.

 

   @return Pointer to the first occurrence or NULL if not found.

@@ -220,7 +217,7 @@ InternalMemScanMem32 (
   matching 64-bit value in the target buffer.

 

   @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan. Must be non-zero.

+  @param  Length  Count of 64-bit value to scan. Must be non-zero.

   @param  Value   Value to search for in the target buffer.

 

   @return Pointer to the first occurrence or NULL if not found.

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
index e7128e90d4..f8b3ab9763 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
index 7683910e80..d31b13f4d4 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
@@ -9,9 +9,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
index e3b2688681..6d7acf3f7b 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
index d17b3a7943..2add7849cd 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem16Wrapper.c
index 6beb40bd83..d74b80f053 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem16Wrapper.c
@@ -1,17 +1,7 @@
 /** @file

   SetMem16() implementation.

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  The following BaseMemoryLib instances contains the same copy of this file:

-

+  The following BaseMemoryLib instances contain the same copy of this file:

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

@@ -19,12 +9,18 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

-

-**/

+    UefiMemoryLib

 

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

+  All rights reserved. This program and the accompanying materials

+  are licensed and made available under the terms and conditions of the BSD License

+  which accompanies this distribution.  The full text of the license may be found at

+  http://opensource.org/licenses/bsd-license.php

 

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

+**/

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem32Wrapper.c
index 0a0ce82706..dc84d2093a 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem32Wrapper.c
@@ -1,17 +1,7 @@
 /** @file

   SetMem32() implementation.

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

   The following BaseMemoryLib instances contain the same copy of this file:

-

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

@@ -19,12 +9,18 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

-

-**/

+    UefiMemoryLib

 

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

+  All rights reserved. This program and the accompanying materials

+  are licensed and made available under the terms and conditions of the BSD License

+  which accompanies this distribution.  The full text of the license may be found at

+  http://opensource.org/licenses/bsd-license.php

 

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

+**/

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem64Wrapper.c
index 10ef682764..05dc453c3a 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem64Wrapper.c
@@ -1,17 +1,7 @@
 /** @file

   SetMem64() implementation.

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

   The following BaseMemoryLib instances contain the same copy of this file:

-

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

@@ -19,12 +9,18 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

-

-**/

+    UefiMemoryLib

 

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

+  All rights reserved. This program and the accompanying materials

+  are licensed and made available under the terms and conditions of the BSD License

+  which accompanies this distribution.  The full text of the license may be found at

+  http://opensource.org/licenses/bsd-license.php

 

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

+**/

 

 #include "MemLibInternals.h"

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
index 18fbcdc18a..b6bc1f4387 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

 

-  Copyright (c) 2006 - 2008, Intel Corporation<BR>

+  Copyright (c) 2006 - 2009, Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/CompareMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/CompareMem.S
index c207db7dda..4f73686f30 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/CompareMem.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -41,20 +41,19 @@
 #   IN      CONST VOID                *SourceBuffer,

 #   IN      UINTN                     Length

 #   );

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

-.intel_syntax noprefix

+#------------------------------------------------------------------------------ 

 ASM_GLOBAL ASM_PFX(InternalMemCompareMem)

 ASM_PFX(InternalMemCompareMem):

-    push    rsi

-    push    rdi

-    mov     rsi, rcx

-    mov     rdi, rdx

-    mov     rcx, r8

+    pushq   %rsi

+    pushq   %rdi

+    movq    %rcx, %rsi

+    movq    %rdx, %rdi

+    movq    %r8, %rcx

     repe    cmpsb

-    movzx   rax, byte ptr [rsi - 1]

-    movzx   rdx, byte ptr [rdi - 1]

-    sub     rax, rdx

-    pop     rdi

-    pop     rsi

+    movzbq  -1(%rsi) , %rax

+    movzbq  -1(%rdi) , %rdx

+    sub     %dl, %al

+    popq    %rdi

+    popq    %rsi

     ret

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/CopyMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/CopyMem.S
index c05e50aa9d..a516df6122 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/CopyMem.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -33,51 +33,50 @@
 #    IN UINTN  Count

 #    )

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemCopyMem)

 ASM_PFX(InternalMemCopyMem):

-    push    rsi

-    push    rdi

-    mov     rsi, rdx                    # rsi <- Source

-    mov     rdi, rcx                    # rdi <- Destination

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

-    cmp     rsi, rdi

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

+    pushq   %rsi

+    pushq   %rdi

+    movq    %rdx, %rsi                  # rsi <- Source

+    movq    %rcx, %rdi                  # rdi <- Destination

+    leaq    -1(%rsi,%r8,), %r9          # r9 <- Last byte of Source      

+    cmpq    %rdi, %rsi

+    movq    %rdi, %rax                  # rax <- Destination as return value

     jae     L0                          # Copy forward if Source > Destination

-    cmp     r9, rdi                     # Overlapped?

-    jae     L_CopyBackward               # Copy backward if overlapped

+    cmpq    %rdi, %r9                   # Overlapped?

+    jae     L_CopyBackward              # Copy backward if overlapped

 L0:

-    xor     rcx, rcx

-    sub     rcx, rdi                    # rcx <- -rdi

-    and     rcx, 15                     # rcx + rsi should be 16 bytes aligned

+    xorq    %rcx, %rcx

+    subq    %rdi, %rcx                  # rcx <- -rdi

+    andq    $15, %rcx                   # rcx + rsi should be 16 bytes aligned

     jz      L1                          # skip if rcx == 0

-    cmp     rcx, r8

-    cmova   rcx, r8

-    sub     r8, rcx

+    cmpq    %r8, %rcx

+    cmova   %r8, %rcx

+    subq    %rcx, %r8

     rep     movsb

 L1:

-    mov     rcx, r8

-    and     r8, 15

-    shr     rcx, 4                      # rcx <- # of DQwords to copy

+    movq    %r8,  %rcx

+    andq    $15, %r8

+    shrq    $4, %rcx                    # rcx <- # of DQwords to copy

     jz      L_CopyBytes

-    movdqa  [rsp + 0x18], xmm0           # save xmm0 on stack

+    movdqu  %xmm0, 0x18(%rsp)           # save xmm0 on stack

 L2:

-    movdqu  xmm0, [rsi]                 # rsi may not be 16-byte aligned

-    movntdq [rdi], xmm0                 # rdi should be 16-byte aligned

-    add     rsi, 16

-    add     rdi, 16

+    movdqu  (%rsi), %xmm0               # rsi may not be 16-byte aligned

+    movntdq %xmm0, (%rdi)               # rdi should be 16-byte aligned

+    addq    $16, %rsi

+    addq    $16, %rdi

     loop    L2

     mfence

-    movdqa  xmm0, [rsp + 0x18]           # restore xmm0

+    movdqa  0x18(%rsp), %xmm0            # restore xmm0

     jmp     L_CopyBytes                  # copy remaining bytes

 L_CopyBackward:

-    mov     rsi, r9                     # rsi <- Last byte of Source

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

+    movq    %r9, %rsi                   # rsi <- Last byte of Source

+    leaq     -1(%rdi, %r8,), %rdi       # rdi <- Last byte of Destination

     std

 L_CopyBytes:

-    mov     rcx, r8

+    movq    %r8, %rcx

     rep     movsb

     cld

-    pop     rdi

-    pop     rsi

+    popq    %rdi

+    popq    %rsi

     ret

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem16.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem16.S
index 140b0a40e5..24055dc8c0 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem16.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -37,21 +37,20 @@
 # CONST VOID *

 # EFIAPI

 # InternalMemScanMem16 (

-#   IN      CONST VOID                *Buffer,

+#   IN      CONST VOID          *Buffer,

 #   IN      UINTN                     Length,

 #   IN      UINT16                    Value

 #   );

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemScanMem16)

 ASM_PFX(InternalMemScanMem16):

-    push    rdi

-    mov     rdi, rcx

-    mov     rax, r8

-    mov     rcx, rdx

+    pushq  %rdi

+    movq   %rcx, %rdi

+    movq   %r8, %rax

+    movq   %rdx, %rcx

     repne   scasw

-    lea     rax, [rdi - 2]

-    cmovnz  rax, rcx

-    pop     rdi

+    leaq    -2(%rdi), %rax

+    cmovnz  %rcx, %rax

+    popq    %rdi

     ret

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem32.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem32.S
index 9420725d5e..b7a5884966 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem32.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -42,16 +42,15 @@
 #   IN      UINT32                    Value

 #   );

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemScanMem32)

 ASM_PFX(InternalMemScanMem32):

-    push    rdi

-    mov     rdi, rcx

-    mov     rax, r8

-    mov     rcx, rdx

-    repne   scasd

-    lea     rax, [rdi - 4]

-    cmovnz  rax, rcx

-    pop     rdi

+    pushq   %rdi

+    movq    %rcx, %rdi

+    movq    %r8, %rax

+    movq    %rdx, %rcx

+    repne   scasl

+    leaq    -4(%rdi), %rax

+    cmovnz  %rcx, %rax

+    popq    %rdi

     ret

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem64.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem64.S
index d39f17fac3..c1a9d4b253 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem64.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -37,20 +37,19 @@
 # CONST VOID *

 # EFIAPI

 # InternalMemScanMem64 (

-#   IN      CONST VOID                *Buffer,

+#   IN      CONST VOID          *Buffer,

 #   IN      UINTN                     Length,

 #   IN      UINT64                    Value

 #   );

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemScanMem64)

 ASM_PFX(InternalMemScanMem64):

-    push    rdi

-    mov     rdi, rcx

-    mov     rax, r8

-    mov     rcx, rdx

+    pushq   %rdi

+    movq    %rcx, %rdi

+    movq    %r8, %rax

+    movq    %rdx, %rcx

     repne   scasq

-    lea     rax, [rdi - 8]

-    cmovnz  rax, rcx

-    pop     rdi

+    leaq    -8(%rdi), %rax

+    cmovnz  %rcx, %rax

+    popq    %rdi

     ret

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem8.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem8.S
index 74667a6200..d2d8bb5d9b 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ScanMem8.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -37,21 +37,20 @@
 # CONST VOID *

 # EFIAPI

 # InternalMemScanMem8 (

-#   IN      CONST VOID                *Buffer,

-#   IN      UINTN                     Length,

-#   IN      UINT8                     Value

+#   IN      CONST VOID          *Buffer,

+#   IN      UINTN               Length,

+#   IN      UINT8               Value

 #   );

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemScanMem8)

 ASM_PFX(InternalMemScanMem8):

-    push    rdi

-    mov     rdi, rcx

-    mov     rcx, rdx

-    mov     rax, r8

+    pushq   %rdi

+    movq    %rcx, %rdi

+    movq    %rdx, %rcx

+    movq    %r8, %rax

     repne   scasb

-    lea     rax, [rdi - 1]

-    cmovnz  rax, rcx                    # set rax to 0 if not found

-    pop     rdi

+    leaq    -1(%rdi), %rax

+    cmovnz  %rcx, %rax                  # set rax to 0 if not found

+    popq    %rdi

     ret

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem.S
index c7c07ad309..fc8efdeaec 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem.S
@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -29,30 +29,29 @@
 #    IN UINT8  Value

 #    )

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemSetMem)

 ASM_PFX(InternalMemSetMem):

-    push    rdi

-    push    rbx

-    push    rcx         # push Buffer

-    mov     rax, r8     # rax = Value

-    and     rax, 0xff   # rax = lower 8 bits of r8, upper 56 bits are 0

-    mov     ah,  al     # ah  = al

-    mov     bx,  ax     # bx  = ax

-    shl     rax, 0x10   # rax = ax << 16

-    mov     ax,  bx     # ax  = bx

-    mov     rbx, rax    # ebx = eax

-    shl     rax, 0x20   # rax = rax << 32

-    or      rax, rbx    # eax = ebx

-    mov     rdi, rcx    # rdi = Buffer

-    mov     rcx, rdx    # rcx = Count

-    shr     rcx, 3      # rcx = rcx / 8

+    pushq   %rdi

+    pushq   %rbx

+    pushq   %rcx        # push Buffer

+    movq    %r8, %rax   # rax = Value

+    andq    $0xff, %rax # rax = lower 8 bits of r8, upper 56 bits are 0

+    movb    %al, %ah    # ah  = al

+    movw    %ax, %bx    # bx  = ax

+    shlq    $0x10, %rax # rax = ax << 16

+    movw    %bx,  %ax   # ax  = bx

+    movq    %rax, %rbx  # ebx = eax

+    shlq    $0x20, %rax # rax = rax << 32

+    orq     %rbx, %rax  # eax = ebx

+    movq    %rcx, %rdi  # rdi = Buffer

+    movq    %rdx, %rcx  # rcx = Count

+    shrq    $3, %rcx    # rcx = rcx / 8

     cld

     rep     stosq 

-    mov     rcx, rdx    # rcx = rdx

-    and     rcx, 7      # rcx = rcx & 7

+    movq    %rdx, %rcx  # rcx = rdx

+    andq    $7, %rcx    # rcx = rcx & 7

     rep     stosb 

-    pop     rax         # rax = Buffer

-    pop     rbx

-    pop     rdi

+    popq    %rax        # rax = Buffer

+    popq    %rbx

+    popq    %rdi

     ret

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem16.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem16.S
index c091131a75..af63e42b63 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem16.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem16.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -34,15 +34,14 @@
 #    IN UINT16 Value

 #    )

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemSetMem16)

 ASM_PFX(InternalMemSetMem16):

-    push    rdi

-    mov     rdi, rcx

-    mov     rax, r8

-    xchg    rcx, rdx

+    pushq   %rdi

+    movq    %rcx, %rdi

+    movq    %r8, %rax

+    xchg    %rdx, %rcx

     rep     stosw

-    mov     rax, rdx

-    pop     rdi

+    movq    %rdx, %rax

+    popq    %rdi

     ret

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem32.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem32.S
index 9fbcdafcb4..93d705c674 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem32.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem32.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -34,15 +34,14 @@
 #    IN UINT32 Value

 #    );

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemSetMem32)

 ASM_PFX(InternalMemSetMem32):

-    push    rdi

-    mov     rdi, rcx

-    mov     rax, r8

-    xchg    rcx, rdx

-    rep     stosd

-    mov     rax, rdx

-    pop     rdi

+    pushq   %rdi

+    movq    %rcx, %rdi

+    movq    %r8, %rax

+    xchgq   %rdx, %rcx

+    rep     stosl

+    movq    %rdx, %rax

+    popq    %rdi

     ret

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem64.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem64.S
index c4f0b4685d..306077a1fa 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem64.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/SetMem64.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -33,15 +33,14 @@
 #    IN UINT64 Value

 #    )

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemSetMem64)

 ASM_PFX(InternalMemSetMem64):

-    push    rdi

-    mov     rdi, rcx

-    mov     rax, r8

-    xchg    rcx, rdx

+    pushq   %rdi

+    movq    %rcx, %rdi

+    movq    %r8, %rax

+    xchg    %rdx, %rcx

     rep     stosq

-    mov     rax, rdx

-    pop     rdi

+    movq    %rdx, %rax

+    popq    %rdi

     ret

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ZeroMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ZeroMem.S
index 6cd1474420..49cef3878b 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/X64/ZeroMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/X64/ZeroMem.S
@@ -3,7 +3,7 @@
 #

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

 #

-# Copyright (c) 2006 - 2008, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -32,21 +32,20 @@
 #    IN UINTN  Count

 #    );

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

-.intel_syntax noprefix

 ASM_GLOBAL ASM_PFX(InternalMemZeroMem)

 ASM_PFX(InternalMemZeroMem):

-    push    rdi

-    push    rcx

-    xor     rax, rax

-    mov     rdi, rcx

-    mov     rcx, rdx

-    shr     rcx, 3

-    and     rdx, 7

+    pushq   %rdi

+    pushq   %rcx

+    xorq    %rax, %rax

+    movq    %rcx, %rdi

+    movq    %rdx, %rcx

+    shrq    $3, %rcx

+    andq    $7, %rdx

     cld

     rep     stosq

-    mov     rcx, rdx

+    movq    %rdx, %rcx

     rep     stosb

-    pop     rax

-    pop     rdi

+    popq    %rax

+    popq    %rdi

     ret

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
index ea5280357f..2923356f13 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
@@ -10,9 +10,9 @@
     BaseMemoryLibOptDxe

     BaseMemoryLibOptPei

     PeiMemoryLib

-    DxeMemoryLib

+    UefiMemoryLib

     

-  Copyright (c) 2006 - 2008 , Intel Corporation<BR>

+  Copyright (c) 2006 - 2009 , Intel Corporation<BR>

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -48,8 +48,5 @@ ZeroMem (
 {

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

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

-  if (Length == 0) {

-    return Buffer;

-  }

   return InternalMemZeroMem (Buffer, Length);

 }