MdePkg/BaseMemoryLib: Fix VS2015 build error

[mirror_edk2.git] / MdePkg / Library / BaseMemoryLib / SetMem.c

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem.c b/MdePkg/Library/BaseMemoryLib/SetMem.c
index bd7fee014db558cfe1b639ce75a159eebc07c6f2..b6fb811c388a0e1115ae2ef080d24b15f9199712 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem.c
@@ -4,26 +4,31 @@
   build for a particular platform easily if an optimized version\r
   is desired.\r
 \r
-  Copyright (c) 2006, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2012 - 2013, ARM Ltd. All rights reserved.<BR>\r
+  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>\r
+\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
 \r
-  Module Name:  EfiSetMem.c\r
-\r
 **/\r
 \r
 \r
+\r
+\r
+#include "MemLibInternals.h"\r
+\r
 /**\r
   Set Buffer to Value for Size bytes.\r
 \r
-  @param  Buffer Memory to set.\r
-  @param  Size Number of bytes to set\r
-  @param  Value Value of the set operation.\r
+  @param  Buffer   The memory to set.\r
+  @param  Length   The number of bytes to set.\r
+  @param  Value    The value of the set operation.\r
 \r
   @return Buffer\r
 \r
@@ -31,8 +36,8 @@
 VOID *\r
 EFIAPI\r
 InternalMemSetMem (\r
-  IN      VOID                      *Buffer,\r
-  IN      UINTN                     Size,\r
+  OUT     VOID                      *Buffer,\r
+  IN      UINTN                     Length,\r
   IN      UINT8                     Value\r
   )\r
 {\r
@@ -41,11 +46,42 @@ InternalMemSetMem (
   // volatile to prevent the optimizer from replacing this function with\r
   // the intrinsic memset()\r
   //\r
-  volatile UINT8                    *Pointer;\r
+  volatile UINT8                    *Pointer8;\r
+  volatile UINT32                   *Pointer32;\r
+  volatile UINT64                   *Pointer64;\r
+  UINT32                            Value32;\r
+  UINT64                            Value64;\r
 \r
-  Pointer = (UINT8*)Buffer;\r
-  while (Size-- != 0) {\r
-    *(Pointer++) = Value;\r
+  if ((((UINTN)Buffer & 0x7) == 0) && (Length >= 8)) {\r
+    // Generate the 64bit value\r
+    Value32 = (Value << 24) | (Value << 16) | (Value << 8) | Value;\r
+    Value64 = LShiftU64 (Value32, 32) | Value32;\r
+\r
+    Pointer64 = (UINT64*)Buffer;\r
+    while (Length >= 8) {\r
+      *(Pointer64++) = Value64;\r
+      Length -= 8;\r
+    }\r
+\r
+    // Finish with bytes if needed\r
+    Pointer8 = (UINT8*)Pointer64;\r
+  } else if ((((UINTN)Buffer & 0x3) == 0) && (Length >= 4)) {\r
+    // Generate the 32bit value\r
+    Value32 = (Value << 24) | (Value << 16) | (Value << 8) | Value;\r
+\r
+    Pointer32 = (UINT32*)Buffer;\r
+    while (Length >= 4) {\r
+      *(Pointer32++) = Value32;\r
+      Length -= 4;\r
+    }\r
+\r
+    // Finish with bytes if needed\r
+    Pointer8 = (UINT8*)Pointer32;\r
+  } else {\r
+    Pointer8 = (UINT8*)Buffer;\r
+  }\r
+  while (Length-- > 0) {\r
+    *(Pointer8++) = Value;\r
   }\r
   return Buffer;\r
 }\r