1) Added BIT0, BIT1, …, BIT63 to the Base Defines

2) Added MIN() and MAX() macros to the Base Macros
3) Added StrStr(), StrDecimalToUnitn(), StrDecimalToUint64(), StrHexToUintn(), StrHexToUintn64(), UnicodeToAscii(), AsciiStrStr(), AsciiStrDecimalToUnitn(), AsciiStrDecimalToUint64(), AsciiStrHexToUintn(), AsciiStrHexToUintn64(), and AsciiToUnicode() to the Base Library String Functions
4) Added the Base Library Checksum Functions which include CalculateSum8(), CaclculateCheckSum8(), CalculateSum16(), CalculateChecksum16(), CalculateSum32(), CalculateCheckSum32(), CalculateSum64(), CalculateChecksum64().

5) Added MMIO Buffer functions to the I/O Library including MmioReadBuffer8(), MmioReadBuffer16(), MmioReadBuffer32(), MmioReadBuffer64(), MmioWriteBuffer8(), MmioWriteBuffer16(), MmioWriteBuffer32(), MmioWriteBuffer64().

6) Changed the parameter name from SizeOfValue to SizeOfBuffer in PcdSetPtr(), PcdSetPtrEx(), PatchPcdSetPtr(), LibPcdSetPtr(), LibPcdSetPtrEx(), LibPatchPcdSetPtr()

7) Added RADIX_HEX flag to the Print Library to support the conversion of values to hexadecimal strings in UnicodeValueToString() and AsciiValueToString() 

8) Added EfiGetCurrentTpl() UEFI Library.


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

1 files changed, 209 insertions, 199 deletions

diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
index 3d2f2952f9..675e2a80e2 100644
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
@@ -1,199 +1,209 @@
-/** @file

-  Print Library worker functions.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-  Module Name:  PrintLibInternal.c

-

-**/

-

-#include "PrintLibInternal.h"

-

-GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};

-

-

-/**

-  Internal function that places the character into the Buffer.

-

-  Internal function that places ASCII or Unicode character into the Buffer.

-

-  @param  Buffer      Buffer to place the Unicode or ASCII string.

-  @param  EndBuffer   The end of the input Buffer. No characters will be

-                      placed after that. 

-  @param  Length      Count of character to be placed into Buffer.

-  @param  Character   Character to be placed into Buffer.

-  @param  Increment   Character increment in Buffer.

-

-  @return Number of characters printed.

-

-**/

-CHAR8 *

-BasePrintLibFillBuffer (

-  CHAR8   *Buffer,

-  CHAR8   *EndBuffer,

-  INTN    Length,

-  UINTN   Character,

-  INTN    Increment

-  )

-{

-  INTN  Index;

-

-  for (Index = 0; Index < Length && Buffer < EndBuffer; Index++) {

-    *Buffer       =  (CHAR8) Character;

-    *(Buffer + 1) =  (CHAR8) (Character >> 8);

-    Buffer        += Increment;

-  }

-  return Buffer;

-}

-

-/**

-  Internal function that convert a decimal number to a string in Buffer.

-

-  Print worker function that convert a decimal number to a string in Buffer.

-

-  @param  Buffer    Location to place the Unicode or ASCII string of Value.

-  @param  Value     Value to convert to a Decimal or Hexidecimal string in Buffer.

-  @param  Radix     Radix of the value

-

-  @return Number of characters printed.

-

-**/

-UINTN

-EFIAPI

-BasePrintLibValueToString (

-  IN OUT CHAR8  *Buffer,

-  IN INT64      Value,

-  IN UINTN      Radix

-  )

-{

-  UINTN   Digits;

-  UINT32  Remainder;

-

-  //

-  // Loop to convert one digit at a time in reverse order

-  //

-  *(Buffer++) = 0;

-  Digits = 0;

-  do {

-    Value = (INT64)DivU64x32Remainder ((UINT64)Value, (UINT32)Radix, &Remainder);

-    *(Buffer++) = mHexStr[Remainder];

-    Digits++;

-  } while (Value != 0);

-  return Digits;

-}

