Changeset 04803bf in mainline for kernel/generic/src/printf/printf_core.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• kernel/generic/src/printf/printf_core.c (modified) (13 diffs)

kernel/generic/src/printf/printf_core.c

@@ -39 +39 @@
 #include <printf/printf_core.h>
 #include <print.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 #include <macros.h>
-#include <string.h>
+#include <str.h>
 #include <arch.h>
 
 /** show prefixes 0x or 0 */
 #define __PRINTF_FLAG_PREFIX       0x00000001
+
 /** signed / unsigned number */
 #define __PRINTF_FLAG_SIGNED       0x00000002
+
 /** print leading zeroes */
 #define __PRINTF_FLAG_ZEROPADDED   0x00000004
+
 /** align to left */
 #define __PRINTF_FLAG_LEFTALIGNED  0x00000010
+
 /** always show + sign */
 #define __PRINTF_FLAG_SHOWPLUS     0x00000020
+
 /** print space instead of plus */
 #define __PRINTF_FLAG_SPACESIGN    0x00000040
+
 /** show big characters */
 #define __PRINTF_FLAG_BIGCHARS     0x00000080
+
 /** number has - sign */
 #define __PRINTF_FLAG_NEGATIVE     0x00000100
@@ -76 +83 @@
         PrintfQualifierLong,
         PrintfQualifierLongLong,
-        PrintfQualifierPointer
+        PrintfQualifierPointer,
+        PrintfQualifierSize
 } qualifier_t;
 
-static char nullstr[] = "(NULL)";
-static char digits_small[] = "0123456789abcdef";
-static char digits_big[] = "0123456789ABCDEF";
-static char invalch = U_SPECIAL;
+static const char *nullstr = "(NULL)";
+static const char *digits_small = "0123456789abcdef";
+static const char *digits_big = "0123456789ABCDEF";
+static const char invalch = U_SPECIAL;
 
 /** Print one or more characters without adding newline.
@@ -254 +262 @@
         if (str == NULL)
                 return printf_putstr(nullstr, ps);
-
+        
         /* Print leading spaces. */
         size_t strw = str_length(str);
         if (precision == 0)
                 precision = strw;
-
+        
         /* Left padding */
         size_t counter = 0;
@@ -269 +277 @@
                 }
         }
-
+        
         /* Part of @a str fitting into the alloted space. */
         int retval;
@@ -351 +359 @@
     uint32_t flags, printf_spec_t *ps)
 {
-        char *digits;
+        const char *digits;
         if (flags & __PRINTF_FLAG_BIGCHARS)
                 digits = digits_big;
@@ -384 +392 @@
          */
         if (flags & __PRINTF_FLAG_PREFIX) {
-                switch(base) {
+                switch (base) {
                 case 2:
                         /* Binary formating is not standard, but usefull */
@@ -448 +456 @@
         /* Print prefix */
         if (flags & __PRINTF_FLAG_PREFIX) {
-                switch(base) {
+                switch (base) {
                 case 2:
                         /* Binary formating is not standard, but usefull */
@@ -546 +554 @@
  *  - ""   Signed or unsigned int (default value).@n
  *  - "l"  Signed or unsigned long int.@n
- *         If conversion is "c", the character is wchar_t (wide character).@n
+ *         If conversion is "c", the character is wint_t (wide character).@n
  *         If conversion is "s", the string is wchar_t * (wide string).@n
  *  - "ll" Signed or unsigned long long int.@n
+ *  - "z"  Signed or unsigned ssize_t or site_t.@n
  *
  * CONVERSION:@n
@@ -563 +572 @@
  *
  *  - P, p Print value of a pointer. Void * value is expected and it is
- *         printed in hexadecimal notation with prefix (as with \%#X / \%#x
- *         for 32-bit or \%#X / \%#x for 64-bit long pointers).
+ *         printed in hexadecimal notation with prefix (as with
+ *         \%#0.8X / \%#0.8x for 32-bit or \%#0.16lX / \%#0.16lx for 64-bit
+ *         long pointers).
  *
  *  - b Print value as unsigned binary number. Prefix is not printed by
@@ -729 +739 @@
                                 }
                                 break;
+                        case 'z':
+                                qualifier = PrintfQualifierSize;
+                                i = nxt;
+                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                                break;
                         default:
                                 /* Default type */
@@ -756 +771 @@
                         case 'c':
                                 if (qualifier == PrintfQualifierLong)
-                                        retval = print_wchar(va_arg(ap, wchar_t), width, flags, ps);
+                                        retval = print_wchar(va_arg(ap, wint_t), width, flags, ps);
                                 else
                                         retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
@@ -777 +792 @@
                         case 'p':
                                 flags |= __PRINTF_FLAG_PREFIX;
+                                flags |= __PRINTF_FLAG_ZEROPADDED;
                                 base = 16;
                                 qualifier = PrintfQualifierPointer;
@@ -839 +855 @@
                         case PrintfQualifierPointer:
                                 size = sizeof(void *);
-                                number = (uint64_t) (unsigned long) va_arg(ap, void *);
+                                precision = size << 1;
+                                number = (uint64_t) (uintptr_t) va_arg(ap, void *);
+                                break;
+                        case PrintfQualifierSize:
+                                size = sizeof(size_t);
+                                number = (uint64_t) va_arg(ap, size_t);
                                 break;
                         default: