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

[mirror_edk2.git] / MdePkg / Library / BaseMemoryLibRepStr / X64 / CopyMem.S

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/X64/CopyMem.S b/MdePkg/Library/BaseMemoryLibRepStr/X64/CopyMem.S
index 4477006e41e47a112d70974686ce1617d8e2881d..5eb1d4654779b34592741334039300850b919dca 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/X64/CopyMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/X64/CopyMem.S
@@ -3,7 +3,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 #\r
-# Copyright (c) 2006 - 2008, Intel Corporation\r
+# Copyright (c) 2006 - 2009, Intel Corporation\r
 # All rights reserved. This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -34,34 +34,33 @@
 #    IN UINTN  Count\r
 #    )\r
 #------------------------------------------------------------------------------\r
-.intel_syntax noprefix\r
 ASM_GLOBAL ASM_PFX(InternalMemCopyMem)\r
 ASM_PFX(InternalMemCopyMem):\r
-    push    rsi\r
-    push    rdi\r
-    mov     rsi, rdx                    # rsi <- Source\r
-    mov     rdi, rcx                    # rdi <- Destination\r
-    lea     r9, [rsi + r8 - 1]          # r9 <- End of Source\r
-    cmp     rsi, rdi\r
-    mov     rax, rdi                    # rax <- Destination as return value\r
+    pushq   %rsi\r
+    pushq   %rdi\r
+    movq    %rdx, %rsi                  # rsi <- Source\r
+    movq    %rcx, %rdi                  # rdi <- Destination\r
+    leaq    -1(%rsi, %r8,), %r9         # r9 <- End of Source\r
+    cmpq    %rdi, %rsi\r
+    movq    %rdi, %rax                  # rax <- Destination as return value\r
     jae     L0\r
-    cmp     r9, rdi\r
+    cmpq    %rdi, %r9\r
     jae     L_CopyBackward               # Copy backward if overlapped\r
 L0:\r
-    mov     rcx, r8\r
-    and     r8, 7\r
-    shr     rcx, 3\r
+    movq    %r8, %rcx\r
+    andq    $7, %r8\r
+    shrq    $3, %rcx\r
     rep     movsq                       # Copy as many Qwords as possible\r
     jmp     L_CopyBytes\r
 L_CopyBackward:\r
-    mov     rsi, r9                     # rsi <- End of Source\r
-    lea     rdi, [rdi + r8 - 1]         # esi <- End of Destination\r
+    movq    %r9, %rsi                   # rsi <- End of Source\r
+    leaq    -1(%rdi, %r8),  %rdi        # esi <- End of Destination\r
     std                                 # set direction flag\r
 L_CopyBytes:\r
-    mov     rcx, r8\r
+    movq    %r8, %rcx\r
     rep     movsb                       # Copy bytes backward\r
     cld\r
-    pop     rdi\r
-    pop     rsi\r
+    popq    %rdi\r
+    popq    %rsi\r
     ret\r
 \r