]> xenbits.xensource.com Git - people/liuw/rumprun.git/commitdiff
add a printf routine to bmk-core
authorAntti Kantee <pooka@iki.fi>
Wed, 15 Apr 2015 08:08:10 +0000 (08:08 +0000)
committerAntti Kantee <pooka@iki.fi>
Wed, 15 Apr 2015 08:08:10 +0000 (08:08 +0000)
include/bmk-core/printf.h [new file with mode: 0644]
lib/librumprun_core/Makefile
lib/librumprun_core/subr_prf.c [new file with mode: 0644]

diff --git a/include/bmk-core/printf.h b/include/bmk-core/printf.h
new file mode 100644 (file)
index 0000000..e1d271f
--- /dev/null
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2015 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _BMK_CORE_PRINTF_H_
+#define _BMK_CORE_PRINTF_H_
+
+void   bmk_printf_init(void (*)(int), void (*)(void));
+void   bmk_printf(const char *, ...)
+       __attribute__((__format__(__printf__,1,2)));
+int    bmk_snprintf(char *, unsigned long, const char *, ...)
+       __attribute__((__format__(__printf__,3,4)));
+
+/* definition of va_list might cause collisions, so hide it by default */
+#ifdef _BMK_PRINTF_VA
+typedef __builtin_va_list va_list;
+#define va_start(ap, last)      __builtin_va_start((ap), (last))
+#define va_arg                  __builtin_va_arg
+#define va_end(ap)              __builtin_va_end(ap)
+
+int    bmk_vsnprintf(char *, unsigned long, const char *fmt, va_list)
+       __attribute__((__format__(__printf__,3,0)));
+#endif /* _BMK_PRINTF_VA */
+
+#endif /* _BMK_CORE_PRINTF_H_ */
index bab57bc986d1a2fb4ab8d3eb3369ad47c909c420..aa3b1390d6d8c6a505531322adb7e6a4c2891a46 100644 (file)
@@ -1,7 +1,7 @@
 LIB=           rumprun_core
 LIBISPRIVATE=  # defined
 
-SRCS=          init.c bmk_string.c memalloc.c
+SRCS=          init.c bmk_string.c memalloc.c subr_prf.c
 
 SRCS+=         rumpuser_stubs.c
 
