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

28 files changed, 100 insertions, 44 deletions

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
index 12bd4c2d46..9adc03baf0 100644
--- 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,

   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

 

 **/

 

-

-

-

 #include "MemLibInternals.h"

 

 /**

@@ -33,8 +32,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(). 

 

@@ -43,7 +42,7 @@
   @param  SourceBuffer      Pointer to the source buffer to compare.

   @param  Length            Number of bytes to compare.

 

-  @return 0                 All Length bytes of the two buffers are identical.

+  @retval 0                 All Length bytes of the two buffers are identical.

   @retval Non-zero          The first mismatched byte in SourceBuffer subtracted from the first

                             mismatched byte in DestinationBuffer.

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
index 80feff7c98..42335277a1 100644
--- 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,

   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/BaseMemoryLibOptDxe/Ia32/CompareMem.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.S
index 2b1014ad42..94216d02d6 100644
--- 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 1d0e7fad39..4ed5b6500c 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/Ia32/ScanMem16.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.S
index e944052645..db66ade1e1 100644
--- 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 57fab61b77..6ad09996eb 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/Ia32/ScanMem32.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.S
index 00461db1c6..0cae5d3780 100644
--- 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 6ac857ce16..e05bc16f76 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/Ia32/ScanMem64.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.S
index 2e5c6ee28b..aeb63d424c 100644
--- 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 ca54f13738..fb219503f0 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/Ia32/ScanMem8.S b/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.S
index 36f88bfe6f..bf19e471db 100644
--- 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 a3f65b64fa..da3ab3c3ad 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Ia32/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
index 6252f63ada..27e8e0a321 100644
--- 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,

   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/BaseMemoryLibOptDxe/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
index 258dd1013a..24ad92e3f5 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
index ace0b49bd5..3161c91278 100644
--- 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,

   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/BaseMemoryLibOptDxe/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
index 40064ed8df..939de99b3d 100644
--- 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,

   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/BaseMemoryLibOptDxe/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
index f900c3b4bb..099da5dc04 100644
--- 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,

   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/BaseMemoryLibOptDxe/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
index 215cbc510e..d66b1a2666 100644
--- 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,

   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/BaseMemoryLibOptDxe/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem16Wrapper.c
index 2d11ae4faa..a31829d207 100644
--- 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,

   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 contains 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/BaseMemoryLibOptDxe/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem32Wrapper.c
index 5fba2024d6..236c3ca21e 100644
--- 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,

   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/BaseMemoryLibOptDxe/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMem64Wrapper.c
index b165895739..30fa46b4b1 100644
--- 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,

   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/BaseMemoryLibOptDxe/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c
index 7ef3298a9b..10224f73b8 100644
--- 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,

   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/BaseMemoryLibOptDxe/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ZeroMemWrapper.c
index a0b30d164d..4e102322a9 100644
--- 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,

   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 contains the same copy of this file:

 

     BaseMemoryLib

     BaseMemoryLibMmx

     BaseMemoryLibSse2

     BaseMemoryLibRepStr

+    BaseMemoryLibOptDxe

+    BaseMemoryLibOptPei

     PeiMemoryLib

     DxeMemoryLib

 

@@ -46,7 +48,10 @@ ZeroMem (
   IN UINTN  Length

   )

 {

-  ASSERT (!(NULL == Buffer && Length > 0));

+  ASSERT (!(Buffer == NULL && Length > 0));

   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));

+  if (Length == 0) {

+  	return Buffer;

+  }

   return InternalMemZeroMem (Buffer, Length);

 }

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/x64/CompareMem.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/CompareMem.asm
index 554bc07c64..7446a052e0 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/CompareMem.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/x64/ScanMem16.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem16.asm
index a2538c2cca..0871a4b0f5 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem16.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/x64/ScanMem32.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem32.asm
index e0523d8547..53a33bafb2 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem32.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/x64/ScanMem64.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem64.asm
index 0e7e9c782f..71f85a1ab7 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem64.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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/BaseMemoryLibOptDxe/x64/ScanMem8.asm b/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem8.asm
index 879273f960..39adb01b7f 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/x64/ScanMem8.asm
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/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

 ;

 ;------------------------------------------------------------------------------