diff options
| author | Shenglei Zhang <shenglei.zhang@intel.com> | 2020-05-09 14:33:36 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-05-14 14:38:54 +0000 |
| commit | 8b680e4af113fbd913d57777a12dd1dd34d0f6f7 (patch) | |
| tree | a6d07287b0ea4598e0231d8ace1ac7388d000991 /MdeModulePkg/Universal | |
| parent | f2cdb268ef04eeec51948b5d81eeca5cab5ed9af (diff) | |
| download | edk2-8b680e4af113fbd913d57777a12dd1dd34d0f6f7.tar.gz edk2-8b680e4af113fbd913d57777a12dd1dd34d0f6f7.tar.bz2 edk2-8b680e4af113fbd913d57777a12dd1dd34d0f6f7.zip | |
MdeModulePkg/RegularExpressionDxe: Optimize the code infrastructure
OnigurumaIntrinsics.c is now not used. So the implement of function
'memcpy' is now not., which causes build failure with CLANG9 and
XCODE. I remove OnigurumaIntrinsics.c and move the necessary function
implement to OnigurumaUefiPort.c/h.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Diffstat (limited to 'MdeModulePkg/Universal')
4 files changed, 12 insertions, 49 deletions
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaIntrinsics.c b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaIntrinsics.c deleted file mode 100644 index 536c7e0f1b..0000000000 --- a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaIntrinsics.c +++ /dev/null @@ -1,48 +0,0 @@ -/** @file
-
- Provide intrinsics within Oniguruma
-
- (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
- Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
-
- SPDX-License-Identifier: BSD-2-Clause-Patent
-**/
-
-#include <Library/BaseMemoryLib.h>
-
-//
-// From CryptoPkg/IntrinsicLib
-//
-
-/* Copies bytes between buffers */
-#pragma function(memcpy)
-void * memcpy (void *dest, const void *src, unsigned int count)
-{
- return CopyMem (dest, src, (UINTN)count);
-}
-
-/* Sets buffers to a specified character */
-#pragma function(memset)
-void * memset (void *dest, char ch, unsigned int 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;
-}
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c index b1604b378a..2b2b0d420d 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c +++ b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c @@ -86,3 +86,13 @@ void * realloc (void *ptr, size_t size) return NULL;
}
+void* memcpy (void *dest, const void *src, unsigned int count)
+{
+ return CopyMem (dest, src, (UINTN)count);
+}
+
+void* memset (void *dest, char ch, unsigned int count)
+{
+ return SetMem (dest, ch, count);
+}
+
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h index 1a0b2daf47..20b75c3361 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h +++ b/MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h @@ -96,6 +96,8 @@ int EFIAPI sprintf_s (char *str, size_t sizeOfBuffer, char const *fmt, ...); int strlen(const char* str);
void* malloc(size_t size);
void* realloc(void *ptr, size_t size);
+void* memcpy (void *dest, const void *src, unsigned int count);
+void* memset (void *dest, char ch, unsigned int count);
#define exit(n) ASSERT(FALSE);
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf index da63aa6eb4..84489c2942 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf +++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf @@ -20,7 +20,6 @@ RegularExpressionDxe.h
OnigurumaUefiPort.h
OnigurumaUefiPort.c
- OnigurumaIntrinsics.c | MSFT
# Wrapper header files start #
stdio.h
|