X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=CryptoPkg%2FLibrary%2FIntrinsicLib%2FMemoryIntrinsics.c;h=9d6867ebce2675df600b6ef5a4152769387f32eb;hp=48e0c52c369ace4413b5af06da14feaa4038b1cf;hb=7e1bc8cdb387430de34cf46a3da14b09dd2e84e2;hpb=97f98500c1d40eba76210961e90ea5d354bcbc18

diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
index 48e0c52c36..9d6867ebce 100644
--- a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
+++ b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
@@ -2,7 +2,7 @@
   Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based
   Cryptographic Library.
 
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 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
@@ -23,5 +23,24 @@ int _fltused = 1;
 /* Sets buffers to a specified character */
 void * memset (void *dest, char ch, unsigned int count)
 {
-  return SetMem (dest, (UINTN)count, (UINT8)ch);
+  //
+  // NOTE: Here we use one base implementation for memset, instead of the direct
+  //       optimized SetMem() wrapper. Because the IntrinsicLib has to be built 
+  //       without whole program optimization option, and there will be some 
+  //       potential register usage errors when calling other optimized codes.
+  //
+
+  //
+  // Declare the local variables that actually move the data elements as
+  // volatile to prevent the optimizer from replacing this function with
+  // the intrinsic memset()
+  //
+  volatile UINT8  *Pointer;
+
+  Pointer = (UINT8 *)dest;
+  while (count-- != 0) {
+    *(Pointer++) = ch;
+  }
+  
+  return dest;
 }