diff --git a/src/bin/init/main.c b/src/bin/init/main.c index e5bb732..ee7aa62 100755 --- a/src/bin/init/main.c +++ b/src/bin/init/main.c @@ -32,9 +32,9 @@ exit(1); } printf("Initializing system.\n"); - exec("shell"); + //exec("shell"); while(1) { - printf("."); + //printf("."); } exit(1); } \ No newline at end of file diff --git a/src/bin/shell/main.c b/src/bin/shell/main.c index 945511e..4154a09 100755 --- a/src/bin/shell/main.c +++ b/src/bin/shell/main.c @@ -18,7 +18,6 @@ } int main() { - while (1) { - printf("Fucken A\n"); - } + printf("Initializing System.\n"); + while (1); } \ No newline at end of file diff --git a/src/sys/graphics/objfont.cpp b/src/sys/graphics/objfont.cpp index f3f9db0..d2febfc 100755 --- a/src/sys/graphics/objfont.cpp +++ b/src/sys/graphics/objfont.cpp @@ -105,7 +105,7 @@ while (*TextString) { ch = *TextString; if ((CharWidthTable[ch]) && (ch!=' ')) { - offset=FontData+FontDataIdx[ch]; + offset=(FontData+((char)FontDataIdx[ch])); for (yy=0; yy<=CharHeightTable[ch]-1; yy++) for (xx=0; xx<=CharWidthTable[ch]-1; xx++) { pix = (UInt8)*offset; diff --git a/src/sys/include/stdarg.h b/src/sys/include/stdarg.h index 0dd6aaf..26c5633 100755 --- a/src/sys/include/stdarg.h +++ b/src/sys/include/stdarg.h @@ -11,8 +11,8 @@ typedef char *vaList; #define _vaSize(TYPE) (((sizeof(TYPE) + sizeof(int) -1) / sizeof(int)) * sizeof(int)) -#define va_start(AP, LASTARG) (AP=((vaList)&(LASTARG) + _vaSize(LASTARG))) -#define va_end(AP) -#define va_arg(AP, TYPE) (AP += _vaSize(TYPE), *((TYPE *)(AP - _vaSize(TYPE)))) +#define vaStart(AP, LASTARG) (AP=((vaList)&(LASTARG) + _vaSize(LASTARG))) +#define vaEnd(AP) +#define vaArg(AP, TYPE) (AP += _vaSize(TYPE), *((TYPE *)(AP - _vaSize(TYPE)))) #endif \ No newline at end of file diff --git a/src/sys/init/main.c b/src/sys/init/main.c index d2f7e80..3c0346e 100755 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -61,15 +61,6 @@ while(1); } -int test() { -// disableIrq(0); -// execFile("shell"); -// enableIrq(0); - while (1) { - kprintf("Kernel Test Thread\n"); - } - } - int main() { clearScreen(); outputVersion(); //Display Version Info @@ -81,9 +72,8 @@ initScheduler(); //Initialize Scheduler initFloppy(); //Initialize Floppy Controller initUbixFS(); - execThread(idleThread,0xBFFF,"Idle Thread"); - execThread(test,0xAFFF,"test"); - execFile("shell"); + execThread(idleThread,0xAFFF,"Idle Thread"); + execFile("init"); //execThread(test,0xCFFF,"Test"); /* while(1) { diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index 4c5c18b..de61763 100755 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -22,20 +22,17 @@ char *newLoc; elfHeader *binaryHeader = (elfHeader *)0x7C0000; elfProgramheader *programHeader; - kprintf("Test [%s]",file); fd = fopen(file,1); - kprintf("Test2"); for (i=0;feof(fd) == 0;i++) { binarySpace[i] = fgetc(fd); } - kprintf("Test4"); programHeader = (elfProgramheader *)(0x7C0000 + binaryHeader->ePhoff); newLoc = (char *)programHeader->phVaddr; for (x=0;xeEntry; - execThread((void *)eStart,0xCFFF,file); + execThread((void *)eStart,0xBFFF,file); return(0); } diff --git a/src/sys/kernel/idlethread.c b/src/sys/kernel/idlethread.c index fb76eeb..87f4172 100755 --- a/src/sys/kernel/idlethread.c +++ b/src/sys/kernel/idlethread.c @@ -11,7 +11,6 @@ void idleThread() { /* This thread is for maintinance */ while (1) { - kprintf("Testing\n"); //checkTasks(); /* Looks for run away proccesses and kills thems */ } } \ No newline at end of file diff --git a/src/sys/kernel/kprintf.c b/src/sys/kernel/kprintf.c index 67fcd92..549eb2a 100755 --- a/src/sys/kernel/kprintf.c +++ b/src/sys/kernel/kprintf.c @@ -8,15 +8,13 @@ #include #include -int vsprintf(char *buf, const char *fmt, vaList args); - int kprintf(const char *fmt, ...) { vaList args; int i; char buf[1024]; - va_start(args, fmt); + vaStart(args, fmt); i=vsprintf(buf,fmt,args); - va_end(args); + vaEnd(args); kprint(buf); printColor = defaultColor; return(i); @@ -25,8 +23,8 @@ int sprintf(char *buf,const char *fmt, ...) { vaList args; int i; - va_start(args, fmt); + vaStart(args, fmt); i=vsprintf(buf,fmt,args); - va_end(args); + vaEnd(args); return(i); } \ No newline at end of file diff --git a/src/sys/kernel/vsprintf.c b/src/sys/kernel/vsprintf.c index 21bdb92..0562998 100755 --- a/src/sys/kernel/vsprintf.c +++ b/src/sys/kernel/vsprintf.c @@ -1,240 +1,31 @@ /************************************************************************************** -$Id$ + Copyright (c) 2002 + The UbixOS Project - + $Id$ **************************************************************************************/ -/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ -/* - * Wirzenius wrote this portably, Torvalds fucked it up :-) - */ - #include -#include -//#include -/* we use this so that we can do without the ctype library */ -#define is_digit(c) ((c) >= '0' && (c) <= '9') - -static int skip_atoi(const char **s) -{ - int i=0; - - while (is_digit(**s)) - i = i*10 + *((*s)++) - '0'; - return i; -} - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define SMALL 64 /* use 'abcdef' instead of 'ABCDEF' */ - -#define do_div(n,base) ({ \ -int __res; \ -__asm__("divl %4":"=a" (n),"=d" (__res):"0" (n),"1" (0),"r" (base)); \ -__res; }) - -static char * number(char * str, int num, int base, int size, int precision - ,int type) -{ - char c,sign,tmp[36]; - const char *digits="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int i; - - if (type&SMALL) digits="0123456789abcdefghijklmnopqrstuvwxyz"; - if (type&LEFT) type &= ~ZEROPAD; - if (base<2 || base>36) - return 0; - c = (type & ZEROPAD) ? '0' : ' ' ; - if (type&SIGN && num<0) { - sign='-'; - num = -num; - } else - sign=(type&PLUS) ? '+' : ((type&SPACE) ? ' ' : 0); - if (sign) size--; - if (type&SPECIAL) { - if (base==16) size -= 2; - else if (base==8) size--; - } - i=0; - if (num==0) - tmp[i++]='0'; - else while (num!=0) - tmp[i++]=digits[do_div(num,base)]; - if (i>precision) precision=i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - *str++ = ' '; - if (sign) - *str++ = sign; - if (type&SPECIAL) { - if (base==8) - *str++ = '0'; - else if (base==16) { - *str++ = '0'; - *str++ = digits[33]; - } - } - if (!(type&LEFT)) - while(size-->0) - *str++ = c; - while(i0) - *str++ = tmp[i]; - while(size-->0) - *str++ = ' '; - return str; -} - -int vsprintf(char *buf, const char *fmt, vaList args) -{ - int len; - int i; - char * str; - char *s; - int *ip; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier; /* 'h', 'l', or 'L' for integer fields */ - for (str=buf ; *fmt ; ++fmt) { - if (*fmt != '%') { - *str++ = *fmt; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case '-': flags |= LEFT; goto repeat; - case '+': flags |= PLUS; goto repeat; - case ' ': flags |= SPACE; goto repeat; - case '#': flags |= SPECIAL; goto repeat; - case '0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (is_digit(*fmt)) - field_width = skip_atoi(&fmt); - else if (*fmt == '*') { - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == '.') { - ++fmt; - if (is_digit(*fmt)) - precision = skip_atoi(&fmt); - else if (*fmt == '*') { - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = -1; - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L') { - qualifier = *fmt; - ++fmt; - } - - switch (*fmt) { - case 'c': - if (!(flags & LEFT)) - while (--field_width > 0) - *str++ = ' '; - *str++ = (unsigned char) va_arg(args, int); - while (--field_width > 0) - *str++ = ' '; - break; - - case 's': - s = va_arg(args, char *); - len = strlen(s); - if (precision < 0) - precision = len; - else if (len > precision) - len = precision; - - if (!(flags & LEFT)) - while (len < field_width--) - *str++ = ' '; - for (i = 0; i < len; ++i) - *str++ = *s++; - while (len < field_width--) - *str++ = ' '; - break; - - case 'o': - str = number(str, va_arg(args, unsigned long), 8, - field_width, precision, flags); - break; - - case 'p': - if (field_width == -1) { - field_width = 8; - flags |= ZEROPAD; - } - str = number(str, - (unsigned long) va_arg(args, void *), 16, - field_width, precision, flags); - break; - - case 'x': - flags |= SMALL; - case 'X': - str = number(str, va_arg(args, unsigned long), 16, - field_width, precision, flags); - break; - - case 'd': - case 'i': - flags |= SIGN; - case 'u': - str = number(str, va_arg(args, unsigned long), 10, - field_width, precision, flags); - break; - - case 'n': - ip = va_arg(args, int *); - *ip = (str - buf); - break; - - //Font Color Added By Ubu - case 'z': - printColor = va_arg(args, int); - break; - - default: - if (*fmt != '%') - *str++ = '%'; - if (*fmt) - *str++ = *fmt; - else - --fmt; - break; - } - } - *str = '\0'; - return str-buf; -} +int vsprintf(char *buffer, const char *format, vaList args) { + int length, x,intVal; + char *outputString, *string; + for (outputString=buffer;*format;format++) { + if (*format != '%') { + *outputString++ = *format; + } + else { + format++; + switch (*format) { + case 's': + string = vaArg(args, char *); + length = strlen(string); + for (x=0; x