1. UINTN & INTN issue for EBC architecture:

	The MAX_BIT of EBC will no longer be fixed to bit 63. It is defined as (1ULL << (sizeof (INTN) * 8 - 1)).
	Make EdkModulePkg & MdePkg EBC compiler clean: treat all EFI_STATUS error code as variable.
2. PrintLib
	Complete all missing ASSERT()s.
	Fix “\n” & “%\n” issue thanks to the clarification of MWG 0.56d.
	Adjust StatusString array to support EBC build.
3. BaseMemoryLib
	Adjust ASSERT () & function header of ComparaMem, SetMemXX, ScanMemXX to synchronize with MWG 0.56d.
4.SmbusLib
	Change Pec bit to bit 22 SmBusAddress to synchronize MWG 0.56d.
	Add ASSERT()s to check if length is illegal for SmBusBlockWrite() & SmBusProcessBlock() since it is 6 bit now.
5. PerformanceLib
	Rename “EdkDxePerformanceLib” & “EdkPeiPerformanceLib” to “DxePerformanceLib” & “PeiPerformanceLib” respectively.
	Synchronize the function header of GetPerformanceMeasurement() with MWG 0.56d.
6. BasePeCoffLoaderLib.
	Make PeCoffLoaderLoadImage () Assert() if ImageContext is NULL>
	Make PeCoffLoaderLoadImage () return RETURN_INVALID_PARAMETER if the ImageAddress in ImageContext is 0.
	Adjust some coding style.


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

9 files changed, 127 insertions, 132 deletions

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
index c8199d8dc3..6081bbe1b7 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/CompareMemWrapper.c
@@ -26,26 +26,25 @@
 #include "MemLibInternals.h"

 

 /**

-  Compares two memory buffers of a given length.

+  Compares the contents of two buffers.

 

-  This function compares Length bytes of SourceBuffer to Length bytes of

-  DestinationBuffer. 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.

+  This function compares Length bytes of SourceBuffer to Length bytes of DestinationBuffer.

+  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 is greater than (MAX_ADDRESS - DestinationBuffer + 1), then ASSERT(). 

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

 

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

-  If SourceBuffer is NULL and Length > 0, 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 First memory buffer

-  @param  SourceBuffer      Second memory buffer

-  @param  Length            Length of DestinationBuffer and SourceBuffer memory

-                            regions to compare

+  @param  DestinationBuffer Pointer to the destination buffer to compare.

+  @param  SourceBuffer      Pointer to the source buffer to compare.

+  @param  Length            Number of bytes to compare.

 

-  @retval 0         if DestinationBuffer == SourceBuffer

-  @retval Non-zero  if DestinationBuffer != SourceBuffer

+  @return 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.

 

 **/

 INTN

@@ -56,12 +55,13 @@ CompareMem (
   IN      UINTN                     Length

   )

 {

-  ASSERT (DestinationBuffer != NULL);

-  ASSERT (SourceBuffer != NULL);

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

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

   if (Length == 0) {

     return 0;

   }

+  ASSERT (DestinationBuffer != NULL);

+  ASSERT (SourceBuffer != NULL);

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

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

+

   return InternalMemCompareMem (DestinationBuffer, SourceBuffer, Length);

 }

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
index a17705db1d..d336d59641 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c
@@ -26,25 +26,22 @@
 #include "MemLibInternals.h"

 

 /**

-  Scans a target buffer for a 16-bit value, and returns a pointer to the

-  matching 16-bit value in the target buffer.

+  Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value

+  in the target buffer.

 

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

-  the lowest address to the highest address at 16-bit increments for a 16-bit

-  value that matches Value. If a match is found, then a pointer to the matching

-  value 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().

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

+  address to the highest address for a 16-bit value that matches Value.  If a match is found,

+  then a pointer to the matching byte 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 16-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  Value   Value to search for in the target buffer.

+  @param  Buffer      Pointer to the target buffer to scan.

+  @param  Length      Number of bytes in Buffer to scan.

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

 

-  @return Pointer to the first occurrence.

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

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

 

 **/

 VOID *

@@ -55,12 +52,13 @@ ScanMem16 (
   IN      UINT16                    Value

   )

 {

+  if (Length == 0) {

+    return NULL;

+  }

+

   ASSERT (Buffer != NULL);

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

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

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

 

-  if ((Length /= sizeof (Value)) == 0) {

-    return NULL;

-  }

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

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

 }

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
index 67eb84d8ef..8de55945ce 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c
@@ -26,25 +26,22 @@
 #include "MemLibInternals.h"

 

 /**

-  Scans a target buffer for a 32-bit value, and returns a pointer to the

-  matching 32-bit value in the target buffer.

+  Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value

+  in the target buffer.

 

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

-  the lowest address to the highest address at 32-bit increments for a 32-bit

-  value that matches Value. If a match is found, then a pointer to the matching

-  value 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().

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

+  address to the highest address for a 32-bit value that matches Value.  If a match is found,

+  then a pointer to the matching byte 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 32-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  Value   Value to search for in the target buffer.

+  @param  Buffer      Pointer to the target buffer to scan.

+  @param  Length      Number of bytes in Buffer to scan.

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

 

-  @return Pointer to the first occurrence or NULL if not found.

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

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

 

 **/

 VOID *

