MdePkg BaseMemoryLibRepStr: Convert Ia32/SetMem64.asm to NASM

[mirror_edk2.git] / MdePkg / Library / BaseMemoryLibRepStr / Ia32 / ScanMem32.S

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
index fced1b2362fa2f19fcf0bc7bd1aa46398e8c7110..91f04fa8004bd3c409510b3f74c90cf9a93c57ec 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
@@ -1,15 +1,10 @@
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #------------------------------------------------------------------------------\r
 #\r
-# Copyright (c) 2006, Intel Corporation\r
-# All rights reserved. This program and the accompanying materials\r
+# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# 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
-# http://opensource.org/licenses/bsd-license.php\r
+# http://opensource.org/licenses/bsd-license.php.\r
 #\r
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
@@ -24,15 +19,17 @@
 #\r
 # Notes:\r
 #\r
-#   The following BaseMemoryLib instances share the same version of this file:\r
+#   The following BaseMemoryLib instances contain the same copy of this file:\r
 #\r
 #       BaseMemoryLibRepStr\r
 #       BaseMemoryLibMmx\r
 #       BaseMemoryLibSse2\r
+#       BaseMemoryLibOptDxe\r
+#       BaseMemoryLibOptPei\r
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalMemScanMem32\r
+ASM_GLOBAL ASM_PFX(InternalMemScanMem32)\r
 \r
 #------------------------------------------------------------------------------\r
 # CONST VOID *\r
@@ -43,13 +40,15 @@
 #   IN      UINT32                    Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMemScanMem32:\r
+ASM_PFX(InternalMemScanMem32):\r
     push    %edi\r
     movl    12(%esp), %ecx\r
     movl    8(%esp), %edi\r
     movl    16(%esp), %eax\r
     repne   scasl\r
     leal    -4(%edi), %eax\r
-    cmovnz  %ecx, %eax\r
+    jz      L0\r
+    movl    %ecx, %eax\r
+L0:    \r
     pop     %edi\r
     ret\r