MdePkg/BaseMemoryLibRepStr: Support IA32 processors without CMOVx

[mirror_edk2.git] / MdePkg / Library / BaseMemoryLibRepStr / Ia32 / ScanMem64.asm

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
index f9725a4a5d65414f49952e4bc3053cdf7264188c..96e3b99f7260858cdf49342361a5a23015af0703 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
@@ -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
@@ -19,11 +19,13 @@
 ;\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
@@ -31,6 +33,15 @@
     .model  flat,C\r
     .code\r
 \r
+;------------------------------------------------------------------------------\r
+; CONST VOID *\r
+; EFIAPI\r
+; InternalMemScanMem64 (\r
+;   IN      CONST VOID                *Buffer,\r
+;   IN      UINTN                     Length,\r
+;   IN      UINT64                    Value\r
+;   );\r
+;------------------------------------------------------------------------------\r
 InternalMemScanMem64    PROC    USES    edi\r
     mov     ecx, [esp + 12]\r
     mov     eax, [esp + 16]\r
@@ -46,7 +57,9 @@ InternalMemScanMem64    PROC    USES    edi
     jne     @B\r
 @@:\r
     lea     eax, [edi - 8]\r
-    cmovne  eax, ecx\r
+    jz      @F\r
+    mov     eax, ecx\r
+@@:    \r
     ret\r
 InternalMemScanMem64    ENDP\r
 \r