@@ -55,12 +52,13 @@ ScanMem32 (
   IN      UINT32                    Value

   )

 {

+  if (Length == 0) {

+    return NULL;

+  }

+

   ASSERT (Buffer != NULL);

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

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

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

 

-  if ((Length /= sizeof (Value)) == 0) {

-    return NULL;

-  }

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

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

 }

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
index c5f0762ebe..228c864b04 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c
@@ -26,25 +26,22 @@
 #include "MemLibInternals.h"

 

 /**

-  Scans a target buffer for a 64-bit value, and returns a pointer to the

-  matching 64-bit value in the target buffer.

+  Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value

+  in the target buffer.

 

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

-  the lowest address to the highest address at 64-bit increments for a 64-bit

-  value that matches Value. If a match is found, then a pointer to the matching

-  value 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().

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

+  address to the highest address for a 64-bit value that matches Value.  If a match is found,

+  then a pointer to the matching byte 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  Value   Value to search for in the target buffer.

+  @param  Buffer      Pointer to the target buffer to scan.

+  @param  Length      Number of bytes in Buffer to scan.

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

 

-  @return Pointer to the first occurrence or NULL if not found.

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

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

 

 **/

 VOID *

@@ -55,12 +52,13 @@ ScanMem64 (
   IN      UINT64                    Value

   )

 {

+  if (Length == 0) {

+    return NULL;

+  }

+

   ASSERT (Buffer != NULL);

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

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

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

 

-  if ((Length /= sizeof (Value)) == 0) {

-    return NULL;

-  }

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

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

 }

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
index 9b817b1b0e..72a8078b81 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c
@@ -26,24 +26,21 @@
 #include "MemLibInternals.h"

 

 /**

-  Scans a target buffer for an 8-bit value, and returns a pointer to the

-  matching 8-bit value in the target buffer.

+  Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value

+  in the target buffer.

 

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

-  the lowest address to the highest address for an 8-bit value that matches

-  Value. If a match is found, then a pointer to the matching byte in the target

-  buffer is returned. If no match is found, then NULL is returned. If Length is

-  0, then NULL is returned.

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

+  address to the highest address for an 8-bit value that matches Value.  If a match is found,

+  then a pointer to the matching byte 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 Length is greater than (MAX_ADDRESS � Buffer + 1), then ASSERT(). 

 

-  If Buffer is NULL, 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  Value       Value to search for in the target buffer.

 

-  @param  Buffer  Pointer to the target buffer to scan.

-  @param  Length  Number of bytes in Buffer to scan.

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

-

-  @return Pointer to the first occurrence or NULL if not found.

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

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

 

 **/

 VOID *

@@ -54,11 +51,11 @@ ScanMem8 (
   IN      UINT8                     Value

   )

 {

-  ASSERT (Buffer != NULL);

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

-

-  if ((Length /= sizeof (Value)) == 0) {

+  if (Length == 0) {

     return NULL;

   }

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

+  ASSERT (Buffer != NULL);

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

+ 

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

 }

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

   bytes of Buffer.

 

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

+  If Length > 0 and Buffer is NULL and Length > 0, 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().

@@ -52,13 +52,14 @@ SetMem16 (
   IN      UINT16                    Value

   )

 {

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

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

+  if (Length == 0) {

+    return Buffer;

+  }

+

+  ASSERT (Buffer != NULL);

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

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

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

 

-  if ((Length /= sizeof (Value)) == 0) {

-    return Buffer;

-  }

-  return InternalMemSetMem16 (Buffer, Length, Value);

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

 }

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

   bytes of Buffer.

 

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

+  If Length > 0 and Buffer is NULL and Length > 0, 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().

@@ -52,13 +52,14 @@ SetMem32 (
   IN      UINT32                    Value

   )

 {

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

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

+  if (Length == 0) {

+    return Buffer;

+  }

+

+  ASSERT (Buffer != NULL);

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

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

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

 

-  if ((Length /= sizeof (Value)) == 0) {

-    return Buffer;

-  }

-  return InternalMemSetMem32 (Buffer, Length, Value);

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

 }

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

   bytes of Buffer.

 

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

+  If Length > 0 and Buffer is NULL and Length > 0, 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().

@@ -52,13 +52,14 @@ SetMem64 (
   IN      UINT64                    Value

   )

 {

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

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

+  if (Length == 0) {

+    return Buffer;

+  }

+

+  ASSERT (Buffer != NULL);

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

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

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

 

-  if ((Length /= sizeof (Value)) == 0) {

-    return Buffer;

-  }

-  return InternalMemSetMem64 (Buffer, Length, Value);

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

 }

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
index 0600dc289f..d0e8760ff6 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
@@ -26,30 +26,31 @@
 #include "MemLibInternals.h"

 

 /**

-  Set Buffer to Value for Size bytes.

+  Fills a target buffer with a byte value, and returns the target buffer.

 

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

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

 

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

+  @param  Buffer    Memory to set.

+  @param  Length    Number of bytes to set

+  @param  Value     Value of the set operation.

 

-  @param  Buffer Memory to set.

-  @param  Size Number of bytes to set

-  @param  Value Value of the set operation.

-

-  @return Buffer

+  @return Buffer.

 

 **/

 VOID *

 EFIAPI

 SetMem (

   IN      VOID                      *Buffer,

-  IN      UINTN                     Size,

+  IN      UINTN                     Length,

   IN      UINT8                     Value

   )

 {

-  if (Size == 0) {

+  if (Length == 0) {

     return Buffer;

   }

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

-  return InternalMemSetMem (Buffer, Size, Value);

+

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

+

+  return InternalMemSetMem (Buffer, Length, Value);

 }