2 files changed, 16 insertions, 138 deletions
diff --git a/libc/bios/bios.c b/libc/bios/bios.c
index 402f689..e0e5c23 100644
--- a/libc/bios/bios.c
+++ b/libc/bios/bios.c
@@ -33,12 +33,22 @@ loop_save:
   .text
 export ___cstartup	! Crt0 startup
 ___cstartup:
-  mov	___argr+0,ax
-  mov	___argr+2,bx
-  mov	___argr+4,cx
-  mov	___argr+6,dx
-  mov	___argr+8,si
-  mov	___argr+10,di
+  cli
+  mov	sp,cs
+  add   sp,#__segoff
+  mov	ds,sp
+  mov	ss,sp
+  mov	sp,#___argr+12
+  push	di
+  push	si
+  push	dx
+  push	cx
+  push	bx
+  push	ax
+  xor	bp,bp
+  mov	sp,bp
+  push	bp
+  sti
 
 zap_bss:		! Clear the BSS
   mov	ax,ds
diff --git a/libc/bios/cprintf.c b/libc/bios/cprintf.c
deleted file mode 100644
index cd5f62b..0000000
--- a/libc/bios/cprintf.c
+++ /dev/null
@@ -1,132 +0,0 @@
-
-#include <stdarg.h>
-#define wchar(ch) putch(ch)
-
-cprintf(char * fmt, va_list ap)
-{
-   register int c;
-   int count = 0;
-   int type, base;
-   long val;
-   char * cp;
-   char padch=' ';
-   int  minsize = 0;
-
-   while(c=*fmt++)
-   {
-      if(c!='%')
-      {
-	 wchar(c);
-	 count++;
-      }
-      else
-      {
-	 type=1;
-	 do { c=*fmt++; } while( c>='0' && c<='9');
-
-	 padch = *fmt;
-	 minsize=0;
-	 if(padch == '-') fmt++;
-
-	 for(;;)
-	 {
-	    c=*fmt++;
-	    if( c<'0' || c>'9' ) break;
-	    minsize*=10; minsize+=c-'0';
-	 }
-
-	 while( c=='.' || (c>='0' && c<='9')) { c=*fmt++; }
-
-	 if( padch == '-' ) minsize = -minsize;
-	 else
-	 if( padch == '0' ) padch='0'; else padch=' ';
-
-	 if( c == 0 ) break;
-	 if(c=='h')
-	 {
-	    c=*fmt++;
-	    type = 0;
-	 }
-	 else if(c=='l')
-	 {
-	    c=*fmt++;
-	    type = 2;
-	 }
-
-	 switch(c)
-	 {
-	    case 'x': base=16; type|=4;   if(0) {
-	    case 'o': base= 8; type|=4; } if(0) {
-	    case 'u': base=10; type|=4; } if(0) {
-	    case 'd': base=10; }
-	       val=0;
-	       switch(type)
-	       {
-		  case 0: val=va_arg(ap, short); break; 
-		  case 1: val=va_arg(ap, int);   break;
-		  case 2: val=va_arg(ap, long);  break;
-		  case 4: val=va_arg(ap, unsigned short); break; 
-		  case 5: val=va_arg(ap, unsigned int);   break;
-		  case 6: val=va_arg(ap, unsigned long);  break;
-	       }
-	       cp = __numout(val,base);
-	       if(0) {
-	    case 's':
-	          cp=va_arg(ap, char *);
-	       }
-	       if( minsize > 0 )
-	       {
-		  minsize -= strlen(cp);
-		  while(minsize>0) { wchar(padch); minsize--; }
-		  minsize=0;
-	       }
-	       if( minsize < 0 ) minsize= -minsize-strlen(cp);
-	       while(*cp)
-		  wchar(*cp++);
-	       while(minsize>0) { wchar(' '); minsize--; }
-	       break;
-	    case 'c':
-	       wchar(va_arg(ap, int));
-	       break;
-	    default:
-	       wchar(c);
-	       break;
-	 }
-      }
-   }
-   return count;
-}
-
-
-
-static char nstring[]="0123456789ABCDEF";
-
-static unsigned char *
-__numout(long i, int base)
-{
-   static unsigned char out[16];
-   int n;
-   int flg = 0;
-   unsigned long val;
-
-   if (i<0 && base==10)
-   {
-      flg = 1;
-      i = -i;
-   }
-   val = i;
-
-   for (n = 0; n < 15; n++)
-      out[n] = ' ';
-   out[15] = '\0';
-   n = 14;
-   do
-   {
-      out[n] = nstring[val % base];
-      n--;
-      val /= base;
-   }
-   while(val);
-   if(flg) out[n--] = '-';
-   return &out[n+1];
-}