1. Change 0 == Length style to Length == 0

2. Clean BasePeCoff library instance, only keep one copy PeCoffLoaderEx.c file for IA32, X64 and IPF arch
3. Clean the confused comments

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5927 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Library/BaseMemoryLib.h b/MdePkg/Include/Library/BaseMemoryLib.h
index 4eb0bf257abf25147742b433b4b2f65942770e30..26e6b2f3378c3d272fd5b177340b69b74e4901af 100644 (file)
--- a/MdePkg/Include/Library/BaseMemoryLib.h
+++ b/MdePkg/Include/Library/BaseMemoryLib.h
@@ -168,8 +168,8 @@ ZeroMem (
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index 76aca8d478b7a35f1be4bcfbb9c2cc02615e07d2..4a4ea66999a522c0a44a8b44f23ac665364f50a5 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
@@ -13,7 +13,7 @@
   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
-  The following IoLib instances share the same version of this file:\r
+  The following IoLib instances contain the same copy of this file:\r
 \r
     BaseIoLibIntrinsic\r
     DxeIoLibCpuIo\r

diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 600f8c8a36a4b88a032d91fa6638f2c5698a71b1..872642e9580dd1b00c7dec58cdedd6b2368e0129 100644 (file)
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -289,7 +289,7 @@ StrnCmp (
   IN      UINTN                     Length\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return 0;\r
   }\r
 \r
@@ -1151,7 +1151,7 @@ AsciiStrnCpy (
 {\r
   CHAR8                             *ReturnValue;\r
 \r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Destination;\r
   }\r
 \r
@@ -1430,7 +1430,7 @@ AsciiStrnCmp (
   IN      UINTN                     Length\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return 0;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
index 12bd4c2d4647b5e9fa38f9837aa1a10b7c7538f1..59c2794b1ff8d6307554d5d74c6ccb298c55ec47 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -33,8 +35,8 @@
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). \r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). \r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
index 0164aad941360c6ab6337c228d94adef783fb5db..42335277a1831cf0b4be311d03a0a06c074ae834 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
index 3f135c837dc96f9791b262030a1f8ed9ecac3445..356700f96efb841d4e7ed7240cacea4540fa837e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
@@ -10,7 +10,7 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     PeiMemoryLib\r

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
index 6252f63adab17c8c68d72247f42a7e9775209770..27e8e0a32113d3055556b579bb7fc78ab363b6ec 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
index fa5619db7c663d250f9fe0e4f679f4aabebb0637..2f9c194d77fc394c6c2a02efd96d4b945ef74bba 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
@@ -1,11 +1,13 @@
 /** @file\r
   Declaration of internal functions for Base Memory Library.\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
index d2f6761d6cda1808b260dd39e0e65a6a68be79d3..3161c91278f9c024ec99cb633ab2a768eb01571f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,14 +56,14 @@ ScanMem16 (
   IN UINT16      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r
   ASSERT (Buffer != NULL);\r
-  ASSERT (0 == ((UINTN)Buffer & (sizeof (Value) - 1)));\r
+  ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
-  ASSERT (0 == (Length & (sizeof (Value) - 1)));\r
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);\r
 \r
   return (VOID*)InternalMemScanMem16 (Buffer, Length / sizeof (Value), Value);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
index 7f42daf6c83480a465f9d197bb634845ab226a94..939de99b3d8a67e299b952e2510983a2e040e4da 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,14 +56,14 @@ ScanMem32 (
   IN UINT32      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r
   ASSERT (Buffer != NULL);\r
-  ASSERT (0 == ((UINTN)Buffer & (sizeof (Value) - 1)));\r
+  ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
-  ASSERT (0 == (Length & (sizeof (Value) - 1)));\r
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);\r
 \r
   return (VOID*)InternalMemScanMem32 (Buffer, Length / sizeof (Value), Value);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
index def2ce93eee536b70375c746fe7a132ef196d33b..099da5dc042ca43aef63f265995fa5c898edc786 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,14 +56,14 @@ ScanMem64 (
   IN UINT64      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r
   ASSERT (Buffer != NULL);\r
-  ASSERT (0 == ((UINTN)Buffer & (sizeof (Value) - 1)));\r
+  ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
-  ASSERT (0 == (Length & (sizeof (Value) - 1)));\r
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);\r
 \r
   return (VOID*)InternalMemScanMem64 (Buffer, Length / sizeof (Value), Value);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
index 215cbc510efc48cd3ee8841cc0eef4b1ededdb02..d66b1a2666203a4f4d1b7cfc6efd7bc5e59b145b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -52,7 +54,7 @@ ScanMem8 (
   IN UINT8       Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
   ASSERT (Buffer != NULL);\r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
index 5e7c4baefc512d28c1c06762ced47839e54c9176..83dd37ee28a182113631a7b4dac32be23476b069 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,14 +55,14 @@ SetMem16 (
   IN UINT16  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
-  ASSERT (0 == (((UINTN)Buffer) & (sizeof (Value) - 1)));\r
-  ASSERT (0 == (Length & (sizeof (Value) - 1)));\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);\r
 \r
   return InternalMemSetMem16 (Buffer, Length / sizeof (Value), Value);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
index 388c0eb316cd424ee48b9e17e6bc4b1c0f46783c..236c3ca21ef4858c18dbcceee666663b043e3f93 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,14 +55,14 @@ SetMem32 (
   IN UINT32  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
-  ASSERT (0 == (((UINTN)Buffer) & (sizeof (Value) - 1)));\r
-  ASSERT (0 == (Length & (sizeof (Value) - 1)));\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);\r
 \r
   return InternalMemSetMem32 (Buffer, Length / sizeof (Value), Value);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
index 10f489e69b5da6118cdab4aa1cb10e344b6d5fbe..30fa46b4b14253a3ad551c0103bf985afa07693a 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,14 +55,14 @@ SetMem64 (
   IN UINT64  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r
   ASSERT (Buffer != NULL);\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
-  ASSERT (0 == (((UINTN)Buffer) & (sizeof (Value) - 1)));\r
-  ASSERT (0 == (Length & (sizeof (Value) - 1)));\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);\r
 \r
   return InternalMemSetMem64 (Buffer, Length / sizeof (Value), Value);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
index 7ef3298a9bd7a8bcc83da5f0d14f2cd321cac4af..10224f73b8badb3d6afaf63caaad6d3ce7df5f4b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -47,7 +49,7 @@ SetMem (
   IN UINT8  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
index 0979fc507e6477f9ff144def893201cfa06c63d0..e87996a885583f5db0499323f59e2f1a45347ceb 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c
index 3be161278c56e917aa1241abb1ef95af06602dcb..049c32d58288bcac5ca425c5c324a4def8c2df3f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/CompareMemWrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  CompareMemWrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -32,8 +34,8 @@
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). \r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). \r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c
index 1cee34801a4877461ad361023563979e60fae731..102da791dd61b238cc8426cd4ec41a3e56a35b9b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/CopyMemWrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  CopyMemWrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -49,7 +51,7 @@ CopyMem (
   IN UINTN       Length\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return DestinationBuffer;\r
   }\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S
index e3ba6112cd661c57f2218e424594b9fe649ae34c..6b3f17bff22be9cbedf090f1e8cfd81e3372008a 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.S
@@ -19,11 +19,13 @@
 #\r
 # Notes:\r
 #\r
-#   The following BaseMemoryLib instances share the same version of this file:\r
+#   The following BaseMemoryLib instances contain the same copy of this file:\r
 #\r
 #       BaseMemoryLibRepStr\r
 #       BaseMemoryLibMmx\r
 #       BaseMemoryLibSse2\r
+#       BaseMemoryLibOptDxe\r
+#       BaseMemoryLibOptPei\r
 #\r
 #------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
index 1d0e7fad3978badad720a7beef77a03eb861469b..4ed5b6500ca9dd0f5156bd298eee909003195e27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S
index a9ac4a18079c41f38a001dbf7ce4b9429909a9be..a7ed192b8eefe182540450e9050a26dde028da49 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.S
@@ -19,11 +19,13 @@
 #\r
 # Notes:\r
 #\r
-#   The following BaseMemoryLib instances share the same version of this file:\r
+#   The following BaseMemoryLib instances contain the same copy of this file:\r
 #\r
 #       BaseMemoryLibRepStr\r
 #       BaseMemoryLibMmx\r
 #       BaseMemoryLibSse2\r
+#       BaseMemoryLibOptDxe\r
+#       BaseMemoryLibOptPei\r
 #\r
 #------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm
index 57fab61b775bf69a6e752c600ee4df67f7dfe02f..6ad09996eb6bfeab5a7f7d238bd114430a47efc6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S
index be50f949817a3803c9b1290f96d6a0029334caea..a0c786fcc45eb37fa336372e2e5f32e6901d50f6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.S
@@ -19,11 +19,13 @@
 #\r
 # Notes:\r
 #\r
-#   The following BaseMemoryLib instances share the same version of this file:\r
+#   The following BaseMemoryLib instances contain the same copy of this file:\r
 #\r
 #       BaseMemoryLibRepStr\r
 #       BaseMemoryLibMmx\r
 #       BaseMemoryLibSse2\r
+#       BaseMemoryLibOptDxe\r
+#       BaseMemoryLibOptPei\r
 #\r
 #------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm
index 6ac857ce163abb5e2cf3aadc49d8865d8bdfb383..e05bc16f7605ce77638e69d804affa3596f4dd77 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S
index b40f022d11f2eaa356d642887b97a6d0262fed2e..3ac51f44669b4c823ea5021a22840e63328a3a6f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.S
@@ -19,11 +19,13 @@
 #\r
 # Notes:\r
 #\r
-#   The following BaseMemoryLib instances share the same version of this file:\r
+#   The following BaseMemoryLib instances contain the same copy of this file:\r
 #\r
 #       BaseMemoryLibRepStr\r
 #       BaseMemoryLibMmx\r
 #       BaseMemoryLibSse2\r
+#       BaseMemoryLibOptDxe\r
+#       BaseMemoryLibOptPei\r
 #\r
 #------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm
index ca54f13738b2f7b4c1be26760b40bc70c54e755d..fb219503f0078cc33a841419618a4963163ccc04 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S
index 02298b9f0042f264b10088b69eef8ee40428681e..744b0578b11afd25581d93d36c35df4eeeeb8058 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.S
@@ -19,11 +19,13 @@
 #\r
 # Notes:\r
 #\r
-#   The following BaseMemoryLib instances share the same version of this file:\r
+#   The following BaseMemoryLib instances contain the same copy of this file:\r
 #\r
 #       BaseMemoryLibRepStr\r
 #       BaseMemoryLibMmx\r
 #       BaseMemoryLibSse2\r
+#       BaseMemoryLibOptDxe\r
+#       BaseMemoryLibOptPei\r
 #\r
 #------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm
index a3f65b64fac29b0de29ac05f54cf645127457737..da3ab3c3ad7e3a05e12012da9b1fa60be6bff5cc 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/Ia32/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c
index 0d46ab92f5c859d213196f4c6544c51ca03484e6..33786530a2920144f687b1da18280053bd6153e0 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  MemLibGuid.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibMmx/MemLibInternals.h
index 202aa19e5aab44065c5aa2fc47939fff1b7ef4d0..981ae2e91357bf86adeea602b5f11e3986eea3c0 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibMmx/MemLibInternals.h
@@ -12,12 +12,14 @@
 \r
   Module Name:  MemLibInternals.h\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
index 083400743fd840b2fbaf8901dc14f217d66481f5..d184a9f7bd59c65d563d8ccefacbe95f3e43017d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  ScanMem16Wrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ ScanMem16 (
   IN UINT16      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c
index 25aa05b0a09d0ff77546dd2130df881dd3a56251..17369170a2aa97b0536772b49a62cc837ee21c21 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  ScanMem32Wrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ ScanMem32 (
   IN UINT32      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c
index da7834c68cc0454116e33eaa2547bf30fef6f640..258fbb4e28cccb6129b270c735e59df38e229a97 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  ScanMem64Wrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ ScanMem64 (
   IN UINT64      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
index 1396fa1e49a79ea8e4ea8acf6b6d9e78df17314a..bf7739679fc4118c2e65b43ed14eba0bf5ffa1d0 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  ScanMem8Wrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -51,7 +53,7 @@ ScanMem8 (
   IN UINT8       Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
   ASSERT (Buffer != NULL);\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
index 1596328a58739a1a3c53a41424be968e22ccb283..b453fa4bc51cb75fda2987c084f242227a420990 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMem16Wrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  SetMem16Wrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -52,7 +54,7 @@ SetMem16 (
   IN UINT16  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
index 25249174796ad3dbb9364d249b4090d0e7b5db2c..78a6097c1072729f457696eb93a4f64566afefb1 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMem32Wrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  SetMem32Wrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -52,7 +54,7 @@ SetMem32 (
   IN UINT32  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
index 0cfcb9fa4b385cc549d0cf212b5e799277e261d6..b4542e4952f5e7f9a3ef26036cc3e32544b7ae9d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMem64Wrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  SetMem64Wrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -52,7 +54,7 @@ SetMem64 (
   IN UINT64  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
index 77e3b326fd54c098f7ee86f0e02ee587591405a2..dbc060eaf78e79621987328917ea3acdcd3be755 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  SetMemWrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -46,7 +48,7 @@ SetMem (
   IN UINT8  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S b/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S
index fb1dccee0bfe6cccd0f2e8fb996e1b5378fb53de..2dc71b2b9a7bc2a44b148b41a57dbf4be7b0207d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm
index 554bc07c642c42adf1bcfcdd8f59e9b73d8d928c..7446a052e0ebbafcd2e8502cacb789129c13b96c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm
index a2538c2cca8f11103c9d94ab59ef4ca81ff5046c..0871a4b0f5ea46652c96fa45105c98e22776f52c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm
index e0523d854703a476b55bb447bc88f1628f150e71..53a33bafb2a71327ac20daae6903a935d4f8faa8 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm
index 0e7e9c782f8fd3238a767108bda534d1191527d0..71f85a1ab79a47b13642b5e553e5498912d57784 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm
index 879273f960ef3f4201f2226a65559076d24ffe42..39adb01b7f4cf6af147efcd7c495ddb9dd7c2246 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibMmx/X64/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c
index dcebcf5ee6a39c573153a3ede12e0cc95904206a..4831b01091f802fc88583171cca25c22f6022e28 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ZeroMemWrapper.c
@@ -12,12 +12,14 @@
 \r
   Module Name:  ZeroMemWrapper.c\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -45,7 +47,7 @@ ZeroMem (
   IN UINTN  Length\r
   )\r
 {\r
-  ASSERT (!(NULL == Buffer && Length > 0));\r
+  ASSERT (!(Buffer == NULL && Length > 0));\r
   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));\r
   return InternalMemZeroMem (Buffer, Length);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
index 12bd4c2d4647b5e9fa38f9837aa1a10b7c7538f1..9adc03baf055d8a6b3137b0f6cd4bc825bd3942f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
@@ -10,20 +10,19 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
 **/\r
 \r
-\r
-\r
-\r
 #include "MemLibInternals.h"\r
 \r
 /**\r
@@ -33,8 +32,8 @@
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). \r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). \r
 \r
@@ -43,7 +42,7 @@
   @param  SourceBuffer      Pointer to the source buffer to compare.\r
   @param  Length            Number of bytes to compare.\r
 \r
-  @return 0                 All Length bytes of the two buffers are identical.\r
+  @retval 0                 All Length bytes of the two buffers are identical.\r
   @retval Non-zero          The first mismatched byte in SourceBuffer subtracted from the first\r
                             mismatched byte in DestinationBuffer.\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
index 80feff7c98c5c0b70cd6ef433e92f7a9d4365280..42335277a1831cf0b4be311d03a0a06c074ae834 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -50,7 +52,7 @@ CopyMem (
   IN UINTN       Length\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return DestinationBuffer;\r
   }\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.S
index 2b1014ad4235c09fceec04ee7286d0f55c24d93d..94216d02d6683b4911ba31394cf4f8fb1bf02a6e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.asm
index 1d0e7fad3978badad720a7beef77a03eb861469b..4ed5b6500ca9dd0f5156bd298eee909003195e27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.S
index e944052645988ddaac35d5b6d39d7faabbf42750..db66ade1e14ab1186d1bcf71c6d1b2e7ca2da700 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.asm
index 57fab61b775bf69a6e752c600ee4df67f7dfe02f..6ad09996eb6bfeab5a7f7d238bd114430a47efc6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.S
index 00461db1c605c8e9dee93ab1cc2ad9600b619091..0cae5d3780ccba45ccd7ed19122b8f91af4779c7 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.asm
index 6ac857ce163abb5e2cf3aadc49d8865d8bdfb383..e05bc16f7605ce77638e69d804affa3596f4dd77 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.S
index 2e5c6ee28ba7f251908011da2a02dec2737b8226..aeb63d424cfebd125edf0c1142c35f4753044b7d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.asm
index ca54f13738b2f7b4c1be26760b40bc70c54e755d..fb219503f0078cc33a841419618a4963163ccc04 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.S
index 36f88bfe6f976264db898af9f7d02c498a8bde15..bf19e471db13c776ee71b791b86b615c5264f245 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.asm
index a3f65b64fac29b0de29ac05f54cf645127457737..da3ab3c3ad7e3a05e12012da9b1fa60be6bff5cc 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
index 6252f63adab17c8c68d72247f42a7e9775209770..27e8e0a32113d3055556b579bb7fc78ab363b6ec 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
index 258dd1013ac147349d3942c1ce6c6ed4f9d7e596..24ad92e3f5d8b4674d05abce36595c65742a26f1 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
@@ -1,11 +1,13 @@
 /** @file\r
   Declaration of internal functions for Base Memory Library.\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
index ace0b49bd5af2f1fc3f2ab3a90f3fe23a19bc798..3161c91278f9c024ec99cb633ab2a768eb01571f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem16 (
   IN UINT16      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
index 40064ed8dfa63a69377df065633c6a5f0623b456..939de99b3d8a67e299b952e2510983a2e040e4da 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem32 (
   IN UINT32      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
index f900c3b4bb1ede9f2620a726465177f336e9a7a4..099da5dc042ca43aef63f265995fa5c898edc786 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem64 (
   IN UINT64      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
index 215cbc510efc48cd3ee8841cc0eef4b1ededdb02..d66b1a2666203a4f4d1b7cfc6efd7bc5e59b145b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -52,7 +54,7 @@ ScanMem8 (
   IN UINT8       Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
   ASSERT (Buffer != NULL);\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem16Wrapper.c
index 2d11ae4faac1f8999b49a00332e077dc2894152b..a31829d207237750a05b0a8d578f0e615eb70328 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contains the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem16 (
   IN UINT16  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem32Wrapper.c
index 5fba2024d60fb8ea1cb71c4dbe2b46febf5e6bb9..236c3ca21ef4858c18dbcceee666663b043e3f93 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem32 (
   IN UINT32  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem64Wrapper.c
index b165895739a73c08b4e177b65e79da8e72998121..30fa46b4b14253a3ad551c0103bf985afa07693a 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem64 (
   IN UINT64  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
index 7ef3298a9bd7a8bcc83da5f0d14f2cd321cac4af..10224f73b8badb3d6afaf63caaad6d3ce7df5f4b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -47,7 +49,7 @@ SetMem (
   IN UINT8  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
index a0b30d164da9334bca6fa9021931ca35fd6429e1..4e102322a963930dc03c4c84a14a92edf513c053 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contains the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -46,7 +48,10 @@ ZeroMem (
   IN UINTN  Length\r
   )\r
 {\r
-  ASSERT (!(NULL == Buffer && Length > 0));\r
+  ASSERT (!(Buffer == NULL && Length > 0));\r
   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));\r
+  if (Length == 0) {\r
+       return Buffer;\r
+  }\r
   return InternalMemZeroMem (Buffer, Length);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/x64/CompareMem.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/CompareMem.asm
index 554bc07c642c42adf1bcfcdd8f59e9b73d8d928c..7446a052e0ebbafcd2e8502cacb789129c13b96c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/x64/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem16.asm
index a2538c2cca8f11103c9d94ab59ef4ca81ff5046c..0871a4b0f5ea46652c96fa45105c98e22776f52c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem32.asm
index e0523d854703a476b55bb447bc88f1628f150e71..53a33bafb2a71327ac20daae6903a935d4f8faa8 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem64.asm
index 0e7e9c782f8fd3238a767108bda534d1191527d0..71f85a1ab79a47b13642b5e553e5498912d57784 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem8.asm
index 879273f960ef3f4201f2226a65559076d24ffe42..39adb01b7f4cf6af147efcd7c495ddb9dd7c2246 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/CompareMemWrapper.c
index 12bd4c2d4647b5e9fa38f9837aa1a10b7c7538f1..59c2794b1ff8d6307554d5d74c6ccb298c55ec47 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/CompareMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -33,8 +35,8 @@
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). \r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). \r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/CopyMemWrapper.c
index 80feff7c98c5c0b70cd6ef433e92f7a9d4365280..42335277a1831cf0b4be311d03a0a06c074ae834 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/CopyMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -50,7 +52,7 @@ CopyMem (
   IN UINTN       Length\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return DestinationBuffer;\r
   }\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));\r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.S
index 2b1014ad4235c09fceec04ee7286d0f55c24d93d..94216d02d6683b4911ba31394cf4f8fb1bf02a6e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.asm
index 1d0e7fad3978badad720a7beef77a03eb861469b..4ed5b6500ca9dd0f5156bd298eee909003195e27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.S
index e944052645988ddaac35d5b6d39d7faabbf42750..db66ade1e14ab1186d1bcf71c6d1b2e7ca2da700 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.asm
index 57fab61b775bf69a6e752c600ee4df67f7dfe02f..6ad09996eb6bfeab5a7f7d238bd114430a47efc6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.S
index 00461db1c605c8e9dee93ab1cc2ad9600b619091..0cae5d3780ccba45ccd7ed19122b8f91af4779c7 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.asm
index 6ac857ce163abb5e2cf3aadc49d8865d8bdfb383..e05bc16f7605ce77638e69d804affa3596f4dd77 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.S
index 2e5c6ee28ba7f251908011da2a02dec2737b8226..aeb63d424cfebd125edf0c1142c35f4753044b7d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.asm
index ca54f13738b2f7b4c1be26760b40bc70c54e755d..fb219503f0078cc33a841419618a4963163ccc04 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.S
index 36f88bfe6f976264db898af9f7d02c498a8bde15..bf19e471db13c776ee71b791b86b615c5264f245 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.asm
index a3f65b64fac29b0de29ac05f54cf645127457737..da3ab3c3ad7e3a05e12012da9b1fa60be6bff5cc 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c
index 45ff4193c1d54cca0669729f8d8cd3d9f3a83671..b2aefa98550d4fa9dbf5ca14b622beca146429a5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibOptPei/MemLibInternals.h
index fa5619db7c663d250f9fe0e4f679f4aabebb0637..2f9c194d77fc394c6c2a02efd96d4b945ef74bba 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibOptPei/MemLibInternals.h
@@ -1,11 +1,13 @@
 /** @file\r
   Declaration of internal functions for Base Memory Library.\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem16Wrapper.c
index ace0b49bd5af2f1fc3f2ab3a90f3fe23a19bc798..3161c91278f9c024ec99cb633ab2a768eb01571f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem16 (
   IN UINT16      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem32Wrapper.c
index 40064ed8dfa63a69377df065633c6a5f0623b456..939de99b3d8a67e299b952e2510983a2e040e4da 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem32 (
   IN UINT32      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem64Wrapper.c
index f900c3b4bb1ede9f2620a726465177f336e9a7a4..099da5dc042ca43aef63f265995fa5c898edc786 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem64 (
   IN UINT64      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem8Wrapper.c
index 215cbc510efc48cd3ee8841cc0eef4b1ededdb02..d66b1a2666203a4f4d1b7cfc6efd7bc5e59b145b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ScanMem8Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -52,7 +54,7 @@ ScanMem8 (
   IN UINT8       Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
   ASSERT (Buffer != NULL);\r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/SetMem16Wrapper.c
index 2d11ae4faac1f8999b49a00332e077dc2894152b..83dd37ee28a182113631a7b4dac32be23476b069 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/SetMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem16 (
   IN UINT16  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/SetMem32Wrapper.c
index 5fba2024d60fb8ea1cb71c4dbe2b46febf5e6bb9..236c3ca21ef4858c18dbcceee666663b043e3f93 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/SetMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem32 (
   IN UINT32  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/SetMem64Wrapper.c
index b165895739a73c08b4e177b65e79da8e72998121..30fa46b4b14253a3ad551c0103bf985afa07693a 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/SetMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem64 (
   IN UINT64  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/SetMemWrapper.c
index 7ef3298a9bd7a8bcc83da5f0d14f2cd321cac4af..10224f73b8badb3d6afaf63caaad6d3ce7df5f4b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/SetMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -47,7 +49,7 @@ SetMem (
   IN UINT8  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptPei/ZeroMemWrapper.c
index a0b30d164da9334bca6fa9021931ca35fd6429e1..e87996a885583f5db0499323f59e2f1a45347ceb 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptPei/ZeroMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -46,7 +48,7 @@ ZeroMem (
   IN UINTN  Length\r
   )\r
 {\r
-  ASSERT (!(NULL == Buffer && Length > 0));\r
+  ASSERT (!(Buffer == NULL && Length > 0));\r
   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));\r
   return InternalMemZeroMem (Buffer, Length);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/x64/CompareMem.asm b/MdePkg/Library/BaseMemoryLibOptPei/x64/CompareMem.asm
index 554bc07c642c42adf1bcfcdd8f59e9b73d8d928c..7446a052e0ebbafcd2e8502cacb789129c13b96c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/x64/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/x64/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem16.asm
index a2538c2cca8f11103c9d94ab59ef4ca81ff5046c..0871a4b0f5ea46652c96fa45105c98e22776f52c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem32.asm
index e0523d854703a476b55bb447bc88f1628f150e71..53a33bafb2a71327ac20daae6903a935d4f8faa8 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem64.asm
index 0e7e9c782f8fd3238a767108bda534d1191527d0..71f85a1ab79a47b13642b5e553e5498912d57784 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem8.asm
index 879273f960ef3f4201f2226a65559076d24ffe42..39adb01b7f4cf6af147efcd7c495ddb9dd7c2246 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibOptPei/x64/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
index 12bd4c2d4647b5e9fa38f9837aa1a10b7c7538f1..59c2794b1ff8d6307554d5d74c6ccb298c55ec47 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -33,8 +35,8 @@
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). \r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). \r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
index 80feff7c98c5c0b70cd6ef433e92f7a9d4365280..42335277a1831cf0b4be311d03a0a06c074ae834 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -50,7 +52,7 @@ CopyMem (
   IN UINTN       Length\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return DestinationBuffer;\r
   }\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S
index 725367b2f96e00fe834e446b7381793d9779c5ec..f0688f59cf163c3477ecc4408ee2fb7a6e3d3b9d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
index 1d0e7fad3978badad720a7beef77a03eb861469b..4ed5b6500ca9dd0f5156bd298eee909003195e27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
index 5e65b9667a23e2177791cae71abd460251d00fb9..e5ca893fe5eccddbff9ffef06a9d309aa736ddd9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
index 57fab61b775bf69a6e752c600ee4df67f7dfe02f..6ad09996eb6bfeab5a7f7d238bd114430a47efc6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
index 5d46ed2bc18ecb8eaff1fcf0c46f4cccbf73fdb3..ac2d877cf47c9ec62c55961ab4fc0afd8f851a01 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
index 6ac857ce163abb5e2cf3aadc49d8865d8bdfb383..e05bc16f7605ce77638e69d804affa3596f4dd77 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
index 3ba69650ab37d2448606afc8969e5c5df070742b..a6c5995e1b66be18360e03df161dab93f474bac7 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
index ca54f13738b2f7b4c1be26760b40bc70c54e755d..fb219503f0078cc33a841419618a4963163ccc04 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
index 7a834a56351e05ab35f7aa2827af89ea24521897..79edc1dc2dd8f05212ccb54bb2507bed4366600b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
index a3f65b64fac29b0de29ac05f54cf645127457737..da3ab3c3ad7e3a05e12012da9b1fa60be6bff5cc 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
index 45ff4193c1d54cca0669729f8d8cd3d9f3a83671..b2aefa98550d4fa9dbf5ca14b622beca146429a5 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
index fa5619db7c663d250f9fe0e4f679f4aabebb0637..2f9c194d77fc394c6c2a02efd96d4b945ef74bba 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
@@ -1,11 +1,13 @@
 /** @file\r
   Declaration of internal functions for Base Memory Library.\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
index ace0b49bd5af2f1fc3f2ab3a90f3fe23a19bc798..3161c91278f9c024ec99cb633ab2a768eb01571f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem16 (
   IN UINT16      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
index 40064ed8dfa63a69377df065633c6a5f0623b456..939de99b3d8a67e299b952e2510983a2e040e4da 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem32 (
   IN UINT32      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
index f900c3b4bb1ede9f2620a726465177f336e9a7a4..099da5dc042ca43aef63f265995fa5c898edc786 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem64 (
   IN UINT64      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
index 215cbc510efc48cd3ee8841cc0eef4b1ededdb02..d66b1a2666203a4f4d1b7cfc6efd7bc5e59b145b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -52,7 +54,7 @@ ScanMem8 (
   IN UINT8       Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
   ASSERT (Buffer != NULL);\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
index 2d11ae4faac1f8999b49a00332e077dc2894152b..83dd37ee28a182113631a7b4dac32be23476b069 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem16 (
   IN UINT16  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
index 5fba2024d60fb8ea1cb71c4dbe2b46febf5e6bb9..236c3ca21ef4858c18dbcceee666663b043e3f93 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem32 (
   IN UINT32  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
index b165895739a73c08b4e177b65e79da8e72998121..30fa46b4b14253a3ad551c0103bf985afa07693a 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem64 (
   IN UINT64  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
index 7ef3298a9bd7a8bcc83da5f0d14f2cd321cac4af..10224f73b8badb3d6afaf63caaad6d3ce7df5f4b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -47,7 +49,7 @@ SetMem (
   IN UINT8  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
index a0b30d164da9334bca6fa9021931ca35fd6429e1..e87996a885583f5db0499323f59e2f1a45347ceb 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -46,7 +48,7 @@ ZeroMem (
   IN UINTN  Length\r
   )\r
 {\r
-  ASSERT (!(NULL == Buffer && Length > 0));\r
+  ASSERT (!(Buffer == NULL && Length > 0));\r
   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));\r
   return InternalMemZeroMem (Buffer, Length);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.S
index 1498a5d9ae334dc615f118b692970d09591b2f25..46dfe0a23c25887fe0a67fb8c5b1cec50b7da352 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.S
@@ -22,11 +22,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm b/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm
index 554bc07c642c42adf1bcfcdd8f59e9b73d8d928c..7446a052e0ebbafcd2e8502cacb789129c13b96c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.S
index 018d2984f17e78eec7679c3adcdeeb14f9a4fda3..f56b9e96d849be6d9e17b2101c8719ac78d21a32 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.S
@@ -22,11 +22,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm
index a2538c2cca8f11103c9d94ab59ef4ca81ff5046c..0871a4b0f5ea46652c96fa45105c98e22776f52c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.S
index a253b9b5557698520d1f2835fc2559590adca387..ef9cd758cf67752313e995289e3188a70838ff19 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.S
@@ -22,11 +22,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm
index e0523d854703a476b55bb447bc88f1628f150e71..53a33bafb2a71327ac20daae6903a935d4f8faa8 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.S
index 528f81393a90137a634a11c8a99539c2f32ccbac..ee2ce39ba1afb36b738abf77c2ae56658e3de039 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.S
@@ -22,11 +22,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm
index 0e7e9c782f8fd3238a767108bda534d1191527d0..71f85a1ab79a47b13642b5e553e5498912d57784 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.S
index 84610eb8bcef4956494254903192762d7e928623..4ff3a959c8fd6a5eae5c9077be08866753dec026 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.S
@@ -22,11 +22,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm
index 879273f960ef3f4201f2226a65559076d24ffe42..39adb01b7f4cf6af147efcd7c495ddb9dd7c2246 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
index 12bd4c2d4647b5e9fa38f9837aa1a10b7c7538f1..59c2794b1ff8d6307554d5d74c6ccb298c55ec47 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -33,8 +35,8 @@
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). \r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). \r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
index 80feff7c98c5c0b70cd6ef433e92f7a9d4365280..42335277a1831cf0b4be311d03a0a06c074ae834 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -50,7 +52,7 @@ CopyMem (
   IN UINTN       Length\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return DestinationBuffer;\r
   }\r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
index 725367b2f96e00fe834e446b7381793d9779c5ec..f0688f59cf163c3477ecc4408ee2fb7a6e3d3b9d 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
index 1d0e7fad3978badad720a7beef77a03eb861469b..4ed5b6500ca9dd0f5156bd298eee909003195e27 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
index 5e65b9667a23e2177791cae71abd460251d00fb9..e5ca893fe5eccddbff9ffef06a9d309aa736ddd9 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
index 57fab61b775bf69a6e752c600ee4df67f7dfe02f..6ad09996eb6bfeab5a7f7d238bd114430a47efc6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
index 5d46ed2bc18ecb8eaff1fcf0c46f4cccbf73fdb3..ac2d877cf47c9ec62c55961ab4fc0afd8f851a01 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
index 6ac857ce163abb5e2cf3aadc49d8865d8bdfb383..e05bc16f7605ce77638e69d804affa3596f4dd77 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
index 3ba69650ab37d2448606afc8969e5c5df070742b..a6c5995e1b66be18360e03df161dab93f474bac7 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
index ca54f13738b2f7b4c1be26760b40bc70c54e755d..fb219503f0078cc33a841419618a4963163ccc04 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
index 7a834a56351e05ab35f7aa2827af89ea24521897..79edc1dc2dd8f05212ccb54bb2507bed4366600b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.S
@@ -19,11 +19,13 @@
 #
 # Notes:
 #
-#   The following BaseMemoryLib instances share the same version of this file:
+#   The following BaseMemoryLib instances contain the same copy of this file:
 #
 #       BaseMemoryLibRepStr
 #       BaseMemoryLibMmx
 #       BaseMemoryLibSse2
+#       BaseMemoryLibOptDxe
+#       BaseMemoryLibOptPei
 #
 #------------------------------------------------------------------------------
 

diff --git a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
index a3f65b64fac29b0de29ac05f54cf645127457737..da3ab3c3ad7e3a05e12012da9b1fa60be6bff5cc 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/Ia32/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
index 25d705f5b05438201a11b2c6cd392126a6de92b4..385aab020272358d8b1ad411ab8ebbfefebdfb4b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
index fa5619db7c663d250f9fe0e4f679f4aabebb0637..2f9c194d77fc394c6c2a02efd96d4b945ef74bba 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h
@@ -1,11 +1,13 @@
 /** @file\r
   Declaration of internal functions for Base Memory Library.\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
index ace0b49bd5af2f1fc3f2ab3a90f3fe23a19bc798..3161c91278f9c024ec99cb633ab2a768eb01571f 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem16 (
   IN UINT16      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
index 40064ed8dfa63a69377df065633c6a5f0623b456..939de99b3d8a67e299b952e2510983a2e040e4da 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem32 (
   IN UINT32      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
index f900c3b4bb1ede9f2620a726465177f336e9a7a4..099da5dc042ca43aef63f265995fa5c898edc786 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -54,7 +56,7 @@ ScanMem64 (
   IN UINT64      Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
index 215cbc510efc48cd3ee8841cc0eef4b1ededdb02..d66b1a2666203a4f4d1b7cfc6efd7bc5e59b145b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -52,7 +54,7 @@ ScanMem8 (
   IN UINT8       Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return NULL;\r
   }\r
   ASSERT (Buffer != NULL);\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
index 2d11ae4faac1f8999b49a00332e077dc2894152b..83dd37ee28a182113631a7b4dac32be23476b069 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem16 (
   IN UINT16  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
index 5fba2024d60fb8ea1cb71c4dbe2b46febf5e6bb9..236c3ca21ef4858c18dbcceee666663b043e3f93 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem32 (
   IN UINT32  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
index b165895739a73c08b4e177b65e79da8e72998121..30fa46b4b14253a3ad551c0103bf985afa07693a 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -53,7 +55,7 @@ SetMem64 (
   IN UINT64  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
index 7ef3298a9bd7a8bcc83da5f0d14f2cd321cac4af..10224f73b8badb3d6afaf63caaad6d3ce7df5f4b 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -47,7 +49,7 @@ SetMem (
   IN UINT8  Value\r
   )\r
 {\r
-  if (0 == Length) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
index a0b30d164da9334bca6fa9021931ca35fd6429e1..e87996a885583f5db0499323f59e2f1a45347ceb 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ZeroMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -46,7 +48,7 @@ ZeroMem (
   IN UINTN  Length\r
   )\r
 {\r
-  ASSERT (!(NULL == Buffer && Length > 0));\r
+  ASSERT (!(Buffer == NULL && Length > 0));\r
   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));\r
   return InternalMemZeroMem (Buffer, Length);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm
index 554bc07c642c42adf1bcfcdd8f59e9b73d8d928c..7446a052e0ebbafcd2e8502cacb789129c13b96c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/CompareMem.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm
index a2538c2cca8f11103c9d94ab59ef4ca81ff5046c..0871a4b0f5ea46652c96fa45105c98e22776f52c 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem16.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm
index e0523d854703a476b55bb447bc88f1628f150e71..53a33bafb2a71327ac20daae6903a935d4f8faa8 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem32.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm
index 0e7e9c782f8fd3238a767108bda534d1191527d0..71f85a1ab79a47b13642b5e553e5498912d57784 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem64.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm
index 879273f960ef3f4201f2226a65559076d24ffe42..39adb01b7f4cf6af147efcd7c495ddb9dd7c2246 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibSse2/x64/ScanMem8.asm
@@ -19,11 +19,13 @@
 ;\r
 ; Notes:\r
 ;\r
-;   The following BaseMemoryLib instances share the same version of this file:\r
+;   The following BaseMemoryLib instances contain the same copy of this file:\r
 ;\r
 ;       BaseMemoryLibRepStr\r
 ;       BaseMemoryLibMmx\r
 ;       BaseMemoryLibSse2\r
+;       BaseMemoryLibOptDxe\r
+;       BaseMemoryLibOptPei\r
 ;\r
 ;------------------------------------------------------------------------------\r
 \r

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index ea45ff745df2420d305bd3ea9514fe9062e511e4..f975754516eb6570e22baf59425e36bb44b34e49 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -1,10 +1,8 @@
 /** @file\r
-  Tiano PE/COFF loader.\r
-\r
-  This PE/COFF loader supports loading any PE32 or PE32+ image type, but\r
+  Base PE/COFF loader supports loading any PE32/PE32+ or TE image, but\r
   only supports relocating IA32, X64, IPF, and EBC images.\r
 \r
-  Copyright (c) 2006, Intel Corporation\r
+  Copyright (c) 2006 - 2008, Intel Corporation\r
   All rights reserved. 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
@@ -15,9 +13,6 @@
 \r
 **/\r
 \r
-\r
-\r
-\r
 #include "BasePeCoffLibInternals.h"\r
 \r
 /**\r
@@ -120,8 +115,12 @@ PeCoffLoaderGetPeHeader (
     ImageContext->IsTeImage         = TRUE;\r
     ImageContext->Machine           = Hdr.Te->Machine;\r
     ImageContext->ImageType         = (UINT16)(Hdr.Te->Subsystem);\r
+    //\r
+    // For TeImage, SectionAlignment is undefined to be set to Zero\r
+    // ImageSize can be calculated.\r
+    //\r
     ImageContext->ImageSize         = 0;\r
-    ImageContext->SectionAlignment  = 4096;\r
+    ImageContext->SectionAlignment  = 0;\r
     ImageContext->SizeOfHeaders     = sizeof (EFI_TE_IMAGE_HEADER) + (UINTN)Hdr.Te->BaseOfCode - (UINTN)Hdr.Te->StrippedSize;\r
 \r
   } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE)  {\r
@@ -173,9 +172,9 @@ PeCoffLoaderGetPeHeader (
 /**\r
   Retrieves information about a PE/COFF image.\r
 \r
-  Computes the PeCoffHeaderOffset, ImageAddress, ImageSize, DestinationAddress, CodeView,\r
-  PdbPointer, RelocationsStripped, SectionAlignment, SizeOfHeaders, and DebugDirectoryEntryRva\r
-  fields of the ImageContext structure.  If ImageContext is NULL, then return RETURN_INVALID_PARAMETER.\r
+  Computes the PeCoffHeaderOffset, ImageAddress, ImageSize, DestinationAddress, RelocationsStripped, \r
+  SectionAlignment, SizeOfHeaders, and DebugDirectoryEntryRva fields of the ImageContext structure. \r
+  If ImageContext is NULL, then return RETURN_INVALID_PARAMETER.\r
   If the PE/COFF image accessed through the ImageRead service in the ImageContext structure is not\r
   a supported PE/COFF image type, then return RETURN_UNSUPPORTED.  If any errors occur while\r
   computing the fields of ImageContext, then the error status is returned in the ImageError field of\r
@@ -209,7 +208,7 @@ PeCoffLoaderGetImageInfo (
   UINT32                                NumberOfRvaAndSizes;\r
   UINT16                                Magic;\r
 \r
-  if (NULL == ImageContext) {\r
+  if (ImageContext == NULL) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
   //\r
@@ -412,11 +411,10 @@ PeCoffLoaderGetImageInfo (
       // section headers in the Section Table must appear in order of the RVA\r
       // values for the corresponding sections. So the ImageSize can be determined\r
       // by the RVA and the VirtualSize of the last section header in the\r
-      // Section Table.\r
+      // Section Table.  \r
       //\r
       if ((++Index) == (UINTN)Hdr.Te->NumberOfSections) {\r
-        ImageContext->ImageSize = (SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize +\r
-                                   ImageContext->SectionAlignment - 1) & ~(ImageContext->SectionAlignment - 1);\r
+        ImageContext->ImageSize = (SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize);\r
       }\r
 \r
       SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);\r
@@ -908,7 +906,7 @@ PeCoffLoaderLoadImage (
       Size = (UINTN) Section->SizeOfRawData;\r
     }\r
 \r
-    if (Section->SizeOfRawData) {\r
+    if (Section->SizeOfRawData > 0) {\r
       if (!(ImageContext->IsTeImage)) {\r
         Status = ImageContext->ImageRead (\r
                                 ImageContext->Handle,\r
@@ -1213,12 +1211,15 @@ PeCoffLoaderRelocateImageForRuntime (
     RelocBaseEnd  = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(ImageBase + RelocDir->VirtualAddress + RelocDir->Size);\r
   } else {\r
     //\r
-    // Cannot find relocations, cannot continue\r
+    // Cannot find relocations, cannot continue to relocate the image, ASSERT for this invalid image.\r
     //\r
     ASSERT (FALSE);\r
     return ;\r
   }\r
-\r
+  \r
+  //\r
+  // ASSERT for the invalid image when RelocBase and RelocBaseEnd are both NULL.\r
+  //\r
   ASSERT (RelocBase != NULL && RelocBaseEnd != NULL);\r
 \r
   //\r
@@ -1286,7 +1287,7 @@ PeCoffLoaderRelocateImageForRuntime (
 \r
       case EFI_IMAGE_REL_BASED_HIGHADJ:\r
         //\r
-        // Not implemented, but not used in UEFI 2.0\r
+        // Not valid Relocation type for UEFI image, ASSERT\r
         //\r
         ASSERT (FALSE);\r
         break;\r

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
index e681f0ebd6cbab6a5ece8d30e9c24b1ce2d859d7..f5272aad5c6a46a736a0bc1e00a12c8c075ca14f 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
@@ -1,8 +1,8 @@
 #/** @file\r
 # Component description file for Base PE/COFF Library\r
 #\r
-# PE/COFF Loader Library implementation.\r
-# Copyright (c) 2006, Intel Corporation.\r
+# Base PE/COFF Loader Library implementation.\r
+# Copyright (c) 2006 - 2008, Intel Corporation.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -33,23 +33,15 @@
   BasePeCoffLibInternals.h\r
   BasePeCoff.c\r
 \r
-[Sources.Ia32]\r
-  Ia32/PeCoffLoaderEx.c\r
-\r
-[Sources.X64]\r
-  x64/PeCoffLoaderEx.c\r
+[Sources.Ia32, Sources.X64, Sources.EBC]\r
+  PeCoffLoaderEx.c\r
 \r
 [Sources.IPF]\r
   Ipf/PeCoffLoaderEx.c\r
 \r
-[Sources.EBC]\r
-  Ebc/PeCoffLoaderEx.c\r
-\r
-\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
-\r
 [LibraryClasses]\r
   DebugLib\r
   BaseMemoryLib\r

diff --git a/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
deleted file mode 100644 (file)
index b9ac46b..0000000
--- a/MdePkg/Library/BasePeCoffLib/Ebc/PeCoffLoaderEx.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/** @file\r
-  EBC Specific relocation fixups.\r
-\r
-  Copyright (c) 2006, Intel Corporation\r
-  All rights reserved. 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
-\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
-**/\r
-\r
-#include "BasePeCoffLibInternals.h"\r
-\r
-/**\r
-  Performs an EBC specific relocation fixup.\r
-\r
-  @param  Reloc       Pointer to the relocation record.\r
-  @param  Fixup       Pointer to the address to fix up.\r
-  @param  FixupData   Pointer to a buffer to log the fixups.\r
-  @param  Adjust      The offset to adjust the fixup.\r
-\r
-  @retval EFI_UNSUPPORTED Unsupported now.\r
-\r
-**/\r
-RETURN_STATUS\r
-PeCoffLoaderRelocateImageEx (\r
-  IN UINT16      *Reloc,\r
-  IN OUT CHAR8   *Fixup,\r
-  IN OUT CHAR8   **FixupData,\r
-  IN UINT64      Adjust\r
-  )\r
-{\r
-  return RETURN_UNSUPPORTED;\r
-}\r
-\r
-/**\r
-  Returns TRUE if the machine type of PE/COFF image is supported. Supported \r
-  does not mean the image can be executed it means the PE/COFF loader supports\r
-  loading and relocating of the image type. It's up to the caller to support\r
-  the entry point. \r
-\r
-  This function implies the basic PE/COFF loader/relocator supports IA32, EBC,\r
-  & X64 images. Calling the entry point in a correct mannor is up to the \r
-  consumer of this library.\r
-\r
-  @param  Machine   Machine type from the PE Header.\r
-\r
-  @return TRUE if this PE/COFF loader can load the image\r
-\r
-**/\r
-BOOLEAN\r
-PeCoffLoaderImageFormatSupported (\r
-  IN  UINT16  Machine\r
-  )\r
-{\r
-  if ((Machine == EFI_IMAGE_MACHINE_IA32) || (Machine == EFI_IMAGE_MACHINE_X64) || \r
-      (Machine ==  EFI_IMAGE_MACHINE_EBC)) {\r
-    return TRUE; \r
-  }\r
-\r
-  return FALSE;\r
-}\r
-\r
-\r
-/**\r
-  Performs an Itanium-based specific re-relocation fixup and is a no-op on other\r
-  instruction sets. This is used to re-relocated the image into the EFI virtual\r
-  space for runtime calls.\r
-\r
-  @param  Reloc       Pointer to the relocation record.\r
-  @param  Fixup       Pointer to the address to fix up.\r
-  @param  FixupData   Pointer to a buffer to log the fixups.\r
-  @param  Adjust      The offset to adjust the fixup.\r
-\r
-  @return Always return UNSUPPORTED.\r
-\r
-**/\r
-RETURN_STATUS\r
-PeHotRelocateImageEx (\r
-  IN UINT16      *Reloc,\r
-  IN OUT CHAR8   *Fixup,\r
-  IN OUT CHAR8   **FixupData,\r
-  IN UINT64      Adjust\r
-  )\r
-{\r
-  return RETURN_UNSUPPORTED;\r
-}\r

diff --git a/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
deleted file mode 100644 (file)
index ee118bf..0000000
--- a/MdePkg/Library/BasePeCoffLib/Ia32/PeCoffLoaderEx.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/** @file\r
-  IA-32 Specific relocation fixups.\r
-\r
-  Copyright (c) 2006, Intel Corporation<BR>\r
-  All rights reserved. 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
-\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
-**/\r
-\r
-#include "BasePeCoffLibInternals.h"\r
-\r
-\r
-/**\r
-  Performs an IA-32 specific relocation fixup.\r
-\r
-  @param  Reloc       Pointer to the relocation record.\r
-  @param  Fixup       Pointer to the address to fix up.\r
-  @param  FixupData   Pointer to a buffer to log the fixups.\r
-  @param  Adjust      The offset to adjust the fixup.\r
-\r
-  @retval EFI_UNSUPPORTED Unsupported now.\r
-\r
-**/\r
-RETURN_STATUS\r
-PeCoffLoaderRelocateImageEx (\r
-  IN UINT16      *Reloc,\r
-  IN OUT CHAR8   *Fixup,\r
-  IN OUT CHAR8   **FixupData,\r
-  IN UINT64      Adjust\r
-  )\r
-{\r
-  return RETURN_UNSUPPORTED;\r
-}\r
-\r
-/**\r
-  Returns TRUE if the machine type of PE/COFF image is supported. Supported \r
-  does not mean the image can be executed it means the PE/COFF loader supports\r
-  loading and relocating of the image type. It's up to the caller to support\r
-  the entry point. \r
-\r
-  This function implies the basic PE/COFF loader/relocator supports IA32, EBC,\r
-  & X64 images. Calling the entry point in a correct mannor is up to the \r
-  consumer of this library.\r
-\r
-  @param  Machine   Machine type from the PE Header.\r
-\r
-  @return TRUE if this PE/COFF loader can load the image\r
-\r
-**/\r
-BOOLEAN\r
-PeCoffLoaderImageFormatSupported (\r
-  IN  UINT16  Machine\r
-  )\r
-{\r
-  if ((Machine == EFI_IMAGE_MACHINE_IA32) || (Machine == EFI_IMAGE_MACHINE_X64) || \r
-      (Machine ==  EFI_IMAGE_MACHINE_EBC)) {\r
-    return TRUE; \r
-  }\r
-\r
-  return FALSE;\r
-}\r
-\r
-/**\r
-  Performs an Itanium-based specific re-relocation fixup and is a no-op on other\r
-  instruction sets. This is used to re-relocated the image into the EFI virtual\r
-  space for runtime calls.\r
-\r
-  @param  Reloc       Pointer to the relocation record.\r
-  @param  Fixup       Pointer to the address to fix up.\r
-  @param  FixupData   Pointer to a buffer to log the fixups.\r
-  @param  Adjust      The offset to adjust the fixup.\r
-\r
-  @return Always return UNSUPPORTED.\r
-\r
-**/\r
-RETURN_STATUS\r
-PeHotRelocateImageEx (\r
-  IN UINT16      *Reloc,\r
-  IN OUT CHAR8   *Fixup,\r
-  IN OUT CHAR8   **FixupData,\r
-  IN UINT64      Adjust\r
-  )\r
-{\r
-  return RETURN_UNSUPPORTED;\r
-}\r
-\r

diff --git a/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c
new file mode 100644 (file)
index 0000000..987937b
--- /dev/null
+++ b/MdePkg/Library/BasePeCoffLib/PeCoffLoaderEx.c
@@ -0,0 +1,91 @@
+/** @file\r
+  Specific relocation fixups for none Itanium architecture.\r
+\r
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>\r
+  All rights reserved. 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
+\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
+**/\r
+\r
+#include "BasePeCoffLibInternals.h"\r
+\r
+\r
+/**\r
+  Performs an IA-32 specific relocation fixup.\r
+\r
+  @param  Reloc       Pointer to the relocation record.\r
+  @param  Fixup       Pointer to the address to fix up.\r
+  @param  FixupData   Pointer to a buffer to log the fixups.\r
+  @param  Adjust      The offset to adjust the fixup.\r
+\r
+  @retval EFI_UNSUPPORTED Unsupported now.\r
+\r
+**/\r
+RETURN_STATUS\r
+PeCoffLoaderRelocateImageEx (\r
+  IN UINT16      *Reloc,\r
+  IN OUT CHAR8   *Fixup,\r
+  IN OUT CHAR8   **FixupData,\r
+  IN UINT64      Adjust\r
+  )\r
+{\r
+  return RETURN_UNSUPPORTED;\r
+}\r
+\r
+/**\r
+  Returns TRUE if the machine type of PE/COFF image is supported. Supported \r
+  does not mean the image can be executed it means the PE/COFF loader supports\r
+  loading and relocating of the image type. It's up to the caller to support\r
+  the entry point. \r
+\r
+  This function implies the basic PE/COFF loader/relocator supports IA32, EBC,\r
+  & X64 images. Calling the entry point in a correct mannor is up to the \r
+  consumer of this library.\r
+\r
+  @param  Machine   Machine type from the PE Header.\r
+\r
+  @return TRUE if this PE/COFF loader can load the image\r
+\r
+**/\r
+BOOLEAN\r
+PeCoffLoaderImageFormatSupported (\r
+  IN  UINT16  Machine\r
+  )\r
+{\r
+  if ((Machine == EFI_IMAGE_MACHINE_IA32) || (Machine == EFI_IMAGE_MACHINE_X64) || \r
+      (Machine ==  EFI_IMAGE_MACHINE_EBC)) {\r
+    return TRUE; \r
+  }\r
+\r
+  return FALSE;\r
+}\r
+\r
+/**\r
+  Performs an Itanium-based specific re-relocation fixup and is a no-op on other\r
+  instruction sets. This is used to re-relocated the image into the EFI virtual\r
+  space for runtime calls.\r
+\r
+  @param  Reloc       Pointer to the relocation record.\r
+  @param  Fixup       Pointer to the address to fix up.\r
+  @param  FixupData   Pointer to a buffer to log the fixups.\r
+  @param  Adjust      The offset to adjust the fixup.\r
+\r
+  @return Always return UNSUPPORTED.\r
+\r
+**/\r
+RETURN_STATUS\r
+PeHotRelocateImageEx (\r
+  IN UINT16      *Reloc,\r
+  IN OUT CHAR8   *Fixup,\r
+  IN OUT CHAR8   **FixupData,\r
+  IN UINT64      Adjust\r
+  )\r
+{\r
+  return RETURN_UNSUPPORTED;\r
+}\r
+\r

diff --git a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c b/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
deleted file mode 100644 (file)
index 937d103..0000000
--- a/MdePkg/Library/BasePeCoffLib/x64/PeCoffLoaderEx.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/** @file\r
-  x64 Specific relocation fixups.\r
-\r
-Copyright (c) 2005 - 2006 Intel Corporation. <BR>\r
-All rights reserved. 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
-                                                                                          \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
-**/\r
-\r
-#include "BasePeCoffLibInternals.h"\r
-\r
-/**\r
-  Performs an x64 specific relocation fixup.\r
-\r
-  @param  Reloc       Pointer to the relocation record\r
-  @param  Fixup       Pointer to the address to fix up\r
-  @param  FixupData   Pointer to a buffer to log the fixups\r
-  @param  Adjust      The offset to adjust the fixup\r
-\r
-  @retval RETURN_SUCCESS      Success to perform relocation\r
-  @retval RETURN_UNSUPPORTED  Unsupported.\r
-**/\r
-RETURN_STATUS\r
-PeCoffLoaderRelocateImageEx (\r
-  IN     UINT16       *Reloc,\r
-  IN OUT CHAR8        *Fixup, \r
-  IN OUT CHAR8        **FixupData,\r
-  IN     UINT64       Adjust\r
-  )\r
-{\r
-  return RETURN_UNSUPPORTED;\r
-}\r
-\r
-/**\r
-  Returns TRUE if the machine type of PE/COFF image is supported. Supported \r
-  does not mean the image can be executed it means the PE/COFF loader supports\r
-  loading and relocating of the image type. It's up to the caller to support\r
-  the entry point. \r
-\r
-  This function implies the basic PE/COFF loader/relocator supports IA32, EBC,\r
-  & X64 images. Calling the entry point in a correct mannor is up to the \r
-  consumer of this library.\r
-\r
-  @param  Machine   Machine type from the PE Header.\r
-\r
-  @return TRUE if this PE/COFF loader can load the image\r
-\r
-**/\r
-BOOLEAN\r
-PeCoffLoaderImageFormatSupported (\r
-  IN  UINT16  Machine\r
-  )\r
-{\r
-  if ((Machine == EFI_IMAGE_MACHINE_IA32) || (Machine == EFI_IMAGE_MACHINE_X64) || \r
-      (Machine ==  EFI_IMAGE_MACHINE_EBC)) {\r
-    return TRUE; \r
-  }\r
-\r
-  return FALSE;\r
-}\r
-\r
-\r
-/**\r
-  Performs an X64 specific re-relocation fixup and is a no-op on other\r
-  instruction sets. This is used to re-relocated the image into the EFI virtual\r
-  space for runtime calls.\r
-\r
-  @param  Reloc       Pointer to the relocation record.\r
-  @param  Fixup       Pointer to the address to fix up.\r
-  @param  FixupData   Pointer to a buffer to log the fixups.\r
-  @param  Adjust      The offset to adjust the fixup.\r
-\r
-  @return EFI_UNSUPPORTED.\r
-\r
-**/\r
-RETURN_STATUS\r
-PeHotRelocateImageEx (\r
-  IN UINT16      *Reloc,\r
-  IN OUT CHAR8   *Fixup,\r
-  IN OUT CHAR8   **FixupData,\r
-  IN UINT64      Adjust\r
-  )\r
-{\r
-  return RETURN_UNSUPPORTED;\r
-}\r

diff --git a/MdePkg/Library/DxeMemoryLib/CompareMemWrapper.c b/MdePkg/Library/DxeMemoryLib/CompareMemWrapper.c
index c62cfe0354f7d956b56b3dcf18d428b293c7ac1f..466a10eb41216c5c2b338a94235879a2231e4116 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/CompareMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -30,8 +32,8 @@
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). \r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). \r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/CopyMemWrapper.c b/MdePkg/Library/DxeMemoryLib/CopyMemWrapper.c
index 933529d6d647aad5c6932c312f76db9ff0c960dd..99870bcc836a2dba3eabb07ac94129be2d170117 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/CopyMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/MemLibGeneric.c b/MdePkg/Library/DxeMemoryLib/MemLibGeneric.c
index 2be052d4b97a5538bc60e80dda86b819eec7e4eb..a1a7c3695a01398c416069cb1ff684e6c76a86c5 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/DxeMemoryLib/MemLibGeneric.c
@@ -10,7 +10,7 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     PeiMemoryLib\r

