xnu-2050.9.2.tar.gz

[apple/xnu.git] / osfmk / kern / printf.c

diff --git a/osfmk/kern/printf.c b/osfmk/kern/printf.c
index f8376b4197ff4302da10ee7041a7470a0624af4a..88813d84431488966834aebc2a04180f667b83e9 100644 (file)
--- a/osfmk/kern/printf.c
+++ b/osfmk/kern/printf.c
@@ -94,9 +94,7 @@
  *     %0m.n   zero-padding
  *     %*.*    width and precision taken from arguments
  *
- *  This version does not implement %f, %e, or %g.  It accepts, but
- *  ignores, an `l' as in %ld, %lo, %lx, and %lu, and therefore will not
- *  work correctly on machines for which sizeof(long) != sizeof(int).
+ *  This version does not implement %f, %e, or %g.
  *
  *  As mentioned, this version does not return any reasonable value.
  *
@@ -157,7 +155,6 @@
  */
 
 #include <debug.h>
-#include <mach_kdb.h>
 #include <mach_kdp.h>
 #include <platforms.h>
 #include <mach/boolean.h>
@@ -174,21 +171,25 @@
 #endif
 #include <console/serial_protos.h>
 
-#ifdef __ppc__
-#include <ppc/Firmware.h>
-#endif
-
 #define isdigit(d) ((d) >= '0' && (d) <= '9')
 #define Ctod(c) ((c) - '0')
 
 #define MAXBUF (sizeof(long long int) * 8)     /* enough for binary */
 static char digs[] = "0123456789abcdef";
 
-
 #if CONFIG_NO_PRINTF_STRINGS
-#undef printf(x, ...)
+/* Prevent CPP from breaking the definition below */
+#undef printf
 #endif
 
+int _consume_printf_args(int a __unused, ...)
+{
+    return 0;
+}
+void _consume_kprintf_args(int a __unused, ...)
+{
+}
+
 static int
 printnum(
        unsigned long long int  u,      /* number to print */
@@ -218,7 +219,7 @@ boolean_t   _doprnt_truncates = FALSE;
 int
 __doprnt(
        const char      *fmt,
-       va_list                 *argp,
+       va_list                 argp,
                                                /* character output routine */
        void                    (*putc)(int, void *arg),
        void                    *arg,
@@ -290,7 +291,7 @@ __doprnt(
                }
            }
            else if (c == '*') {
-               length = va_arg(*argp, int);
+               length = va_arg(argp, int);
                c = *++fmt;
                if (length < 0) {
                    ladjust = !ladjust;
@@ -308,13 +309,15 @@ __doprnt(
                    }
                }
                else if (c == '*') {
-                   prec = va_arg(*argp, int);
+                   prec = va_arg(argp, int);
                    c = *++fmt;
                }
            }
 
            if (c == 'l') {
                c = *++fmt;     /* need it if sizeof(int) < sizeof(long) */
+               if (sizeof(int)<sizeof(long))
+                   long_long = 1;
                if (c == 'l') {
                    long_long = 1;
                    c = *++fmt;
@@ -336,11 +339,11 @@ __doprnt(
                    register int  i;
 
                    if (long_long) {
-                       u = va_arg(*argp, unsigned long long);
+                       u = va_arg(argp, unsigned long long);
                    } else {
-                       u = va_arg(*argp, unsigned long);
+                       u = va_arg(argp, unsigned int);
                    }
-                   p = va_arg(*argp, char *);
+                   p = va_arg(argp, char *);
                    base = *p++;
                    nprinted += printnum(u, base, putc, arg);
 
@@ -399,7 +402,7 @@ __doprnt(
                }
 
                case 'c':
-                   c = va_arg(*argp, int);
+                   c = va_arg(argp, int);
                    (*putc)(c, arg);
                    nprinted++;
                    break;
@@ -412,7 +415,7 @@ __doprnt(
                    if (prec == -1)
                        prec = 0x7fffffff;      /* MAXINT */
 
-                   p = va_arg(*argp, char *);
+                   p = va_arg(argp, char *);
 
                    if (p == NULL)
                        p = "";
@@ -465,8 +468,8 @@ __doprnt(
                    unsigned char *up;
                    char *q, *p;
                    
-                       up = (unsigned char *)va_arg(*argp, unsigned char *);
-                       p = (char *)va_arg(*argp, char *);
+                       up = (unsigned char *)va_arg(argp, unsigned char *);
+                       p = (char *)va_arg(argp, char *);
                        if (length == -1)
                                length = 16;
                        while(length--) {
@@ -497,6 +500,9 @@ __doprnt(
 
                case 'p':
                    altfmt = TRUE;
+                   if (sizeof(int)<sizeof(void *)) {
+                       long_long = 1;
+                   }
                case 'x':
                    truncate = _doprnt_truncates;
                    base = 16;
@@ -531,9 +537,9 @@ __doprnt(
 
                print_signed:
                    if (long_long) {
-                       n = va_arg(*argp, long long);
+                       n = va_arg(argp, long long);
                    } else {
-                       n = va_arg(*argp, long);
+                       n = va_arg(argp, int);
                    }
                    if (n >= 0) {
                        u = n;
@@ -547,9 +553,9 @@ __doprnt(
 
                print_unsigned:
                    if (long_long) {
-                       u = va_arg(*argp, unsigned long long);
+                       u = va_arg(argp, unsigned long long);
                    } else { 
-                       u = va_arg(*argp, unsigned long);
+                       u = va_arg(argp, unsigned int);
                    }
                    goto print_num;
 
@@ -575,11 +581,11 @@ __doprnt(
                        u /= base;
                    } while (u != 0);
 
-                   length -= (&buf[MAXBUF-1] - p);
+                   length -= (int)(&buf[MAXBUF-1] - p);
                    if (sign_char)
                        length--;
                    if (prefix)
-                       length -= strlen(prefix);
+                       length -= (int)strlen(prefix);
 
                    if (padc == ' ' && !ladjust) {
                        /* blank padding goes before prefix */
@@ -649,7 +655,7 @@ _doprnt(
        void                    (*putc)(char),
        int                     radix)          /* default radix - for '%r' */
 {
-    __doprnt(fmt, argp, dummy_putc, putc, radix);
+    __doprnt(fmt, *argp, dummy_putc, putc, radix);
 }
 
 #if    MP_PRINTF 
@@ -750,22 +756,12 @@ conslog_putc(
 #endif
 }
 
-#if    MACH_KDB
-extern void db_putchar(char c);
-#endif
-
 void
-dbugprintf(__unused const char *fmt, ...)
+cons_putc_locked(
+       char c)
 {
-
-#if    MACH_KDB
-       va_list listp;
-
-       va_start(listp, fmt);
-       _doprnt(fmt, &listp, db_putchar, 16);
-       va_end(listp);
-#endif
-       return;
+       if ((debug_mode && !disable_debug_output) || !disableConsoleOutput)
+               cnputc(c);
 }
 
 int
@@ -796,6 +792,18 @@ consdebug_putc(char c)
                        PE_kputc(c);
 }
 
+void
+consdebug_putc_unbuffered(char c)
+{
+       if ((debug_mode && !disable_debug_output) || !disableConsoleOutput)
+               cnputc_unbuffered(c);
+
+       debug_putc(c);
+
+       if (!console_is_serial())
+               if (!disable_serial_output)
+                       PE_kputc(c);
+}
 
 void
 consdebug_log(char c)
@@ -825,6 +833,19 @@ kdb_log(const char *fmt, ...)
        return 0;
 }
 
+int
+kdb_printf_unbuffered(const char *fmt, ...)
+{
+       va_list listp;
+
+       va_start(listp, fmt);
+       _doprnt(fmt, &listp, consdebug_putc_unbuffered, 16);
+       va_end(listp);
+       return 0;
+}
+
+#if !CONFIG_EMBEDDED
+
 static void
 copybyte(int c, void *arg)
 {
@@ -851,8 +872,9 @@ sprintf(char *buf, const char *fmt, ...)
 
         va_start(listp, fmt);
         copybyte_str = buf;
-        __doprnt(fmt, &listp, copybyte, &copybyte_str, 16);
+        __doprnt(fmt, listp, copybyte, &copybyte_str, 16);
         va_end(listp);
        *copybyte_str = '\0';
-        return strlen(buf);
+        return (int)strlen(buf);
 }
+#endif /* !CONFIG_EMBEDDED */