diff --git a/lib/librumprun_core/subr_prf.c b/lib/librumprun_core/subr_prf.c
new file mode 100644 (file)
index 0000000..3985d35
--- /dev/null
@@ -0,0 +1,615 @@
+/*     $NetBSD: subr_prf.c,v 1.157 2015/02/04 07:10:47 msaitoh Exp $   */
+
+/*-
+ * Copyright (c) 1986, 1988, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)subr_prf.c  8.4 (Berkeley) 5/4/95
+ */
+
+/*
+ * This is the NetBSD kernel printf code heavily stripped.  Format support
+ * is the same, but the wrappers for calling printf have been reduced
+ * down to:
+ *   + printf
+ *   + snprintf
+ *   + vnsprintf
+ */
+
+#define _BMK_PRINTF_VA
+#include <bmk-core/null.h>
+#include <bmk-core/printf.h>
+#include <bmk-core/string.h>
+
+#define TOBUFONLY      0x01
+#define TOCONS         0x02
+
+#define __UNCONST(x) ((void *)(unsigned long)(x))
+#define KPRINTF_BUFSIZE (sizeof(long long)*8/3 + 2)
+
+/*
+ * local prototypes
+ */
+
+static void    cons_putchar(int, int);
+static int     kprintf(const char *, int, void *, char *, va_list);
+
+/*
+ * globals
+ */
+
+static void
+nullfun(void)
+{
+
+       return;
+}
+
+static void (*v_flush)(void);
+static void (*v_putc)(int);
+
+void
+bmk_printf_init(void (*putc)(int), void (*flush)(void))
+{
+
+       v_putc = putc;
+       if (flush == NULL)
+               flush = nullfun;
+       v_flush = flush;
+}
+
+static const char hexdigits[] = "0123456789abcdef";
+static const char HEXDIGITS[] = "0123456789ABCDEF";
+
+/*
+ * functions
+ */
+
+/*
+ * putchar: print a single character on console or user terminal.
+ *
+ * => if console, then the last MSGBUFS chars are saved in msgbuf
+ *     for inspection later (e.g. dmesg/syslog)
+ * => we must already be in the mutex!
+ */
+static void
+cons_putchar(int c, int flags)
+{
+
+       if (flags & TOCONS)
+               (*v_putc)(c);
+}
+
+static void
+kprintf_lock(void)
+{
+
+       /* XXX */
+}
+
+static void
+kprintf_unlock(void)
+{
+
+       /* XXX */
+}
+
+/*
+ * bmk_printf: print a message to the console and the log
+ */
+void
+bmk_printf(const char *fmt, ...)
+{
+        va_list ap;
+
+        kprintf_lock();
+
+        va_start(ap, fmt);
+        kprintf(fmt, TOCONS, NULL, NULL, ap);
+        va_end(ap);
+
+        kprintf_unlock();
+}
+
+/*
+ * bmk_snprintf: print a message to a buffer
+ */
+int
+bmk_snprintf(char *bf, unsigned long size, const char *fmt, ...)
+{
+       int retval;
+       va_list ap;
+
+       va_start(ap, fmt);
+       retval = bmk_vsnprintf(bf, size, fmt, ap);
+       va_end(ap);
+
+       return retval;
+}
+
+/*
+ * bmk_vsnprintf: print a message to a buffer [already have va_list]
+ */
+int
+bmk_vsnprintf(char *bf, unsigned long size, const char *fmt, va_list ap)
+{
+       int retval;
+       char *p;
+
+       p = bf + size;
+       retval = kprintf(fmt, TOBUFONLY, &p, bf, ap);
+       if (bf && size > 0) {
+               /* nul terminate */
+               if (size <= (unsigned long)retval)
+                       bf[size - 1] = '\0';
+               else
+                       bf[retval] = '\0';
+       }
+       return retval;
+}
+
+/*
+ * kprintf: scaled down version of printf(3).
+ *
+ * this version based on vfprintf() from libc which was derived from
+ * software contributed to Berkeley by Chris Torek.
+ *
+ * NOTE: The kprintf mutex must be held if we're going TOBUF or TOCONS!
+ */
+
+/*
+ * macros for converting digits to letters and vice versa
+ */
+#define        to_digit(c)     ((c) - '0')
+#define is_digit(c)    ((unsigned)to_digit(c) <= 9)
+#define        to_char(n)      ((n) + '0')
+
+/*
+ * flags used during conversion.
+ */
+#define        ALT             0x001           /* alternate form */
+#define        HEXPREFIX       0x002           /* add 0x or 0X prefix */
+#define        LADJUST         0x004           /* left adjustment */
+#define        LONGDBL         0x008           /* long double; unimplemented */
+#define        LONGINT         0x010           /* long integer */
+#define        QUADINT         0x020           /* quad integer */
+#define        SHORTINT        0x040           /* short integer */
+#define        MAXINT          0x080           /* intmax_t */
+#define        PTRINT          0x100           /* intptr_t */
+#define        SIZEINT         0x200           /* size_t */
+#define        ZEROPAD         0x400           /* zero (as opposed to blank) pad */
+#define FPT            0x800           /* Floating point number */
+
+       /*
+        * To extend shorts properly, we need both signed and unsigned
+        * argument extraction methods.
+        */
+#define        SARG() \
+       (flags&MAXINT ? va_arg(ap, long long) : \
+           flags&PTRINT ? va_arg(ap, long) : \
+           flags&SIZEINT ? va_arg(ap, long) : /* XXX */ \
+           flags&QUADINT ? va_arg(ap, long long) : \
+           flags&LONGINT ? va_arg(ap, long) : \
+           flags&SHORTINT ? (long)(short)va_arg(ap, int) : \
+           (long)va_arg(ap, int))
+#define        UARG() \
+       (flags&MAXINT ? va_arg(ap, unsigned long long) : \
+           flags&PTRINT ? va_arg(ap, unsigned long) : \
+           flags&SIZEINT ? va_arg(ap, unsigned long) : \
+           flags&QUADINT ? va_arg(ap, unsigned long long) : \
+           flags&LONGINT ? va_arg(ap, unsigned long) : \
+           flags&SHORTINT ? (unsigned long)(unsigned long)va_arg(ap, int) : \
+           (unsigned long)va_arg(ap, unsigned int))
+
+#define KPRINTF_PUTCHAR(C) {                                           \
+       if (oflags == TOBUFONLY) {                                      \
+               if (sbuf && ((vp == NULL) || (sbuf < tailp)))           \
+                       *sbuf++ = (C);                                  \
+       } else {                                                        \
+               cons_putchar((C), oflags);                              \
+       }                                                               \
+}
+
+/*
+ * Guts of kernel printf.  Note, we already expect to be in a mutex!
+ */
+static int
+kprintf(const char *fmt0, int oflags, void *vp, char *sbuf, va_list ap)
+{
+       int ret = 0;            /* return value accumulator */
+       const char *fmt;        /* format string */
+       int ch;                 /* character from fmt */
+       int n;                  /* handy integer (short term usage) */
+       char *cp;               /* handy char pointer (short term usage) */
+       int flags;              /* flags as above */
+       int width;              /* width from format (%8d), or 0 */
+       int prec;               /* precision from format (%.3d), or -1 */
+       char sign;              /* sign prefix (' ', '+', '-', or \0) */
+
+       unsigned long long _uquad; /* integer arguments %[diouxX] */
+       enum { OCT, DEC, HEX } base;/* base for [diouxX] conversion */
+       int dprec;              /* a copy of prec if [diouxX], 0 otherwise */
+       int realsz;             /* field size expanded by dprec */
+       int size;               /* size of converted field or string */
+       const char *xdigs;      /* digits for [xX] conversion */
+       char bf[KPRINTF_BUFSIZE]; /* space for %c, %[diouxX] */
+       char *tailp;            /* tail pointer for snprintf */
+
+       if (oflags == TOBUFONLY && (vp != NULL))
+               tailp = *(char **)vp;
+       else
+               tailp = NULL;
+
+       cp = NULL;      /* XXX: shutup gcc */
+       size = 0;       /* XXX: shutup gcc */
+
+       fmt = fmt0;
+       ret = 0;
+
+       xdigs = NULL;           /* XXX: shut up gcc warning */
+
+       /*
+        * Scan the format for conversions (`%' character).
+        */
+       for (;;) {
+               for (; *fmt != '%' && *fmt; fmt++) {
+                       ret++;
+                       KPRINTF_PUTCHAR(*fmt);
+               }
+               if (*fmt == 0)
+                       goto done;
+
+               fmt++;          /* skip over '%' */
+
+               flags = 0;
+               dprec = 0;
+               width = 0;
+               prec = -1;
+               sign = '\0';
+
+rflag:         ch = *fmt++;
+reswitch:      switch (ch) {
+               case ' ':
+                       /*
+                        * ``If the space and + flags both appear, the space
+                        * flag will be ignored.''
+                        *      -- ANSI X3J11
+                        */
+                       if (!sign)
+                               sign = ' ';
+                       goto rflag;
+               case '#':
+                       flags |= ALT;
+                       goto rflag;
+               case '*':
+                       /*
+                        * ``A negative field width argument is taken as a
+                        * - flag followed by a positive field width.''
+                        *      -- ANSI X3J11
+                        * They don't exclude field widths read from args.
+                        */
+                       if ((width = va_arg(ap, int)) >= 0)
+                               goto rflag;
+                       width = -width;
+                       /* FALLTHROUGH */
+               case '-':
+                       flags |= LADJUST;
+                       goto rflag;
+               case '+':
+                       sign = '+';
+                       goto rflag;
+               case '.':
+                       if ((ch = *fmt++) == '*') {
+                               n = va_arg(ap, int);
+                               prec = n < 0 ? -1 : n;
+                               goto rflag;
+                       }
+                       n = 0;
+                       while (is_digit(ch)) {
+                               n = 10 * n + to_digit(ch);
+                               ch = *fmt++;
+                       }
+                       prec = n < 0 ? -1 : n;
+                       goto reswitch;
+               case '0':
+                       /*
+                        * ``Note that 0 is taken as a flag, not as the
+                        * beginning of a field width.''
+                        *      -- ANSI X3J11
+                        */
+                       flags |= ZEROPAD;
+                       goto rflag;
+               case '1': case '2': case '3': case '4':
+               case '5': case '6': case '7': case '8': case '9':
+                       n = 0;
+                       do {
+                               n = 10 * n + to_digit(ch);
+                               ch = *fmt++;
+                       } while (is_digit(ch));
+                       width = n;
+                       goto reswitch;
+               case 'h':
+                       flags |= SHORTINT;
+                       goto rflag;
+               case 'j':
+                       flags |= MAXINT;
+                       goto rflag;
+               case 'l':
+                       if (*fmt == 'l') {
+                               fmt++;
+                               flags |= QUADINT;
+                       } else {
+                               flags |= LONGINT;
+                       }
+                       goto rflag;
+               case 'q':
+                       flags |= QUADINT;
+                       goto rflag;
+               case 't':
+                       flags |= PTRINT;
+                       goto rflag;
+               case 'z':
+                       flags |= SIZEINT;
+                       goto rflag;
+               case 'c':
+                       *(cp = bf) = va_arg(ap, int);
+                       size = 1;
+                       sign = '\0';
+                       break;
+               case 'D':
+                       flags |= LONGINT;
+                       /*FALLTHROUGH*/
+               case 'd':
+               case 'i':
+                       _uquad = SARG();
+                       if ((long long)_uquad < 0) {
+                               _uquad = -_uquad;
+                               sign = '-';
+                       }
+                       base = DEC;
+                       goto number;
+               case 'n':
+                       if (flags & MAXINT)
+                               *va_arg(ap, long long *) = ret;
+                       else if (flags & PTRINT)
+                               *va_arg(ap, long *) = ret;
+                       else if (flags & SIZEINT)
+                               *va_arg(ap, long *) = ret;
+                       else if (flags & QUADINT)
+                               *va_arg(ap, long long *) = ret;
+                       else if (flags & LONGINT)
+                               *va_arg(ap, long *) = ret;
+                       else if (flags & SHORTINT)
+                               *va_arg(ap, short *) = ret;
+                       else
+                               *va_arg(ap, int *) = ret;
+                       continue;       /* no output */
+               case 'O':
+                       flags |= LONGINT;
+                       /*FALLTHROUGH*/
+               case 'o':
+                       _uquad = UARG();
+                       base = OCT;
+                       goto nosign;
+               case 'p':
+                       /*
+                        * ``The argument shall be a pointer to void.  The
+                        * value of the pointer is converted to a sequence
+                        * of printable characters, in an implementation-
+                        * defined manner.''
+                        *      -- ANSI X3J11
+                        */
+                       /* NOSTRICT */
+                       _uquad = (unsigned long)va_arg(ap, void *);
+                       base = HEX;
+                       xdigs = hexdigits;
+                       flags |= HEXPREFIX;
+                       ch = 'x';
+                       goto nosign;
+               case 's':
+                       if ((cp = va_arg(ap, char *)) == NULL)
+                               /*XXXUNCONST*/
+                               cp = __UNCONST("(null)");
+                       if (prec >= 0) {
+                               /*
+                                * can't use strlen; can only look for the
+                                * NUL in the first `prec' characters, and
+                                * strlen() will go further.
+                                */
+                               char *p = bmk_memchr(cp, 0, prec);
+
+                               if (p != NULL) {
+                                       size = p - cp;
+                                       if (size > prec)
+                                               size = prec;
+                               } else
+                                       size = prec;
+                       } else
+                               size = bmk_strlen(cp);
+                       sign = '\0';
+                       break;
+               case 'U':
+                       flags |= LONGINT;
+                       /*FALLTHROUGH*/
+               case 'u':
+                       _uquad = UARG();
+                       base = DEC;
+                       goto nosign;
+               case 'X':
+                       xdigs = HEXDIGITS;
+                       goto hex;
+               case 'x':
+                       xdigs = hexdigits;
+hex:                   _uquad = UARG();
+                       base = HEX;
+                       /* leading 0x/X only if non-zero */
+                       if (flags & ALT && _uquad != 0)
+                               flags |= HEXPREFIX;
+
+                       /* unsigned conversions */
+nosign:                        sign = '\0';
+                       /*
+                        * ``... diouXx conversions ... if a precision is
+                        * specified, the 0 flag will be ignored.''
+                        *      -- ANSI X3J11
+                        */
+number:                        if ((dprec = prec) >= 0)
+                               flags &= ~ZEROPAD;
+
+                       /*
+                        * ``The result of converting a zero value with an
+                        * explicit precision of zero is no characters.''
+                        *      -- ANSI X3J11
+                        */
+                       cp = bf + KPRINTF_BUFSIZE;
+                       if (_uquad != 0 || prec != 0) {
+                               /*
+                                * Unsigned mod is hard, and unsigned mod
+                                * by a constant is easier than that by
+                                * a variable; hence this switch.
+                                */
+                               switch (base) {
+                               case OCT:
+                                       do {
+                                               *--cp = to_char(_uquad & 7);
+                                               _uquad >>= 3;
+                                       } while (_uquad);
+                                       /* handle octal leading 0 */
+                                       if (flags & ALT && *cp != '0')
+                                               *--cp = '0';
+                                       break;
+
+                               case DEC:
+                                       /* many numbers are 1 digit */
+                                       while (_uquad >= 10) {
+                                               *--cp = to_char(_uquad % 10);
+                                               _uquad /= 10;
+                                       }
+                                       *--cp = to_char(_uquad);
+                                       break;
+
+                               case HEX:
+                                       do {
+                                               *--cp = xdigs[_uquad & 15];
+                                               _uquad >>= 4;
+                                       } while (_uquad);
+                                       break;
+
+                               default:
+                                       /*XXXUNCONST*/
+                                       cp = __UNCONST("bug in kprintf: bad base");
+                                       size = bmk_strlen(cp);
+                                       goto skipsize;
+                               }
+                       }
+                       size = bf + KPRINTF_BUFSIZE - cp;
+               skipsize:
+                       break;
+               default:        /* "%?" prints ?, unless ? is NUL */
+                       if (ch == '\0')
+                               goto done;
+                       /* pretend it was %c with argument ch */
+                       cp = bf;
+                       *cp = ch;
+                       size = 1;
+                       sign = '\0';
+                       break;
+               }
+
+               /*
+                * All reasonable formats wind up here.  At this point, `cp'
+                * points to a string which (if not flags&LADJUST) should be
+                * padded out to `width' places.  If flags&ZEROPAD, it should
+                * first be prefixed by any sign or other prefix; otherwise,
+                * it should be blank padded before the prefix is emitted.
+                * After any left-hand padding and prefixing, emit zeroes
+                * required by a decimal [diouxX] precision, then print the
+                * string proper, then emit zeroes required by any leftover
+                * floating precision; finally, if LADJUST, pad with blanks.
+                *
+                * Compute actual size, so we know how much to pad.
+                * size excludes decimal prec; realsz includes it.
+                */
+               realsz = dprec > size ? dprec : size;
+               if (sign)
+                       realsz++;
+               else if (flags & HEXPREFIX)
+                       realsz+= 2;
+
+               /* adjust ret */
+               ret += width > realsz ? width : realsz;
+
+               /* right-adjusting blank padding */
+               if ((flags & (LADJUST|ZEROPAD)) == 0) {
+                       n = width - realsz;
+                       while (n-- > 0)
+                               KPRINTF_PUTCHAR(' ');
+               }
+
+               /* prefix */
+               if (sign) {
+                       KPRINTF_PUTCHAR(sign);
+               } else if (flags & HEXPREFIX) {
+                       KPRINTF_PUTCHAR('0');
+                       KPRINTF_PUTCHAR(ch);
+               }
+
+               /* right-adjusting zero padding */
+               if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD) {
+                       n = width - realsz;
+                       while (n-- > 0)
+                               KPRINTF_PUTCHAR('0');
+               }
+
+               /* leading zeroes from decimal precision */
+               n = dprec - size;
+               while (n-- > 0)
+                       KPRINTF_PUTCHAR('0');
+
+               /* the string or number proper */
+               for (; size--; cp++)
+                       KPRINTF_PUTCHAR(*cp);
+               /* left-adjusting padding (always blank) */
+               if (flags & LADJUST) {
+                       n = width - realsz;
+                       while (n-- > 0)
+                               KPRINTF_PUTCHAR(' ');
+               }
+       }
+
+done:
+       if ((oflags == TOBUFONLY) && (vp != NULL))
+               *(char **)vp = sbuf;
+       (*v_flush)();
+
+       return ret;
+}