• BaseMemoryLib:

	Modify some Aassert()s conditions to sync with MWG 0.56d
	Modify some defects in function header.
•	PostCodeLib:
Implement PeiDxePostCodeLibReportStatusCode.
•	Misc
Rename BaseDebugLibReportStatusCode to PeiDxeDebugLibReportStatusCode
	Remove tabs in all .c and .h files in MdePkg.
	Rename PeiServicesReinstallPpi() to PeiServicesReInstallPpi()
	Adjust some minor coding style in PeCoffLoaderGetEntryPointerLib()


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

13 files changed, 107 insertions, 111 deletions

diff --git a/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c b/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
index 6081bbe1b7..e3b0fe3fd6 100644
--- a/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/CompareMemWrapper.c
@@ -50,9 +50,9 @@
 INTN

 EFIAPI

 CompareMem (

-  IN      CONST VOID                *DestinationBuffer,

-  IN      CONST VOID                *SourceBuffer,

-  IN      UINTN                     Length

+  IN CONST VOID  *DestinationBuffer,

+  IN CONST VOID  *SourceBuffer,

+  IN UINTN       Length

   )

 {

   if (Length == 0) {

diff --git a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c b/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
index 5ca62f5047..1fd00acabd 100644
--- a/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/CopyMemWrapper.c
@@ -26,41 +26,37 @@
 #include "MemLibInternals.h"

 

 /**

-  Copy Length bytes from Source to Destination.

+  Copies a source buffer to a destination buffer, and returns the destination buffer.

 

-  This function copies Length bytes from SourceBuffer to DestinationBuffer, and

-  returns DestinationBuffer. The implementation must be reentrant, and it must

-  handle the case where SourceBuffer overlaps DestinationBuffer.

+  This function copies Length bytes from SourceBuffer to DestinationBuffer, and returns

+  DestinationBuffer.  The implementation must be reentrant, and it must handle the case

+  where SourceBuffer overlaps DestinationBuffer.

+  If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). 

+  If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT(). 

 

-  If Length is greater than (MAX_ADDRESS - DestinationBuffer + 1), then

-  ASSERT().

-  If Length is greater than (MAX_ADDRESS - SourceBuffer + 1), then ASSERT().

+  @param  DestinationBuffer   Pointer to the destination buffer of the memory copy.

+  @param  SourceBuffer        Pointer to the source buffer of the memory copy.

+  @param  Length              Number of bytes to copy from SourceBuffer to DestinationBuffer.

 

-  @param  Destination Target of copy

-  @param  Source Place to copy from

-  @param  Length Number of bytes to copy

-

-  @return Destination

+  @return DestinationBuffer.

 

 **/

 VOID *

 EFIAPI

 CopyMem (

-  OUT     VOID                      *Destination,

-  IN      CONST VOID                *Source,

-  IN      UINTN                     Length

+  OUT VOID       *DestinationBuffer,

+  IN CONST VOID  *SourceBuffer,

+  IN UINTN       Length

   )

 {

-  ASSERT (

-    Destination == NULL ||

-    Length <= MAX_ADDRESS - (UINTN)Destination + 1

-    );

-  ASSERT (

-    Source == NULL ||

-    Length <= MAX_ADDRESS - (UINTN)Source + 1

-    );

-  if (Destination == Source || Length == 0) {

-    return Destination;

+  if (Length == 0) {

+    return DestinationBuffer;

+  }

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

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

+

+  if (DestinationBuffer == SourceBuffer) {

+    return DestinationBuffer;

   }

-  return InternalMemCopyMem (Destination, Source, Length);

+  return InternalMemCopyMem (DestinationBuffer, SourceBuffer, Length);

 }

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c b/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
index 53c4e4416b..3fecfc9ff0 100644
--- a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
@@ -161,7 +161,6 @@ InternalMemScanMem8 (
 {

   CONST UINT8                       *Pointer;

 

-  ASSERT (Length > 0);

   Pointer = (CONST UINT8*)Buffer;

   do {

     if (*(Pointer++) == Value) {

@@ -192,7 +191,6 @@ InternalMemScanMem16 (
 {

   CONST UINT16                      *Pointer;

 

-  ASSERT (Length > 0);

   Pointer = (CONST UINT16*)Buffer;

   do {

     if (*(Pointer++) == Value) {

@@ -223,7 +221,6 @@ InternalMemScanMem32 (
 {

   CONST UINT32                      *Pointer;

 

-  ASSERT (Length > 0);

   Pointer = (CONST UINT32*)Buffer;

   do {

     if (*(Pointer++) == Value) {

@@ -254,7 +251,6 @@ InternalMemScanMem64 (
 {

   CONST UINT64                      *Pointer;

 

-  ASSERT (Length > 0);

   Pointer = (CONST UINT64*)Buffer;

   do {

     if (*(Pointer++) == Value) {

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
index c54983c77b..351e370c2c 100644
--- a/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
+++ b/MdePkg/Library/PeiMemoryLib/MemLibGuid.c
@@ -24,25 +24,24 @@
 **/

 

 /**

-  This function copies a source GUID to a destination GUID.

-

-  This function copies the contents of the 128-bit GUID specified by SourceGuid

-  to DestinationGuid, and returns DestinationGuid.

+  Copies a source GUID to a destination GUID.

 

+  This function copies the contents of the 128-bit GUID specified by SourceGuid to

+  DestinationGuid, and returns DestinationGuid.

   If DestinationGuid is NULL, then ASSERT().

   If SourceGuid is NULL, then ASSERT().

 

-  @param  DestinationGuid Pointer to the destination GUID.

-  @param  SourceGuid Pointer to the source GUID.

+  @param  DestinationGuid   Pointer to the destination GUID.

+  @param  SourceGuid        Pointer to the source GUID.

 

-  @return DestinationGuid

+  @return DestinationGuid.

 

 **/

 GUID *

 EFIAPI

 CopyGuid (

-  OUT     GUID                      *DestinationGuid,

-  IN      CONST GUID                *SourceGuid

+  OUT GUID       *DestinationGuid,

+  IN CONST GUID  *SourceGuid

   )

 {

   WriteUnaligned64 (

@@ -57,27 +56,25 @@ CopyGuid (
 }

 

 /**

-  Compares two GUIDs

-

-  This function compares Guid1 to Guid2. If the GUIDs are identical then TRUE

-  is returned. If there are any bit differences in the two GUIDs, then FALSE is

-  returned.

+  Compares two GUIDs.

 

+  This function compares Guid1 to Guid2.  If the GUIDs are identical then TRUE is returned.

+  If there are any bit differences in the two GUIDs, then FALSE is returned.

   If Guid1 is NULL, then ASSERT().

   If Guid2 is NULL, then ASSERT().

 

-  @param  Guid1 guid to compare

-  @param  Guid2 guid to compare

+  @param  Guid1       A pointer to a 128 bit GUID.

+  @param  Guid2       A pointer to a 128 bit GUID.

 

-  @retval TRUE  if Guid1 == Guid2

-  @retval FALSE if Guid1 != Guid2

+  @retval TRUE        Guid1 and Guid2 are identical.

+  @retval FALSE       Guid1 and Guid2 are not identical.

 

 **/

 BOOLEAN

 EFIAPI

 CompareGuid (

-  IN      CONST GUID                *Guid1,

-  IN      CONST GUID                *Guid2

+  IN CONST GUID  *Guid1,

+  IN CONST GUID  *Guid2

   )

 {

   return (BOOLEAN)(

@@ -93,28 +90,27 @@ CompareGuid (
   in the target buffer.

 

   This function searches target the buffer specified by Buffer and Length from

-  the lowest address to the highest address at 128-bit increments for the

-  128-bit GUID value that matches Guid. If a match is found, then a pointer to

-  the matching GUID in the target buffer is returned. If no match is found,

-  then NULL is returned. If Length is 0, then NULL is returned.

-

-  If Buffer is NULL, then ASSERT().

+  the lowest address to the highest address at 128-bit increments for the 128-bit

+  GUID value that matches Guid.  If a match is found, then a pointer to the matching

+  GUID in the target buffer is returned.  If no match is found, then NULL is returned.

+  If Length is 0, then NULL is returned.

+  If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 64-bit boundary, then ASSERT().

-  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

+  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

 

   @param  Buffer  Pointer to the target buffer to scan.

   @param  Length  Number of bytes in Buffer to scan.

   @param  Guid    Value to search for in the target buffer.

 

-  @return Pointer to the first occurrence.

-  @retval NULL  if Length == 0 or Guid was not found.

+  @return A pointer to the matching Guid in the target buffer or NULL otherwise.

+

 **/

 VOID *

 EFIAPI

 ScanGuid (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      CONST GUID                *Guid

+  IN CONST VOID  *Buffer,

+  IN UINTN       Length,

+  IN CONST GUID  *Guid

   )

 {

   CONST GUID                        *GuidPtr;

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
index d336d59641..9ffc2cf159 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c
@@ -47,12 +47,15 @@
 VOID *

 EFIAPI

 ScanMem16 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

+  IN CONST VOID  *Buffer,

+  IN UINTN       Length,

+  IN UINT16      Value

   )

 {

-  if (Length == 0) {

+  UINTN     Stride;

+  

+  Stride = Length / sizeof (Value);

+  if (Stride == 0) {

     return NULL;

   }

 

@@ -60,5 +63,5 @@ ScanMem16 (
   ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

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

 

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

+  return (VOID*)InternalMemScanMem16 (Buffer, Stride, Value);

 }

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
index 8de55945ce..6b0beee632 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c
@@ -47,12 +47,15 @@
 VOID *

 EFIAPI

 ScanMem32 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

+  IN CONST VOID  *Buffer,

+  IN UINTN       Length,

+  IN UINT32      Value

   )

 {

-  if (Length == 0) {

+  UINTN     Stride;

+  

+  Stride = Length / sizeof (Value);

+  if (Stride == 0) {

     return NULL;

   }

 

@@ -60,5 +63,5 @@ ScanMem32 (
   ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

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

 

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

+  return (VOID*)InternalMemScanMem32 (Buffer, Stride, Value);

 }

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
index 228c864b04..589d45c1a1 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c
@@ -47,12 +47,15 @@
 VOID *

 EFIAPI

 ScanMem64 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

+  IN CONST VOID  *Buffer,

+  IN UINTN       Length,

+  IN UINT64      Value

   )

 {

-  if (Length == 0) {

+  UINTN     Stride;

+  

+  Stride = Length / sizeof (Value);

+  if (Stride == 0) {

     return NULL;

   }

 

@@ -60,5 +63,5 @@ ScanMem64 (
   ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);

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

 

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

+  return (VOID*)InternalMemScanMem64 (Buffer, Stride, Value);

 }

diff --git a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c b/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
index 72a8078b81..4dc8bac073 100644
--- a/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c
@@ -46,9 +46,9 @@
 VOID *

 EFIAPI

 ScanMem8 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

+  IN CONST VOID  *Buffer,

+  IN UINTN       Length,

+  IN UINT8       Value

   )

 {

   if (Length == 0) {

@@ -57,5 +57,5 @@ ScanMem8 (
   ASSERT (Buffer != NULL);

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

  

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

+  return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);

 }

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
index fd3720cd51..41467a9cb0 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem16Wrapper.c
@@ -32,7 +32,7 @@
   Value, and returns Buffer. Value is repeated every 16-bits in for Length

   bytes of Buffer.

 

-  If Length > 0 and Buffer is NULL and Length > 0, then ASSERT().

+  If Length > 0 and Buffer is NULL, then ASSERT().

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

   If Buffer is not aligned on a 16-bit boundary, then ASSERT().

   If Length is not aligned on a 16-bit boundary, then ASSERT().

@@ -41,15 +41,15 @@
   @param  Length  Number of bytes in Buffer to fill.

   @param  Value   Value with which to fill Length bytes of Buffer.

 

-  @return Buffer

+  @return Buffer.

 

 **/

 VOID *

 EFIAPI

 SetMem16 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

+  OUT VOID   *Buffer,

+  IN UINTN   Length,

+  IN UINT16  Value

   )

 {

   if (Length == 0) {

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
index 77f1abda04..425840682d 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem32Wrapper.c
@@ -32,7 +32,7 @@
   Value, and returns Buffer. Value is repeated every 32-bits in for Length

   bytes of Buffer.

 

-  If Length > 0 and Buffer is NULL and Length > 0, then ASSERT().

+  If Length > 0 and Buffer is NULL, then ASSERT().

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

   If Buffer is not aligned on a 32-bit boundary, then ASSERT().

   If Length is not aligned on a 32-bit boundary, then ASSERT().

@@ -41,15 +41,15 @@
   @param  Length  Number of bytes in Buffer to fill.

   @param  Value   Value with which to fill Length bytes of Buffer.

 

-  @return Buffer

+  @return Buffer.

 

 **/

 VOID *

 EFIAPI

 SetMem32 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

+  OUT VOID   *Buffer,

+  IN UINTN   Length,

+  IN UINT32  Value

   )

 {

   if (Length == 0) {

diff --git a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
index f95b97ff87..4a1eda80e8 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMem64Wrapper.c
@@ -32,7 +32,7 @@
   Value, and returns Buffer. Value is repeated every 64-bits in for Length

   bytes of Buffer.

 

-  If Length > 0 and Buffer is NULL and Length > 0, then ASSERT().

+  If Length > 0 and Buffer is NULL, then ASSERT().

   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

   If Buffer is not aligned on a 64-bit boundary, then ASSERT().

   If Length is not aligned on a 64-bit boundary, then ASSERT().

@@ -41,15 +41,15 @@
   @param  Length  Number of bytes in Buffer to fill.

   @param  Value   Value with which to fill Length bytes of Buffer.

 

-  @return Buffer

+  @return Buffer.

 

 **/

 VOID *

 EFIAPI

 SetMem64 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

+  OUT VOID   *Buffer,

+  IN UINTN   Length,

+  IN UINT64  Value

   )

 {

   if (Length == 0) {

diff --git a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
index d0e8760ff6..3965be759a 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
@@ -41,9 +41,9 @@
 VOID *

 EFIAPI

 SetMem (

-  IN      VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

+  OUT VOID  *Buffer,

+  IN UINTN  Length,

+  IN UINT8  Value

   )

 {

   if (Length == 0) {

diff --git a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
index 4a3d615ce5..56dbe5d8be 100644
--- a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
@@ -26,24 +26,23 @@
 #include "MemLibInternals.h"

 

 /**

-  Set Buffer to 0 for Size bytes.

+  Fills a target buffer with zeros, and returns the target buffer.

 

   This function fills Length bytes of Buffer with zeros, and returns Buffer.

+  If Length > 0 and Buffer is NULL, then ASSERT().

+  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

 

-  If Buffer is NULL and Length > 0, then ASSERT().

-  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().

+  @param  Buffer      Pointer to the target buffer to fill with zeros.

+  @param  Length      Number of bytes in Buffer to fill with zeros.

 

-  @param  Buffer Memory to set.

-  @param  Size Number of bytes to set

-

-  @return Buffer

+  @return Buffer.

 

 **/

 VOID *

 EFIAPI

 ZeroMem (

-  IN      VOID                      *Buffer,

-  IN      UINTN                     Length

+  OUT VOID  *Buffer,

+  IN UINTN  Length

   )

 {

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