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

14 files changed, 62 insertions, 36 deletions

diff --git a/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CompareMemWrapper.c
index 12bd4c2d46..59c2794b1f 100644
--- 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,

   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/BaseMemoryLib/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLib/CopyMemWrapper.c
index 0164aad941..42335277a1 100644
--- 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,

   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/BaseMemoryLib/MemLibGeneric.c b/MdePkg/Library/BaseMemoryLib/MemLibGeneric.c
index 3f135c837d..356700f96e 100644
--- 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,

   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

     PeiMemoryLib

diff --git a/MdePkg/Library/BaseMemoryLib/MemLibGuid.c b/MdePkg/Library/BaseMemoryLib/MemLibGuid.c
index 6252f63ada..27e8e0a321 100644
--- 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,

   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/BaseMemoryLib/MemLibInternals.h b/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
index fa5619db7c..2f9c194d77 100644
--- a/MdePkg/Library/BaseMemoryLib/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLib/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/BaseMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c
index d2f6761d6c..3161c91278 100644
--- 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,

   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,14 +56,14 @@ ScanMem16 (
   IN UINT16      Value

   )

 {

-  if (0 == Length) {

+  if (Length == 0) {

     return NULL;

   }

 

   ASSERT (Buffer != NULL);

-  ASSERT (0 == ((UINTN)Buffer & (sizeof (Value) - 1)));

+  ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

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

-  ASSERT (0 == (Length & (sizeof (Value) - 1)));

+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

   return (VOID*)InternalMemScanMem16 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c
index 7f42daf6c8..939de99b3d 100644
--- 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,

   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,14 +56,14 @@ ScanMem32 (
   IN UINT32      Value

   )

 {

-  if (0 == Length) {

+  if (Length == 0) {

     return NULL;

   }

 

   ASSERT (Buffer != NULL);

-  ASSERT (0 == ((UINTN)Buffer & (sizeof (Value) - 1)));

+  ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

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

-  ASSERT (0 == (Length & (sizeof (Value) - 1)));

+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

   return (VOID*)InternalMemScanMem32 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c
index def2ce93ee..099da5dc04 100644
--- 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,

   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,14 +56,14 @@ ScanMem64 (
   IN UINT64      Value

   )

 {

-  if (0 == Length) {

+  if (Length == 0) {

     return NULL;

   }

 

   ASSERT (Buffer != NULL);

-  ASSERT (0 == ((UINTN)Buffer & (sizeof (Value) - 1)));

+  ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

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

-  ASSERT (0 == (Length & (sizeof (Value) - 1)));

+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

   return (VOID*)InternalMemScanMem64 (Buffer, Length / sizeof (Value), Value);

 }

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

   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/BaseMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
index 5e7c4baefc..83dd37ee28 100644
--- 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,

   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,14 +55,14 @@ SetMem16 (
   IN UINT16  Value

   )

 {

-  if (0 == Length) {

+  if (Length == 0) {

     return Buffer;

   }

 

   ASSERT (Buffer != NULL);

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

-  ASSERT (0 == (((UINTN)Buffer) & (sizeof (Value) - 1)));

-  ASSERT (0 == (Length & (sizeof (Value) - 1)));

+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);

+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

   return InternalMemSetMem16 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
index 388c0eb316..236c3ca21e 100644
--- 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,

   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,14 +55,14 @@ SetMem32 (
   IN UINT32  Value

   )

 {

-  if (0 == Length) {

+  if (Length == 0) {

     return Buffer;

   }

 

   ASSERT (Buffer != NULL);

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

-  ASSERT (0 == (((UINTN)Buffer) & (sizeof (Value) - 1)));

-  ASSERT (0 == (Length & (sizeof (Value) - 1)));

+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);

+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

   return InternalMemSetMem32 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c
index 10f489e69b..30fa46b4b1 100644
--- 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,

   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,14 +55,14 @@ SetMem64 (
   IN UINT64  Value

   )

 {

-  if (0 == Length) {

+  if (Length == 0) {

     return Buffer;

   }

 

   ASSERT (Buffer != NULL);

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

-  ASSERT (0 == (((UINTN)Buffer) & (sizeof (Value) - 1)));

-  ASSERT (0 == (Length & (sizeof (Value) - 1)));

+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);

+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

   return InternalMemSetMem64 (Buffer, Length / sizeof (Value), Value);

 }

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

   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/BaseMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
index 0979fc507e..e87996a885 100644
--- 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,

   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