-

-/**

-  Internal function that converts a decimal value to a Null-terminated string.

-  

-  Converts the decimal number specified by Value to a Null-terminated  

-  string specified by Buffer containing at most Width characters.

-  If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.

-  The number of characters in Buffer is returned not including the Null-terminator.

-  If the conversion contains more than Width characters, then only the first

-  Width characters are returned, and the total number of characters 

-  required to perform the conversion is returned.

-  Additional conversion parameters are specified in Flags.  

-  The Flags bit LEFT_JUSTIFY is always ignored.

-  All conversions are left justified in Buffer.

-  If Width is 0, PREFIX_ZERO is ignored in Flags.

-  If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas

-  are inserted every 3rd digit starting from the right.

-  If Value is < 0, then the fist character in Buffer is a '-'.

-  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored, 

-  then Buffer is padded with '0' characters so the combination of the optional '-' 

-  sign character, '0' characters, digit characters for Value, and the Null-terminator

-  add up to Width characters.

-

-  If Buffer is NULL, then ASSERT().

-  If unsupported bits are set in Flags, then ASSERT().

-  If Width >= MAXIMUM_VALUE_CHARACTERS, then ASSERT()

-

-  @param  Buffer    Pointer to the output buffer for the produced Null-terminated

-                    string.

-  @param  Flags     The bitmask of flags that specify left justification, zero pad,

-                    and commas.

-  @param  Value     The 64-bit signed value to convert to a string.

-  @param  Width     The maximum number of characters to place in Buffer, not including

-                    the Null-terminator.

-  @param  Increment Character increment in Buffer.

-  

-  @return The number of characters in Buffer not including the Null-terminator.

-

-**/

-UINTN

-BasePrintLibConvertValueToString (

-  IN OUT CHAR8   *Buffer,

-  IN UINTN       Flags,

-  IN INT64       Value,

-  IN UINTN       Width,

-  IN UINTN       Increment

-  )

-{

-  CHAR8  *OriginalBuffer;

-  CHAR8  *EndBuffer;

-  CHAR8  ValueBuffer[MAXIMUM_VALUE_CHARACTERS];

-  UINTN  Count;

-  UINTN  Digits;

-  UINTN  Index;

-

-  ASSERT (Buffer != NULL);

-  ASSERT (Width < MAXIMUM_VALUE_CHARACTERS);

-  //

-  // Make sure Flags can only contain supported bits.

-  //

-  ASSERT ((Flags & ~(LEFT_JUSTIFY | COMMA_TYPE | PREFIX_ZERO)) == 0);

-

-  OriginalBuffer = Buffer;

-

-  if (Width == 0 || (Flags & COMMA_TYPE) != 0) {

-    Flags &= (~PREFIX_ZERO);

-  }

-

-  if (Width == 0) {

-    Width = MAXIMUM_VALUE_CHARACTERS - 1;

-  }

-  //

-  // Set the tag for the end of the input Buffer.

-  //

-  EndBuffer = Buffer + Width * Increment;

-

-  if (Value < 0) {

-    Value = -Value;

-    Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, '-', Increment);

-    Width--;

-  }

-

-  Count = BasePrintLibValueToString (ValueBuffer, Value, 10);

-

-  if ((Flags & PREFIX_ZERO) != 0) {

-    Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Count, '0', Increment);

-  }

-

-  Digits = Count % 3;

-  if (Digits != 0) {

-    Digits = 3 - Digits;

-  }

-  for (Index = 0; Index < Count; Index++) {

-    Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ValueBuffer[Count - Index], Increment);

-    if ((Flags & COMMA_TYPE) != 0) {

-      Digits++;

-      if (Digits == 3) {

-        Digits = 0;

-        if ((Index + 1) < Count) {

-          Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ',', Increment);

-        }

-      }

