alloc tables at boot time version

[unix-history] / usr / src / sys / kern / subr_prf.c

diff --git a/usr/src/sys/kern/subr_prf.c b/usr/src/sys/kern/subr_prf.c
index 180f7d5..cb390fa 100644 (file)
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/*     subr_prf.c      4.6     %G%     */
+/*     subr_prf.c      4.10    %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -13,14 +13,6 @@
 #include "../h/user.h"
 #include "../h/tty.h"
 
 #include "../h/user.h"
 #include "../h/tty.h"
 

-#ifdef TRACE
-#define        TRCBUFS 4096
-char   trcbuf[TRCBUFS];
-char   *trcbufp = trcbuf;
-int    trcwrap;
-int    trcprt = TRCBUFS;
-#endif
-

 /*
  * In case console is off,
  * panicstr contains argument to last
 /*
  * In case console is off,
  * panicstr contains argument to last


@@ -48,82 +40,110 @@ unsigned x1;
        prf(fmt, &x1, 0);
 }
 
        prf(fmt, &x1, 0);
 }
 

-#ifdef TRACE
-trace(fmt, x1)
-register char *fmt;
-unsigned x1;
+/*
+ * print to the current users terminal,
+ * guarantee not to sleep (so can be called by intr routine)
+ * no watermark checking - so no verbose messages
+ */
+/*VARARGS1*/
+uprintf(fmt, x1)
+       char    *fmt;
+       unsigned x1;

 {
 
 {
 

-       prf(fmt, &x1, 1);
+       prf(fmt, &x1, 2);

 }
 
 }
 

-#endif
-
-prf(fmt, adx, trace)
+/* THIS CODE IS VAX DEPENDENT */
+prf(fmt, adx, touser)

 register char *fmt;
 register char *fmt;

-register unsigned int *adx;
+register u_int *adx;

 {
 {

-       register c;
+       register int b, c, i;

        char *s;
        char *s;

+       int any;

 
 loop:
 
 loop:

-       while((c = *fmt++) != '%') {
+       while ((c = *fmt++) != '%') {

                if(c == '\0')
                        return;
                if(c == '\0')
                        return;

-               putchar(c, trace);
+               putchar(c, touser);

        }
        }

+again:

        c = *fmt++;
        c = *fmt++;

-       if (c == 'X')
-               printx((long)*adx, trace);
-       else if (c == 'd' || c == 'u' || c == 'o' || c == 'x')
-               printn((long)*adx, c=='o'? 8: (c=='x'? 16:10), trace);
-       else if (c == 's') {
+       switch (c) {
+
+       case 'l':
+               goto again;
+       case 'x': case 'X':
+               b = 16;
+               goto number;
+       case 'd': case 'D':
+       case 'u':               /* what a joke */
+               b = 10;
+               goto number;
+       case 'o': case 'O':
+               b = 8;
+number:
+               printn(*adx, b, touser);
+               break;
+       case 'c':
+               b = *adx;
+               for (i = 24; i >= 0; i -= 8)
+                       if (c = (b >> i) & 0x7f)
+                               putchar(c, touser);
+               break;
+       case 'b':
+               b = *adx++;
+               s = (char *)*adx;
+               printn(b, *s++, touser);
+               any = 0;
+               if (b) {
+                       putchar('<', touser);
+                       while (i = *s++) {
+                               if (b & (1 << (i-1))) {
+                                       if (any)
+                                               putchar(',', touser);
+                                       any = 1;
+                                       for (; (c = *s) > 32; s++)
+                                               putchar(c, touser);
+                               } else
+                                       for (; *s > 32; s++)
+                                               ;
+                       }
+                       putchar('>', touser);
+               }
+               break;
+
+       case 's':

                s = (char *)*adx;
                while (c = *s++)
                s = (char *)*adx;
                while (c = *s++)

-#ifdef TRACE
-                       if (trace == 1) {
-                               *trcbufp++ = c;
-                               if (trcbufp >= &trcbuf[TRCBUFS]) {
-                                       trcbufp = trcbuf;
-                                       trcwrap = 1;
-                               }
-                       } else
-#endif
-                               putchar(c, trace);
-       } else if (c == 'D') {
-               printn(*(long *)adx, 10, trace);
-               adx += (sizeof(long) / sizeof(int)) - 1;
+                       putchar(c, touser);
+               break;

        }
        adx++;
        goto loop;
 }
        }
        adx++;
        goto loop;
 }

+/* END VAX DEPENDENT CODE */

 
 

