From 80447e5711461fa58cf61d17a6a1b79f7dcd5294 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Sat, 5 Mar 2016 14:34:18 -0800
Subject: Disentangle PK and BBL a bit

---
 pk/console.c | 96 +-----------------------------------------------------------
 1 file changed, 1 insertion(+), 95 deletions(-)

(limited to 'pk/console.c')

diff --git a/pk/console.c b/pk/console.c
index 097842b..de7f0a8 100644
--- a/pk/console.c
+++ b/pk/console.c
@@ -3,91 +3,6 @@
 #include "frontend.h"
 #include <stdint.h>
 #include <stdarg.h>
-#include <stdbool.h>
-#include <string.h>
-
-int vsnprintf(char* out, size_t n, const char* s, va_list vl)
-{
-  bool format = false;
-  bool longarg = false;
-  size_t pos = 0;
-  for( ; *s; s++)
-  {
-    if(format)
-    {
-      switch(*s)
-      {
-        case 'l':
-          longarg = true;
-          break;
-        case 'p':
-          longarg = true;
-          if (++pos < n) out[pos-1] = '0';
-          if (++pos < n) out[pos-1] = 'x';
-        case 'x':
-        {
-          long num = longarg ? va_arg(vl, long) : va_arg(vl, int);
-          for(int i = 2*(longarg ? sizeof(long) : sizeof(int))-1; i >= 0; i--) {
-            int d = (num >> (4*i)) & 0xF;
-            if (++pos < n) out[pos-1] = (d < 10 ? '0'+d : 'a'+d-10);
-          }
-          longarg = false;
-          format = false;
-          break;
-        }
-        case 'd':
-        {
-          long num = longarg ? va_arg(vl, long) : va_arg(vl, int);
-          if (num < 0) {
-            num = -num;
-            if (++pos < n) out[pos-1] = '-';
-          }
-          long digits = 1;
-          for (long nn = num; nn /= 10; digits++)
-            ;
-          for (int i = digits-1; i >= 0; i--) {
-            if (pos + i + 1 < n) out[pos + i] = '0' + (num % 10);
-            num /= 10;
-          }
-          pos += digits;
-          longarg = false;
-          format = false;
-          break;
-        }
-        case 's':
-        {
-          const char* s2 = va_arg(vl, const char*);
-          while (*s2) {
-            if (++pos < n)
-              out[pos-1] = *s2;
-            s2++;
-          }
-          longarg = false;
-          format = false;
-          break;
-        }
-        case 'c':
-        {
-          if (++pos < n) out[pos-1] = (char)va_arg(vl,int);
-          longarg = false;
-          format = false;
-          break;
-        }
-        default:
-          panic("bad fmt");
-      }
-    }
-    else if(*s == '%')
-      format = true;
-    else
-      if (++pos < n) out[pos-1] = *s;
-  }
-  if (pos < n)
-    out[pos] = 0;
-  else if (n)
-    out[n-1] = 0;
-  return pos;
-}
 
 static void vprintk(const char* s, va_list vl)
 {
@@ -106,15 +21,6 @@ void printk(const char* s, ...)
   va_end(vl);
 }
 
-int snprintf(char* out, size_t n, const char* s, ...)
-{
-  va_list vl;
-  va_start(vl, s);
-  int res = vsnprintf(out, n, s, vl);
-  va_end(vl);
-  return res;
-}
-
 void dump_tf(trapframe_t* tf)
 {
   static const char* regnames[] = {
@@ -141,7 +47,7 @@ void do_panic(const char* s, ...)
   va_start(vl, s);
 
   vprintk(s, vl);
-  die(-1);
+  shutdown(-1);
 
   va_end(vl);
 }
-- 
cgit v1.1