-    }

-  }

-

-  BasePrintLibFillBuffer (Buffer, EndBuffer + Increment, 1, 0, Increment);

-

-  return ((Buffer - OriginalBuffer) / Increment);

-}

+/** @file
+  Print Library worker functions.
+
+  Copyright (c) 2006 - 2007, Intel Corporation<BR>
+  All rights reserved. This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  Module Name:  PrintLibInternal.c
+
+**/
+
+#include "PrintLibInternal.h"
+
+GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
+
+
+/**
+  Internal function that places the character into the Buffer.
+
+  Internal function that places ASCII or Unicode character into the Buffer.
+
+  @param  Buffer      Buffer to place the Unicode or ASCII string.
+  @param  EndBuffer   The end of the input Buffer. No characters will be
+                      placed after that. 
+  @param  Length      Count of character to be placed into Buffer.
+  @param  Character   Character to be placed into Buffer.
+  @param  Increment   Character increment in Buffer.
+
+  @return Number of characters printed.
+
+**/
+CHAR8 *
+BasePrintLibFillBuffer (
+  CHAR8   *Buffer,
+  CHAR8   *EndBuffer,
+  INTN    Length,
+  UINTN   Character,
+  INTN    Increment
+  )
+{
+  INTN  Index;
+
+  for (Index = 0; Index < Length && Buffer < EndBuffer; Index++) {
+    *Buffer       =  (CHAR8) Character;
+    *(Buffer + 1) =  (CHAR8) (Character >> 8);
+    Buffer        += Increment;
+  }
+  return Buffer;
+}
+
+/**
+  Internal function that convert a decimal number to a string in Buffer.
+
+  Print worker function that convert a decimal number to a string in Buffer.
+
+  @param  Buffer    Location to place the Unicode or ASCII string of Value.
+  @param  Value     Value to convert to a Decimal or Hexidecimal string in Buffer.
+  @param  Radix     Radix of the value
+
+  @return Number of characters printed.
+
+**/
+UINTN
+EFIAPI
+BasePrintLibValueToString (
+  IN OUT CHAR8  *Buffer,
+  IN INT64      Value,
+  IN UINTN      Radix
+  )
+{
+  UINTN   Digits;
+  UINT32  Remainder;
+
+  //
+  // Loop to convert one digit at a time in reverse order
+  //
+  *(Buffer++) = 0;
+  Digits = 0;
+  do {
+    Value = (INT64)DivU64x32Remainder ((UINT64)Value, (UINT32)Radix, &Remainder);
+    *(Buffer++) = mHexStr[Remainder];
+    Digits++;
+  } while (Value != 0);
+  return Digits;
+}
+
+/**
+  Internal function that converts a decimal value to a Null-terminated string.
+  
+  Converts the decimal number specified by Value to a Null-terminated  
+  string specified by Buffer containing at most Width characters.
+  If Width is 0 then a width of  MAXIMUM_VALUE_CHARACTERS is assumed.
+  The number of characters in Buffer is returned not including the Null-terminator.
+  If the conversion contains more than Width characters, then only the first
+  Width characters are returned, and the total number of characters 
+  required to perform the conversion is returned.
+  Additional conversion parameters are specified in Flags.  
+  The Flags bit LEFT_JUSTIFY is always ignored.
+  All conversions are left justified in Buffer.
+  If Width is 0, PREFIX_ZERO is ignored in Flags.
+  If COMMA_TYPE is set in Flags, then PREFIX_ZERO is ignored in Flags, and commas
+  are inserted every 3rd digit starting from the right.
+  If HEX_RADIX is set in Flags, then the output buffer will be formatted in hexadecimal format.
+  If Value is < 0 and HEX_RADIX is not set in Flags, then the fist character in Buffer is a '-'.
+  If PREFIX_ZERO is set in Flags and PREFIX_ZERO is not being ignored, 
+  then Buffer is padded with '0' characters so the combination of the optional '-' 
+  sign character, '0' characters, digit characters for Value, and the Null-terminator
+  add up to Width characters.
+  If both COMMA_TYPE and HEX_RADIX are set in Flags, then ASSERT().
+
+  If Buffer is NULL, then ASSERT().
+  If unsupported bits are set in Flags, then ASSERT().
+  If Width >= MAXIMUM_VALUE_CHARACTERS, then ASSERT()
+
+  @param  Buffer    Pointer to the output buffer for the produced Null-terminated
+                    string.
+  @param  Flags     The bitmask of flags that specify left justification, zero pad,
+                    and commas.
+  @param  Value     The 64-bit signed value to convert to a string.
+  @param  Width     The maximum number of characters to place in Buffer, not including
+                    the Null-terminator.
+  @param  Increment Character increment in Buffer.
+  
+  @return The number of characters in Buffer not including the Null-terminator.
+
+**/
+UINTN
+BasePrintLibConvertValueToString (
+  IN OUT CHAR8   *Buffer,
+  IN UINTN       Flags,
+  IN INT64       Value,
+  IN UINTN       Width,
+  IN UINTN       Increment
+  )
+{
+  CHAR8  *OriginalBuffer;
+  CHAR8  *EndBuffer;
+  CHAR8  ValueBuffer[MAXIMUM_VALUE_CHARACTERS];
+  UINTN  Count;
+  UINTN  Digits;
+  UINTN  Index;
+  UINTN  Radix;
+
+  ASSERT (Buffer != NULL);
+  ASSERT (Width < MAXIMUM_VALUE_CHARACTERS);
+  //
+  // Make sure Flags can only contain supported bits.
+  //
+  ASSERT ((Flags & ~(LEFT_JUSTIFY | COMMA_TYPE | PREFIX_ZERO | RADIX_HEX)) == 0);
+
+  //
+  // If both COMMA_TYPE and HEX_RADIX are set, then ASSERT ()
+  //
+  ASSERT (((Flags & COMMA_TYPE) != 0 && (Flags & RADIX_HEX) != 0) == FALSE);
+
+  OriginalBuffer = Buffer;
+
+  if (Width == 0 || (Flags & COMMA_TYPE) != 0) {
+    Flags &= (~PREFIX_ZERO);
+  }
+
+  if (Width == 0) {
+    Width = MAXIMUM_VALUE_CHARACTERS - 1;
+  }
+  //
+  // Set the tag for the end of the input Buffer.
+  //
+  EndBuffer = Buffer + Width * Increment;
+
+  if ((Value < 0) && ((Flags & RADIX_HEX) == 0)) {
+    Value = -Value;
+    Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, '-', Increment);
+    Width--;
+  }
+
+  Radix = ((Flags & RADIX_HEX) == 0)? 10 : 16;
+  Count = BasePrintLibValueToString (ValueBuffer, Value, Radix);
+
+  if ((Flags & PREFIX_ZERO) != 0) {
+    Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, Width - Count, '0', Increment);
+  }
+
+  Digits = Count % 3;
+  if (Digits != 0) {
+    Digits = 3 - Digits;
+  }
+  for (Index = 0; Index < Count; Index++) {
+    Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ValueBuffer[Count - Index], Increment);
+    if ((Flags & COMMA_TYPE) != 0) {
+      Digits++;
+      if (Digits == 3) {
+        Digits = 0;
+        if ((Index + 1) < Count) {
+          Buffer = BasePrintLibFillBuffer (Buffer, EndBuffer, 1, ',', Increment);
+        }
+      }
+    }
+  }
+
+  BasePrintLibFillBuffer (Buffer, EndBuffer + Increment, 1, 0, Increment);
+
+  return ((Buffer - OriginalBuffer) / Increment);
+}
+