-printx(x, trace)
-long x;
-{
-       int i;
-
-       for (i = 0; i < 8; i++)
-               putchar("0123456789ABCDEF"[(x>>((7-i)*4))&0xf], trace);
-}
-
-/*
- * Print an integer in base b.  If the base is ten it is condidered a
- * signed integer otherwise it is treated as unsigned.
- */
-printn(n, b, trace)
-unsigned long n;
+printn(n, b, touser)
+       unsigned long n;

 {
 {

-       register unsigned long a;
-       register long a1 = n;
+       char prbuf[11];
+       register char *cp;

 
 

-       if (b == 10 && a1 < 0) {
-               putchar('-', trace);
-               n = -a1;
+       if (b == 10 && (int)n < 0) {
+               putchar('-', touser);
+               n = (unsigned)(-(int)n);

        }
        }

-       if(a = n/b)
-               printn(a, b, trace);
-       putchar("0123456789ABCDEF"[(int)(n%b)], trace);
+       cp = prbuf;
+       do {
+               *cp++ = "0123456789abcdef"[n%b];
+               n /= b;
+       } while (n);
+       do
+               putchar(*--cp, touser);
+       while (cp > prbuf);

 }
 
 /*
 }
 
 /*


@@ -133,6 +153,7 @@ unsigned long n;
 panic(s)
 char *s;
 {
 panic(s)
 char *s;
 {

+

        panicstr = s;
        printf("panic: %s\n", s);
        (void) spl0();
        panicstr = s;
        printf("panic: %s\n", s);
        (void) spl0();


@@ -147,93 +168,43 @@ char *s;
  * the device argument.
  */
 prdev(str, dev)
  * the device argument.
  */
 prdev(str, dev)

-char *str;
-dev_t dev;
+       char *str;
+       dev_t dev;

 {
 
 {
 

-       printf("%s on dev %u/%u\n", str, major(dev), minor(dev));
+       printf("%s on dev %d/%d\n", str, major(dev), minor(dev));

 }
 
 }
 

-/*
- * deverr prints a diagnostic from
- * a device driver.
- * It prints the device, block number,
- * and an octal word (usually some error
- * status register) passed as argument.
- */
-deverror(bp, o1, o2)
-register struct buf *bp;
+harderr(bp)
+       struct buf *bp;

 {
 
 {
 

-       printf("bn=%d er=%x,%x", bp->b_blkno, o1,o2);
-       prdev("", bp->b_dev);
+       printf("hard err bn %d ", bp->b_blkno);

 }
 }

-
-#ifdef TRACE
-dumptrc()
-{
-       register char *cp;
-       register int pos, nch;
-
-       nch = trcprt;
-       if (nch < 0 || nch > TRCBUFS)
-               nch = TRCBUFS;
-       pos = (trcbufp - trcbuf) - nch;
-       if (pos < 0)
-               if (trcwrap)
-                       pos += TRCBUFS;
-               else {
-                       nch += pos;
-                       pos = 0;
-               }
-       for (cp = &trcbuf[pos]; nch > 0; nch--) {
-               putchar(*cp++, 0);
-               if (cp >= &trcbuf[TRCBUFS])
-                       cp = trcbuf;
-       }
-}
-#else
-/*ARGSUSED*/
-dumptrc(nch)
-       int nch;
-{
-
-}
-#endif
-

 /*
 /*

- * Print a character on console or in internal trace buffer.
+ * Print a character on console or users terminal.

  * If destination is console then the last MSGBUFS characters
  * are saved in msgbuf for inspection later.
  */
 /*ARGSUSED*/
  * If destination is console then the last MSGBUFS characters
  * are saved in msgbuf for inspection later.
  */
 /*ARGSUSED*/

-putchar(c, trace)
-register c;
+putchar(c, touser)
+       register int c;

 {
 
 {
 

-       if (trace == 2) {
-               register struct tty *tp;
-               register s;
+       if (touser) {
+               register struct tty *tp = u.u_ttyp;

 
 

-               if ((tp = u.u_ttyp) && (tp->t_state&CARR_ON)) {
-                       s = spl7();
+               if (tp && (tp->t_state&CARR_ON)) {
+                       register s = spl6();
+                       if (c == '\n')
+                               ttyoutput('\r', tp);

                        ttyoutput(c, tp);
                        ttstart(tp);
                        splx(s);
                }
                return;
        }
                        ttyoutput(c, tp);
                        ttstart(tp);
                        splx(s);
                }
                return;
        }

-#ifdef TRACE
-       if (trace) {
-               *trcbufp++ = c;
-               if (trcbufp >= &trcbuf[TRCBUFS]) {
-                       trcbufp = trcbuf;
-                       trcwrap = 1;
-               }
-               return;
-       }
-#endif
-       if (c != '\0' && c != '\r' && c != 0177) {
+       if (c != '\0' && c != '\r' && c != 0177 && mfpr(MAPEN)) {

                if (msgbuf.msg_magic != MSG_MAGIC) {
                        msgbuf.msg_bufx = 0;
                        msgbuf.msg_magic = MSG_MAGIC;
                if (msgbuf.msg_magic != MSG_MAGIC) {
                        msgbuf.msg_bufx = 0;
                        msgbuf.msg_magic = MSG_MAGIC;


@@ -246,17 +217,3 @@ register c;
                return;
        cnputc(c);
 }
                return;
        cnputc(c);
 }

-
-/*
- * print to the current users terminal,
- * guarantee not to sleep (so can be called by intr routine)
- * no watermark checking - so no verbose messages
- */
-
-/*VARARGS1*/
-uprintf(fmt, x1)
-char   *fmt;
-unsigned x1;
-{
-       prf(fmt, &x1, 2);
-}