X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=MdePkg%2FLibrary%2FBaseMemoryLibRepStr%2FSetMem64Wrapper.c;h=05dc453c3a0c12c07d0d45fba657a76b66a6a06d;hb=1fef058f4b8fefc455bb171e4908c3e835b1b492;hp=0128a2d6f13fe2b6057c37edbcd60fa4f8a9cac5;hpb=533f039eb0bd2a1d5e7f11debb1379b048630021;p=mirror_edk2.git

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
index 0128a2d6f1..05dc453c3a 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
@@ -1,7 +1,17 @@
 /** @file
   SetMem64() implementation.
 
-  Copyright (c) 2006, Intel Corporation<BR>
+  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
@@ -10,17 +20,6 @@
   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:  SetMem64Wrapper.c
-
-  The following BaseMemoryLib instances share the same version of this file:
-
-    BaseMemoryLib
-    BaseMemoryLibMmx
-    BaseMemoryLibSse2
-    BaseMemoryLibRepStr
-    PeiMemoryLib
-    UefiMemoryLib
-
 **/
 
 #include "MemLibInternals.h"
@@ -32,7 +31,7 @@
   Value, and returns Buffer. Value is repeated every 64-bits in for Length
   bytes of Buffer.
 
-  If Buffer is NULL and Length > 0, then ASSERT().
+  If Length > 0 and Buffer is NULL, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), 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().
@@ -41,24 +40,25 @@
   @param  Length  Number of bytes in Buffer to fill.
   @param  Value   Value with which to fill Length bytes of Buffer.
 
-  @return Buffer
+  @return Buffer.
 
 **/
 VOID *
 EFIAPI
 SetMem64 (
-  OUT     VOID                      *Buffer,
-  IN      UINTN                     Length,
-  IN      UINT64                    Value
+  OUT VOID   *Buffer,
+  IN UINTN   Length,
+  IN UINT64  Value
   )
 {
-  ASSERT (!(Buffer == NULL && Length > 0));
-  ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
+  if (Length == 0) {
+    return Buffer;
+  }
+
+  ASSERT (Buffer != NULL);
+  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
   ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);
   ASSERT ((Length & (sizeof (Value) - 1)) == 0);
 
-  if ((Length /= sizeof (Value)) == 0) {
-    return Buffer;
-  }
-  return InternalMemSetMem64 (Buffer, Length, Value);
+  return InternalMemSetMem64 (Buffer, Length / sizeof (Value), Value);
 }