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

diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c
index 48e0c52c36..bf485d680d 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 - 2017, 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
@@ -15,13 +15,46 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <Base.h>
 #include <Library/BaseMemoryLib.h>
+#include <Library/BaseLib.h>
+
+typedef UINTN  size_t;
 
 /* OpenSSL will use floating point support, and C compiler produces the _fltused
    symbol by default. Simply define this symbol here to satisfy the linker. */
 int _fltused = 1;
 
 /* Sets buffers to a specified character */
-void * memset (void *dest, char ch, unsigned int count)
+void * memset (void *dest, char ch, size_t count)
+{
+  //
+  // 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;
+}
+
+/* Compare bytes in two buffers. */
+int memcmp (const void *buf1, const void *buf2, size_t count)
+{
+  return (int)CompareMem(buf1, buf2, count);
+}
+
+int strcmp (const char *s1, const char *s2)
 {
-  return SetMem (dest, (UINTN)count, (UINT8)ch);
+  return (int)AsciiStrCmp(s1, s2);
 }