X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdebug.c;h=6e7a0003d86ff5f5971010792233527a402ca9f0;hb=ad2ec62655e1d6eb8f2b4a4684eb5d7952aea0fb;hp=ac5c0597f9f97bc143e671448d3cff162ca410f6;hpb=b7d27cb988daadd457370e7e1a19aaec342e8415;p=tpg%2Facess2.git diff --git a/Kernel/debug.c b/Kernel/debug.c index ac5c0597..6e7a0003 100644 --- a/Kernel/debug.c +++ b/Kernel/debug.c @@ -7,88 +7,33 @@ #include #include -#define DEBUG_TO_E9 1 -#define DEBUG_TO_SERIAL 1 -#define SERIAL_PORT 0x3F8 -#define GDB_SERIAL_PORT 0x2F8 -#define DEBUG_USE_VSNPRINTF 0 #define DEBUG_MAX_LINE_LEN 256 +#define LOCK_DEBUG_OUTPUT 1 + // === IMPORTS === extern void Threads_Dump(void); extern void KernelPanic_SetMode(void); extern void KernelPanic_PutChar(char Ch); // === PROTOTYPES === - int putDebugChar(char ch); - int getDebugChar(void); static void Debug_Putchar(char ch); -static void Debug_Puts(int DbgOnly, char *Str); +static void Debug_Puts(int DbgOnly, const char *Str); +void Debug_DbgOnlyFmt(const char *format, va_list args); +void Debug_FmtS(const char *format, ...); void Debug_Fmt(const char *format, va_list args); +void Debug_SetKTerminal(const char *File); // === GLOBALS === int gDebug_Level = 0; int giDebug_KTerm = -1; - int gbDebug_SerialSetup = 0; - int gbGDB_SerialSetup = 0; int gbDebug_IsKPanic = 0; volatile int gbInPutChar = 0; +#if LOCK_DEBUG_OUTPUT +tShortSpinlock glDebug_Lock; +#endif // === CODE === -int putDebugChar(char ch) -{ - if(!gbGDB_SerialSetup) { - outb(GDB_SERIAL_PORT + 1, 0x00); // Disable all interrupts - outb(GDB_SERIAL_PORT + 3, 0x80); // Enable DLAB (set baud rate divisor) - outb(GDB_SERIAL_PORT + 0, 0x0C); // Set divisor to 12 (lo byte) 9600 baud - outb(GDB_SERIAL_PORT + 1, 0x00); // (base is (hi byte) - outb(GDB_SERIAL_PORT + 3, 0x03); // 8 bits, no parity, one stop bit (8N1) - outb(GDB_SERIAL_PORT + 2, 0xC7); // Enable FIFO with 14-byte threshold and clear it - outb(GDB_SERIAL_PORT + 4, 0x0B); // IRQs enabled, RTS/DSR set - gbDebug_SerialSetup = 1; - } - while( (inb(GDB_SERIAL_PORT + 5) & 0x20) == 0 ); - outb(GDB_SERIAL_PORT, ch); - return 0; -} -int getDebugChar(void) -{ - if(!gbGDB_SerialSetup) { - outb(GDB_SERIAL_PORT + 1, 0x00); // Disable all interrupts - outb(GDB_SERIAL_PORT + 3, 0x80); // Enable DLAB (set baud rate divisor) - outb(GDB_SERIAL_PORT + 0, 0x03); // Set divisor to 3 (lo byte) 38400 baud - outb(GDB_SERIAL_PORT + 1, 0x00); // (hi byte) - outb(GDB_SERIAL_PORT + 3, 0x03); // 8 bits, no parity, one stop bit - outb(GDB_SERIAL_PORT + 2, 0xC7); // Enable FIFO with 14-byte threshold and clear it - outb(GDB_SERIAL_PORT + 4, 0x0B); // IRQs enabled, RTS/DSR set - gbDebug_SerialSetup = 1; - } - while( (inb(GDB_SERIAL_PORT + 5) & 1) == 0) ; - return inb(GDB_SERIAL_PORT); -} - -static void Debug_PutCharDebug(char ch) -{ - #if DEBUG_TO_E9 - __asm__ __volatile__ ( "outb %%al, $0xe9" :: "a"(((Uint8)ch)) ); - #endif - - #if DEBUG_TO_SERIAL - if(!gbDebug_SerialSetup) { - outb(SERIAL_PORT + 1, 0x00); // Disable all interrupts - outb(SERIAL_PORT + 3, 0x80); // Enable DLAB (set baud rate divisor) - outb(SERIAL_PORT + 0, 0x03); // Set divisor to 3 (lo byte) 38400 baud - outb(SERIAL_PORT + 1, 0x00); // (hi byte) - outb(SERIAL_PORT + 3, 0x03); // 8 bits, no parity, one stop bit - outb(SERIAL_PORT + 2, 0xC7); // Enable FIFO with 14-byte threshold and clear it - outb(SERIAL_PORT + 4, 0x0B); // IRQs enabled, RTS/DSR set - gbDebug_SerialSetup = 1; - } - while( (inb(SERIAL_PORT + 5) & 0x20) == 0 ); - outb(SERIAL_PORT, ch); - #endif -} - static void Debug_Putchar(char ch) { Debug_PutCharDebug(ch); @@ -104,21 +49,21 @@ static void Debug_Putchar(char ch) KernelPanic_PutChar(ch); } -static void Debug_Puts(int UseKTerm, char *Str) +static void Debug_Puts(int UseKTerm, const char *Str) { int len = 0; - while( *Str ) - { - Debug_PutCharDebug( *Str ); - - if( gbDebug_IsKPanic ) - KernelPanic_PutChar(*Str); - len ++; - Str ++; - } - Str -= len; + Debug_PutStringDebug(Str); + + if( gbDebug_IsKPanic ) + { + for( len = 0; Str[len]; len ++ ) + KernelPanic_PutChar( Str[len] ); + } + else + for( len = 0; Str[len]; len ++ ); + // Output to the kernel terminal if( UseKTerm && !gbDebug_IsKPanic && giDebug_KTerm != -1) { if(gbInPutChar) return ; @@ -151,6 +96,14 @@ void Debug_Fmt(const char *format, va_list args) return ; } +void Debug_FmtS(const char *format, ...) +{ + va_list args; + va_start(args, format); + Debug_Fmt(format, args); + va_end(args); +} + void Debug_KernelPanic() { gbDebug_IsKPanic = 1; @@ -158,74 +111,117 @@ void Debug_KernelPanic() } /** - * \fn void LogF(char *Msg, ...) + * \fn void LogF(const char *Msg, ...) + * \brief Raw debug log (no new line, no prefix) */ -void LogF(char *Fmt, ...) +void LogF(const char *Fmt, ...) { va_list args; + #if LOCK_DEBUG_OUTPUT + SHORTLOCK(&glDebug_Lock); + #endif + va_start(args, Fmt); Debug_Fmt(Fmt, args); va_end(args); + + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif } /** - * \fn void Debug(char *Msg, ...) - * \brief Print only to the debug channel + * \fn void Debug(const char *Msg, ...) + * \brief Print only to the debug channel (not KTerm) */ -void Debug(char *Fmt, ...) +void Debug(const char *Fmt, ...) { va_list args; + + #if LOCK_DEBUG_OUTPUT + SHORTLOCK(&glDebug_Lock); + #endif Debug_Puts(0, "Debug: "); va_start(args, Fmt); Debug_DbgOnlyFmt(Fmt, args); va_end(args); + Debug_PutCharDebug('\r'); Debug_PutCharDebug('\n'); + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif } /** - * \fn void Log(char *Msg, ...) + * \fn void Log(const char *Msg, ...) */ -void Log(char *Fmt, ...) +void Log(const char *Fmt, ...) { va_list args; + + #if LOCK_DEBUG_OUTPUT + SHORTLOCK(&glDebug_Lock); + #endif Debug_Puts(1, "Log: "); va_start(args, Fmt); Debug_Fmt(Fmt, args); va_end(args); + Debug_Putchar('\r'); Debug_Putchar('\n'); + + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif } -void Warning(char *Fmt, ...) +void Warning(const char *Fmt, ...) { va_list args; + + #if LOCK_DEBUG_OUTPUT + SHORTLOCK(&glDebug_Lock); + #endif + Debug_Puts(1, "Warning: "); va_start(args, Fmt); Debug_Fmt(Fmt, args); va_end(args); + Debug_Putchar('\r'); Debug_Putchar('\n'); + + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif } -void Panic(char *Fmt, ...) +void Panic(const char *Fmt, ...) { va_list args; + #if LOCK_DEBUG_OUTPUT + SHORTLOCK(&glDebug_Lock); + #endif + // And never SHORTREL + Debug_KernelPanic(); Debug_Puts(1, "Panic: "); va_start(args, Fmt); Debug_Fmt(Fmt, args); va_end(args); + Debug_Putchar('\r'); Debug_Putchar('\n'); Threads_Dump(); - __asm__ __volatile__ ("xchg %bx, %bx"); - __asm__ __volatile__ ("cli;\n\thlt"); - for(;;) __asm__ __volatile__ ("hlt"); +// __asm__ __volatile__ ("xchg %bx, %bx"); +// __asm__ __volatile__ ("cli;\n\thlt"); +// for(;;) __asm__ __volatile__ ("hlt"); + for(;;) ; } -void Debug_SetKTerminal(char *File) +void Debug_SetKTerminal(const char *File) { int tmp; if(giDebug_KTerm != -1) { @@ -239,27 +235,40 @@ void Debug_SetKTerminal(char *File) Log_Log("Debug", "Returning to %p", __builtin_return_address(0)); } -void Debug_Enter(char *FuncName, char *ArgTypes, ...) +void Debug_Enter(const char *FuncName, const char *ArgTypes, ...) { va_list args; - int i = gDebug_Level ++; + int i; int pos; + tTID tid = Threads_GetTID(); + + #if LOCK_DEBUG_OUTPUT + SHORTLOCK(&glDebug_Lock); + #endif + + i = gDebug_Level ++; va_start(args, ArgTypes); + LogF("%012lli ", now()); while(i--) Debug_Putchar(' '); - Debug_Puts(1, FuncName); Debug_Puts(1, ": ("); + Debug_Puts(1, FuncName); + Debug_FmtS("[%i]", tid); + Debug_Puts(1, ": ("); while(*ArgTypes) { pos = strpos(ArgTypes, ' '); - if(pos != -1) ArgTypes[pos] = '\0'; if(pos == -1 || pos > 1) { - Debug_Puts(1, ArgTypes+1); + if(pos == -1) + Debug_Puts(1, ArgTypes+1); + else { + for( i = 1; i < pos; i ++ ) + Debug_Putchar(ArgTypes[i]); + } Debug_Putchar('='); } - if(pos != -1) ArgTypes[pos] = ' '; switch(*ArgTypes) { case 'p': LogF("%p", va_arg(args, void*)); break; @@ -280,29 +289,53 @@ void Debug_Enter(char *FuncName, char *ArgTypes, ...) } va_end(args); - Debug_Putchar(')'); Debug_Putchar('\n'); + Debug_Putchar(')'); Debug_Putchar('\r'); Debug_Putchar('\n'); + + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif } -void Debug_Log(char *FuncName, char *Fmt, ...) +void Debug_Log(const char *FuncName, const char *Fmt, ...) { va_list args; int i = gDebug_Level; + tTID tid = Threads_GetTID(); + + #if LOCK_DEBUG_OUTPUT + SHORTLOCK(&glDebug_Lock); + #endif va_start(args, Fmt); + LogF("%012lli ", now()); while(i--) Debug_Putchar(' '); - Debug_Puts(1, FuncName); Debug_Puts(1, ": "); + Debug_Puts(1, FuncName); + Debug_FmtS("[%i]", tid); + Debug_Puts(1, ": "); Debug_Fmt(Fmt, args); va_end(args); + Debug_Putchar('\r'); Debug_Putchar('\n'); + + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif } -void Debug_Leave(char *FuncName, char RetType, ...) +void Debug_Leave(const char *FuncName, char RetType, ...) { va_list args; - int i = --gDebug_Level; + int i; + tTID tid = Threads_GetTID(); + + #if LOCK_DEBUG_OUTPUT + SHORTLOCK(&glDebug_Lock); + #endif + + i = --gDebug_Level; va_start(args, RetType); @@ -310,14 +343,21 @@ void Debug_Leave(char *FuncName, char RetType, ...) gDebug_Level = 0; i = 0; } + LogF("%012lli ", now()); // Indenting while(i--) Debug_Putchar(' '); - Debug_Puts(1, FuncName); Debug_Puts(1, ": RETURN"); + Debug_Puts(1, FuncName); + Debug_FmtS("[%i]", tid); + Debug_Puts(1, ": RETURN"); // No Return if(RetType == '-') { + Debug_Putchar('\r'); Debug_Putchar('\n'); + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif return; } @@ -333,21 +373,27 @@ void Debug_Leave(char *FuncName, char RetType, ...) // Extended (64-Bit) case 'X': Debug_Fmt("0x%llx", args); break; } + Debug_Putchar('\r'); Debug_Putchar('\n'); va_end(args); + + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif } -void Debug_HexDump(char *Header, void *Data, Uint Length) +void Debug_HexDump(const char *Header, const void *Data, Uint Length) { - Uint8 *cdat = Data; + const Uint8 *cdat = Data; Uint pos = 0; Debug_Puts(1, Header); - LogF(" (Hexdump of %p)\n", Data); + LogF(" (Hexdump of %p)\r\n", Data); + + #define CH(n) ((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.') while(Length >= 16) { - #define CH(n) ((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.') Log("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" " %02x %02x %02x %02x %02x %02x %02x %02x" " %c%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c", @@ -362,14 +408,23 @@ void Debug_HexDump(char *Header, void *Data, Uint Length) pos += 16; } - LogF("Log: %04x: ", pos); - while(Length) { - Uint byte = *cdat; - LogF("%02x ", byte); - Length--; - cdat ++; + int i ; + LogF("Log: %04x: ", pos); + for(i = 0; i < Length; i ++) + { + LogF("%02x ", cdat[i]); + } + for( ; i < 16; i ++) LogF(" "); + LogF(" "); + for(i = 0; i < Length; i ++) + { + if( i == 8 ) LogF(" "); + LogF("%c", CH(i)); + } } + + Debug_Putchar('\r'); Debug_Putchar('\n'); }