MdePkg/BaseMemoryLibRepStr: Support IA32 processors without CMOVx

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

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
index a7ed192b8eefe182540450e9050a26dde028da49..585cda6f8c8a1100328576814f3a6cdf224c0e1b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
@@ -1,10 +1,10 @@
 #------------------------------------------------------------------------------\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
@@ -29,7 +29,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-.globl _InternalMemScanMem16\r
+ASM_GLOBAL ASM_PFX(InternalMemScanMem16)\r
 \r
 #------------------------------------------------------------------------------\r
 # CONST VOID *\r
@@ -40,13 +40,15 @@
 #   IN      UINT16                    Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMemScanMem16:\r
+ASM_PFX(InternalMemScanMem16):\r
     push    %edi\r
     movl    12(%esp), %ecx\r
     movl    8(%esp), %edi\r
     movl    16(%esp), %eax\r
     repne   scasw\r
     leal    -2(%edi), %eax\r
-    cmovnz  %ecx, %eax\r
+    jz      L0\r
+    movl    %ecx, %eax\r
+L0:    \r
     pop     %edi\r
     ret\r