ArmPkg/ArmDisassemblerLib: fix check for MSR instruction

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

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
index 37dc3bbf67355f48b0cb4c031e12a72b5e0d60b7..5224cf7153a399b2d462f1a2d466b1eb4f38c848 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.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 _InternalMemScanMem64\r
+ASM_GLOBAL ASM_PFX(InternalMemScanMem64)\r
 \r
 #------------------------------------------------------------------------------\r
 # CONST VOID *\r
@@ -43,7 +40,7 @@
 #   IN      UINT64                    Value\r
 #   );\r
 #------------------------------------------------------------------------------\r
-_InternalMemScanMem64:\r
+ASM_PFX(InternalMemScanMem64):\r
     push    %edi\r
     movl    12(%esp), %ecx\r
     movl    16(%esp), %eax\r
@@ -59,6 +56,8 @@ L0:
     jne     L0\r
 L1:\r
     leal    -8(%edi), %eax\r
-    cmovne  %ecx, %eax\r
+    jz      L2\r
+    movl    %ecx, %eax\r
+L2:    \r
     pop     %edi\r
     ret\r