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

[mirror_edk2.git] / MdePkg / Library / BasePrintLib / PrintLibInternal.c

diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
index 8dc5ec73814886b153048d7d002531efe8bda68b..a114bde13a9b7d9120cc08423faff61f9a4db4a4 100644 (file)
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
@@ -1,7 +1,7 @@
 /** @file\r
   Print Library internal worker functions.\r
 \r
-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -547,10 +547,18 @@ BasePrintLibSPrintMarker (
         //\r
         // break skipped on purpose\r
         //\r
+      case 'u':\r
+        if ((Flags & RADIX_HEX) == 0) {\r
+          Flags &= ~((UINTN) (PREFIX_SIGN));\r
+          Flags |= UNSIGNED_TYPE;\r
+        }\r
+        //\r
+        // break skipped on purpose\r
+        //\r
       case 'd':\r
         if ((Flags & LONG_TYPE) == 0) {\r
           //\r
-          // 'd','x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
+          // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
           // This assumption is made so the format string definition is compatible with the ANSI C\r
           // Specification for formatted strings.  It is recommended that the Base Types be used \r
           // everywhere, but in this one case, compliance with ANSI C is more important, and \r
@@ -584,17 +592,27 @@ BasePrintLibSPrintMarker (
             Flags &= ~((UINTN) PREFIX_ZERO);\r
             Precision = 1;\r
           }\r
-          if (Value < 0) {\r
+          if (Value < 0 && (Flags & UNSIGNED_TYPE) == 0) {\r
             Flags |= PREFIX_SIGN;\r
             Prefix = '-';\r
             Value = -Value;\r
+          } else if ((Flags & UNSIGNED_TYPE) != 0 && (Flags & LONG_TYPE) == 0) {\r
+            //\r
+            // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
+            // This assumption is made so the format string definition is compatible with the ANSI C\r
+            // Specification for formatted strings.  It is recommended that the Base Types be used \r
+            // everywhere, but in this one case, compliance with ANSI C is more important, and \r
+            // provides an implementation that is compatible with that largest possible set of CPU \r
+            // architectures.  This is why the type "unsigned int" is used in this one case.\r
+            //\r
+            Value = (unsigned int)Value;\r
           }\r
         } else {\r
           Radix = 16;\r
           Comma = FALSE;\r
           if ((Flags & LONG_TYPE) == 0 && Value < 0) {\r
             //\r
-            // 'd','x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
+            // 'd', 'u', 'x', and 'X' that are not preceded by 'l' or 'L' are assumed to be type "int".\r
             // This assumption is made so the format string definition is compatible with the ANSI C\r
             // Specification for formatted strings.  It is recommended that the Base Types be used \r
             // everywhere, but in this one case, compliance with ANSI C is more important, and \r