diff --git a/MdePkg/Library/DxeMemoryLib/MemLibGuid.c b/MdePkg/Library/DxeMemoryLib/MemLibGuid.c
index b7625d6081062fc9951959ac62d4f05e67ac02db..4c6c615aa3bf46b0d93784b548b6791195991c38 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/DxeMemoryLib/MemLibGuid.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/MemLibInternals.h b/MdePkg/Library/DxeMemoryLib/MemLibInternals.h
index 223cb25cf71700a5301b58c03775874de73a10f4..76cebeda76f92898a1658caa62d8c92f99d76a31 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/MemLibInternals.h
+++ b/MdePkg/Library/DxeMemoryLib/MemLibInternals.h
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/DxeMemoryLib/ScanMem16Wrapper.c
index 8e0b812749f6d15aefbe1e3dc287cd17851f14af..e11c4844b7afb942243a99a40b41d1e62a0630e7 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/ScanMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/DxeMemoryLib/ScanMem32Wrapper.c
index 00cdc60cee53e272c976731d6bf0f658e6f791bb..52f2d2d6033e57363e0708ef71a36c496b56659a 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/ScanMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/DxeMemoryLib/ScanMem64Wrapper.c
index b80921b2a681e3402717cdbc9c520b58fb714b32..642420b1c91db5393f0ba5dba2d68d40aee10bf5 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/ScanMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/DxeMemoryLib/ScanMem8Wrapper.c
index d9cd42d9dbde65f9bb9fab53897c2a0c435564ba..9dc9343eb2c7a6fad1115059486d942fd85dd654 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/ScanMem8Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/DxeMemoryLib/SetMem16Wrapper.c
index b03fc2874af01d8a7bfc5dbe04d3cb17165c5320..c5a6f8f7dc4abea485672b88b08247c084476c34 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/SetMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/DxeMemoryLib/SetMem32Wrapper.c
index 42670a0287144c7c2f801a4707117a457a6b6f2b..c5da3d6941a365432380d83dd7e0285b9e949f43 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/SetMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/DxeMemoryLib/SetMem64Wrapper.c
index 63ee35a9140973e3cdc5f4f8b75c01918095abe3..129a38ec8de5c53200b4332b3054ec8f94132bed 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/SetMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/SetMemWrapper.c b/MdePkg/Library/DxeMemoryLib/SetMemWrapper.c
index ab7efa90cf86bf5dd8bbb68124274cae84c6d1ff..2b25f5fb3558beaa39b7ec094b0af16eca9a98e4 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/SetMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/DxeMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/DxeMemoryLib/ZeroMemWrapper.c
index 387700329c27ba41d1a63e9b6891313357a6d3c6..30c848a46dbd9b97f1e257d42268b0eb39fa5b18 100644 (file)
--- a/MdePkg/Library/DxeMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/DxeMemoryLib/ZeroMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c b/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
index 9d85c57fa39ef4880f3055abfe916abe301b2d4f..665809bbe134489a5fc6ed66572656d196807bba 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r
@@ -30,8 +32,8 @@
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the\r
   value returned is the first mismatched byte in SourceBuffer subtracted from the first\r
   mismatched byte in DestinationBuffer.\r
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().\r
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().\r
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c b/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
index 253d449008e549f1f7b0b167f74e907bd72d3dcf..bda15897287c8ea16b75c2106e9f69e918f6bfc2 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c b/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
index 2be052d4b97a5538bc60e80dda86b819eec7e4eb..a1a7c3695a01398c416069cb1ff684e6c76a86c5 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
@@ -10,7 +10,7 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     PeiMemoryLib\r

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
index db7f3588fc10db700005f042b0e38eb12e10b3f1..bfa56e25e78ef28d33a4e492e053436c711fff47 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibInternals.h b/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
index f7eba17988c9aa297a036aa52474f4f0abe7ed9b..7d2c903b54ccc3584fc8236ac6c4efaf078f4d89 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
+++ b/MdePkg/Library/PeiMemoryLib/MemLibInternals.h
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
index 94541f4f500c7748bb5ee065127f19417ad0084f..33f2bc59dff7918fdab85fe8000f6bae77f372a3 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
index e80d730548db5235d0f508aa2e99a6bf4671d7bf..db0555489955a9a8049502137a20dfe7ada86db7 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
index 36adb500529fbb76a95527ccc97242fb0e923824..51ebd92f87c9928220a46da24c09ad656ff8122c 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
index b30cd320f2482bf84c71a5087b3b2ff6726ef302..53ad70a4b832d30dae1dd4e588f506c432a43101 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
index b03fc2874af01d8a7bfc5dbe04d3cb17165c5320..c5a6f8f7dc4abea485672b88b08247c084476c34 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
index bac96e0ece63db89a31d8d3aa7cfedcc6d2cbe1a..b17749f4a91429d2942d48433c4fd23d0b0d184d 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
index ed30a833ad597ef02e29afdd9a2be3c706b0bc2e..d2707ba790f27f77a84aad7cff56f51ddd51ad65 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
index f8c611285f9c5eaa192c12fd1c8762d41a907363..73ad99d879e8a358817da6a661d1fffe4e1c0d4a 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r

diff --git a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
index 337b45346e0d982ddac5368ca7b64ba02690b967..4f1ff337019bf54fede91758d583badf7a83fad4 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
@@ -10,12 +10,14 @@
   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
-  The following BaseMemoryLib instances share the same version of this file:\r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
 \r
     BaseMemoryLib\r
     BaseMemoryLibMmx\r
     BaseMemoryLibSse2\r
     BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
     PeiMemoryLib\r
     DxeMemoryLib\r
 \r