tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: Add %u and %lu support for PrintLib and DebugLib. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17570 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Qiu Shumin 2015-06-08 05:34:08 +00:00 committed by shenshushi
parent 94e3eee6e8
commit 796fecd84b
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c
View File

@ -177,6 +177,7 @@ DxePrintLibPrint2ProtocolVaListToBaseList (
} }
case 'X': case 'X':
case 'x': case 'x':
case 'u':
case 'd': case 'd':
if (Long) { if (Long) {
BASE_ARG (BaseListMarker, INT64) = VA_ARG (VaListMarker, INT64); BASE_ARG (BaseListMarker, INT64) = VA_ARG (VaListMarker, INT64);
@ -943,6 +944,7 @@ AsciiValueToString (
#define PRECISION BIT11 #define PRECISION BIT11
#define ARGUMENT_REVERSED BIT12 #define ARGUMENT_REVERSED BIT12
#define COUNT_ONLY_NO_PRINT BIT13 #define COUNT_ONLY_NO_PRINT BIT13
#define UNSIGNED_TYPE BIT14
// //
// Record date and time information // Record date and time information
@ -1429,10 +1431,18 @@ InternalPrintLibSPrintMarker (
// //
// break skipped on purpose // break skipped on purpose
// //
case 'u':
if ((Flags & RADIX_HEX) == 0) {
Flags &= ~((UINTN) (PREFIX_SIGN));
Flags |= UNSIGNED_TYPE;
}
//
// break skipped on purpose
//
case 'd': case 'd':
if ((Flags & LONG_TYPE) == 0) { if ((Flags & LONG_TYPE) == 0) {
// //
// 'd','x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int". // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".
// This assumption is made so the format string definition is compatible with the ANSI C // This assumption is made so the format string definition is compatible with the ANSI C
// Specification for formatted strings. It is recommended that the Base Types be used // Specification for formatted strings. It is recommended that the Base Types be used
// everywhere, but in this one case, compliance with ANSI C is more important, and // everywhere, but in this one case, compliance with ANSI C is more important, and
@ -1466,17 +1476,27 @@ InternalPrintLibSPrintMarker (
Flags &= ~((UINTN) PREFIX_ZERO); Flags &= ~((UINTN) PREFIX_ZERO);
Precision = 1; Precision = 1;
} }
if (Value < 0) { if (Value < 0 && (Flags & UNSIGNED_TYPE) == 0) {
Flags |= PREFIX_SIGN; Flags |= PREFIX_SIGN;
Prefix = '-'; Prefix = '-';
Value = -Value; Value = -Value;
} else if ((Flags & UNSIGNED_TYPE) != 0 && (Flags & LONG_TYPE) == 0) {
//
// 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".
// This assumption is made so the format string definition is compatible with the ANSI C
// Specification for formatted strings. It is recommended that the Base Types be used
// everywhere, but in this one case, compliance with ANSI C is more important, and
// provides an implementation that is compatible with that largest possible set of CPU
// architectures. This is why the type "unsigned int" is used in this one case.
//
Value = (unsigned int)Value;
} }
} else { } else {
Radix = 16; Radix = 16;
Comma = FALSE; Comma = FALSE;
if ((Flags & LONG_TYPE) == 0 && Value < 0) { if ((Flags & LONG_TYPE) == 0 && Value < 0) {
// //
// 'd','x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int". // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".
// This assumption is made so the format string definition is compatible with the ANSI C // This assumption is made so the format string definition is compatible with the ANSI C
// Specification for formatted strings. It is recommended that the Base Types be used // Specification for formatted strings. It is recommended that the Base Types be used
// everywhere, but in this one case, compliance with ANSI C is more important, and // everywhere, but in this one case, compliance with ANSI C is more important, and

2
MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
View File

@ -182,7 +182,7 @@ DebugPrint (
if ((*Format == 'p') && (sizeof (VOID *) > 4)) { if ((*Format == 'p') && (sizeof (VOID *) > 4)) {
Long = TRUE; Long = TRUE;
} }
if (*Format == 'p' || *Format == 'X' || *Format == 'x' || *Format == 'd') { if (*Format == 'p' || *Format == 'X' || *Format == 'x' || *Format == 'd' || *Format == 'u') {
if (Long) { if (Long) {
BASE_ARG (BaseListMarker, INT64) = VA_ARG (VaListMarker, INT64); BASE_ARG (BaseListMarker, INT64) = VA_ARG (VaListMarker, INT64);
} else { } else {