From 2bfb60098f608dc32ff5d22b0fd087c1636b0881 Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 18 Sep 2008 14:27:39 +0000
Subject: 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
---
 MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c | 8 +++++---
 MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c    | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S   | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S    | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm  | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S    | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm  | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S    | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm  | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S     | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm   | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c        | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h   | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c  | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c  | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c  | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c   | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c   | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c   | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c   | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c     | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c    | 6 ++++--
 MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.S    | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm  | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.S     | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm   | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.S     | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm   | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.S     | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm   | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.S      | 4 +++-
 MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm    | 4 +++-
 33 files changed, 111 insertions(+), 45 deletions(-)

(limited to 'MdePkg/Library/BaseMemoryLibRepStr')

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
index 12bd4c2d46..59c2794b1f 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -33,8 +35,8 @@
   If all Length bytes of the two buffers are identical, then 0 is returned.  Otherwise, the
   value returned is the first mismatched byte in SourceBuffer subtracted from the first
   mismatched byte in DestinationBuffer.
-  If Length > 0 and DestinationBuffer is NULL and Length > 0, then ASSERT().
-  If Length > 0 and SourceBuffer is NULL and Length > 0, then ASSERT().
+  If Length > 0 and DestinationBuffer is NULL, then ASSERT().
+  If Length > 0 and SourceBuffer is NULL, then ASSERT().
   If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). 
   If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). 
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CopyMemWrapper.c
index 80feff7c98..42335277a1 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -50,7 +52,7 @@ CopyMem (
   IN UINTN       Length
   )
 {
-  if (0 == Length) {
+  if (Length == 0) {
     return DestinationBuffer;
   }
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.S
index 725367b2f9..f0688f59cf 100644
--- 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 1d0e7fad39..4ed5b6500c 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/CompareMem.asm
@@ -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.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.S
index 5e65b9667a..e5ca893fe5 100644
--- 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 57fab61b77..6ad09996eb 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem16.asm
@@ -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.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.S
index 5d46ed2bc1..ac2d877cf4 100644
--- 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 6ac857ce16..e05bc16f76 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem32.asm
@@ -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.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.S
index 3ba69650ab..a6c5995e1b 100644
--- 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 ca54f13738..fb219503f0 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem64.asm
@@ -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.S b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.S
index 7a834a5635..79edc1dc2d 100644
--- 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 a3f65b64fa..da3ab3c3ad 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/Ia32/ScanMem8.asm
@@ -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/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
index 45ff4193c1..b2aefa9855 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
index fa5619db7c..2f9c194d77 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibInternals.h
@@ -1,11 +1,13 @@
 /** @file
   Declaration of internal functions for Base Memory Library.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
index ace0b49bd5..3161c91278 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -54,7 +56,7 @@ ScanMem16 (
   IN UINT16      Value
   )
 {
-  if (0 == Length) {
+  if (Length == 0) {
     return NULL;
   }
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
index 40064ed8df..939de99b3d 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -54,7 +56,7 @@ ScanMem32 (
   IN UINT32      Value
   )
 {
-  if (0 == Length) {
+  if (Length == 0) {
     return NULL;
   }
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
index f900c3b4bb..099da5dc04 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -54,7 +56,7 @@ ScanMem64 (
   IN UINT64      Value
   )
 {
-  if (0 == Length) {
+  if (Length == 0) {
     return NULL;
   }
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
index 215cbc510e..d66b1a2666 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -52,7 +54,7 @@ ScanMem8 (
   IN UINT8       Value
   )
 {
-  if (0 == Length) {
+  if (Length == 0) {
     return NULL;
   }
   ASSERT (Buffer != NULL);
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem16Wrapper.c
index 2d11ae4faa..83dd37ee28 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -53,7 +55,7 @@ SetMem16 (
   IN UINT16  Value
   )
 {
-  if (0 == Length) {
+  if (Length == 0) {
     return Buffer;
   }
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem32Wrapper.c
index 5fba2024d6..236c3ca21e 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -53,7 +55,7 @@ SetMem32 (
   IN UINT32  Value
   )
 {
-  if (0 == Length) {
+  if (Length == 0) {
     return Buffer;
   }
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMem64Wrapper.c
index b165895739..30fa46b4b1 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -53,7 +55,7 @@ SetMem64 (
   IN UINT64  Value
   )
 {
-  if (0 == Length) {
+  if (Length == 0) {
     return Buffer;
   }
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
index 7ef3298a9b..10224f73b8 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -47,7 +49,7 @@ SetMem (
   IN UINT8  Value
   )
 {
-  if (0 == Length) {
+  if (Length == 0) {
     return Buffer;
   }
 
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ZeroMemWrapper.c
index a0b30d164d..e87996a885 100644
--- 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,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     DxeMemoryLib
 
@@ -46,7 +48,7 @@ ZeroMem (
   IN UINTN  Length
   )
 {
-  ASSERT (!(NULL == Buffer && Length > 0));
+  ASSERT (!(Buffer == NULL && Length > 0));
   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));
   return InternalMemZeroMem (Buffer, Length);
 }
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.S
index 1498a5d9ae..46dfe0a23c 100644
--- 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 554bc07c64..7446a052e0 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/CompareMem.asm
@@ -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/x64/ScanMem16.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.S
index 018d2984f1..f56b9e96d8 100644
--- 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 a2538c2cca..0871a4b0f5 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem16.asm
@@ -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/x64/ScanMem32.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.S
index a253b9b555..ef9cd758cf 100644
--- 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 e0523d8547..53a33bafb2 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem32.asm
@@ -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/x64/ScanMem64.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.S
index 528f81393a..ee2ce39ba1 100644
--- 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 0e7e9c782f..71f85a1ab7 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem64.asm
@@ -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/x64/ScanMem8.S b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.S
index 84610eb8bc..4ff3a959c8 100644
--- 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 879273f960..39adb01b7f 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibRepStr/x64/ScanMem8.asm
@@ -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
 ;
 ;------------------------------------------------------------------------------
 
-- 
cgit v1.2.3