X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FLibrary%2FBaseMemoryLib%2FScanMem64Wrapper.c;h=87d1643642b03e8b253f8cfcd9754b1efbdbbffb;hb=56385d49874f4b7cee6c9a0652c6b7c10aff0e2f;hp=c5f0762ebe69ee21eb757f9b5de19ca3a45a6c41;hpb=24de7645e857287d096b058f7a64fb7f618c0194;p=mirror_edk2.git

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
index c5f0762ebe..87d1643642 100644
--- a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
@@ -1,66 +1,67 @@
 /** @file
   ScanMem64() implementation.
 
-  Copyright (c) 2006, Intel Corporation<BR>
-  All rights reserved. This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  Module Name:  ScanMem64Wrapper.c
-
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     UefiMemoryLib
 
+  Copyright (c) 2006 - 2009, Intel Corporation<BR>
+  All rights reserved. This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
 **/
 
 #include "MemLibInternals.h"
 
 /**
-  Scans a target buffer for a 64-bit value, and returns a pointer to the
-  matching 64-bit value in the target buffer.
-
-  This function searches target the buffer specified by Buffer and Length from
-  the lowest address to the highest address at 64-bit increments for a 64-bit
-  value that matches Value. If a match is found, then a pointer to the matching
-  value in the target buffer is returned. If no match is found, then NULL is
-  returned. If Length is 0, then NULL is returned.
+  Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value
+  in the target buffer.
 
-  If Buffer is NULL, then ASSERT().
+  This function searches the target buffer specified by Buffer and Length from the lowest
+  address to the highest address for a 64-bit value that matches Value.  If a match is found,
+  then a pointer to the matching byte in the target buffer is returned.  If no match is found,
+  then NULL is returned.  If Length is 0, then NULL is returned.
+  
+  If Length > 0 and Buffer is NULL, then ASSERT().
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().
+  If Length is not aligned on a 64-bit boundary, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer  Pointer to the target buffer to scan.
-  @param  Length  Number of bytes in Buffer to scan.
-  @param  Value   Value to search for in the target buffer.
+  @param  Buffer      Pointer to the target buffer to scan.
+  @param  Length      Number of bytes in Buffer to scan.
+  @param  Value       Value to search for in the target buffer.
 
-  @return Pointer to the first occurrence or NULL if not found.
-  @retval NULL  if Length == 0 or Value was not found.
+  @return A pointer to the matching byte in the target buffer or NULL otherwise.
 
 **/
 VOID *
 EFIAPI
 ScanMem64 (
-  IN      CONST VOID                *Buffer,
-  IN      UINTN                     Length,
-  IN      UINT64                    Value
+  IN CONST VOID  *Buffer,
+  IN UINTN       Length,
+  IN UINT64      Value
   )
 {
+  if (Length == 0) {
+    return NULL;
+  }
+
   ASSERT (Buffer != NULL);
   ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);
-  ASSERT (Length <= MAX_ADDRESS + (UINTN)Buffer + 1);
+  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);
 
-  if ((Length /= sizeof (Value)) == 0) {
-    return NULL;
-  }
-  return (VOID*)InternalMemScanMem64 (Buffer, Length, Value);
+  return (VOID*)InternalMemScanMem64 (Buffer, Length / sizeof (Value), Value);
 }