X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdebug.c;h=379f6767778c00ec7225048fa397b5d7befba3ab;hb=40209ef79e1c74e93c08a95e8d9d1258115a5389;hp=ac5c0597f9f97bc143e671448d3cff162ca410f6;hpb=b7d27cb988daadd457370e7e1a19aaec342e8415;p=tpg%2Facess2.git diff --git a/Kernel/debug.c b/Kernel/debug.c index ac5c0597..379f6767 100644 --- a/Kernel/debug.c +++ b/Kernel/debug.c @@ -7,88 +7,35 @@ #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 + +#define TRACE_TO_KTERM 0 + // === IMPORTS === -extern void Threads_Dump(void); +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); -void Debug_Fmt(const char *format, va_list args); +static void Debug_Puts(int bUseKTerm, const char *Str); +void Debug_DbgOnlyFmt(const char *format, va_list args); +void Debug_FmtS(int bUseKTerm, const char *format, ...); +void Debug_Fmt(int bUseKTerm, 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 +51,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 ; @@ -130,16 +77,10 @@ static void Debug_Puts(int UseKTerm, char *Str) void Debug_DbgOnlyFmt(const char *format, va_list args) { - char buf[DEBUG_MAX_LINE_LEN]; - int len; - buf[DEBUG_MAX_LINE_LEN-1] = 0; - len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args); - //if( len < DEBUG_MAX_LINE ) - // do something - Debug_Puts(0, buf); + Debug_Fmt(0, format, args); } -void Debug_Fmt(const char *format, va_list args) +void Debug_Fmt(int bUseKTerm, const char *format, va_list args) { char buf[DEBUG_MAX_LINE_LEN]; int len; @@ -147,85 +88,135 @@ void Debug_Fmt(const char *format, va_list args) len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args); //if( len < DEBUG_MAX_LINE ) // do something - Debug_Puts(1, buf); + Debug_Puts(bUseKTerm, buf); return ; } -void Debug_KernelPanic() +void Debug_FmtS(int bUseKTerm, const char *format, ...) { + va_list args; + va_start(args, format); + Debug_Fmt(bUseKTerm, format, args); + va_end(args); +} + +void Debug_KernelPanic(void) +{ + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif gbDebug_IsKPanic = 1; KernelPanic_SetMode(); } /** - * \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); + Debug_Fmt(1, 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); + Debug_Fmt(1, Fmt, args); va_end(args); - Debug_Putchar('\n'); + Debug_Puts(1, "\r\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); + Debug_Fmt(1, 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); + Debug_Fmt(1, 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"); + for(;;) ; } -void Debug_SetKTerminal(char *File) +void Debug_SetKTerminal(const char *File) { int tmp; if(giDebug_KTerm != -1) { @@ -234,45 +225,58 @@ void Debug_SetKTerminal(char *File) VFS_Close(tmp); } tmp = VFS_Open(File, VFS_OPENFLAG_WRITE); - Log_Log("Debug", "Opened '%s' as 0x%x", File, tmp); +// Log_Log("Debug", "Opened '%s' as 0x%x", File, tmp); giDebug_KTerm = tmp; - Log_Log("Debug", "Returning to %p", __builtin_return_address(0)); +// 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); - while(i--) Debug_Putchar(' '); + Debug_FmtS(TRACE_TO_KTERM, "%014lli ", now()); + while(i--) Debug_Puts(TRACE_TO_KTERM, " "); - Debug_Puts(1, FuncName); Debug_Puts(1, ": ("); + Debug_Puts(TRACE_TO_KTERM, FuncName); + Debug_FmtS(TRACE_TO_KTERM, "[%i]", tid); + Debug_Puts(TRACE_TO_KTERM, ": ("); while(*ArgTypes) { pos = strpos(ArgTypes, ' '); - if(pos != -1) ArgTypes[pos] = '\0'; if(pos == -1 || pos > 1) { - Debug_Puts(1, ArgTypes+1); - Debug_Putchar('='); + if(pos == -1) + Debug_Puts(TRACE_TO_KTERM, ArgTypes+1); + else { + Debug_FmtS(TRACE_TO_KTERM, "%.*s", pos-1, ArgTypes+1); + } + Debug_Puts(TRACE_TO_KTERM, "="); } - if(pos != -1) ArgTypes[pos] = ' '; switch(*ArgTypes) { - case 'p': LogF("%p", va_arg(args, void*)); break; - case 's': LogF("'%s'", va_arg(args, char*)); break; - case 'i': LogF("%i", va_arg(args, int)); break; - case 'u': LogF("%u", va_arg(args, Uint)); break; - case 'x': LogF("0x%x", va_arg(args, Uint)); break; - case 'b': LogF("0b%b", va_arg(args, Uint)); break; - case 'X': LogF("0x%llx", va_arg(args, Uint64)); break; // Extended (64-Bit) - case 'B': LogF("0b%llb", va_arg(args, Uint64)); break; // Extended (64-Bit) + case 'p': Debug_FmtS(TRACE_TO_KTERM, "%p", va_arg(args, void*)); break; + case 'P': Debug_FmtS(TRACE_TO_KTERM, "%P", va_arg(args, tPAddr)); break; + case 's': Debug_FmtS(TRACE_TO_KTERM, "'%s'", va_arg(args, char*)); break; + case 'i': Debug_FmtS(TRACE_TO_KTERM, "%i", va_arg(args, int)); break; + case 'u': Debug_FmtS(TRACE_TO_KTERM, "%u", va_arg(args, Uint)); break; + case 'x': Debug_FmtS(TRACE_TO_KTERM, "0x%x", va_arg(args, Uint)); break; + case 'b': Debug_FmtS(TRACE_TO_KTERM, "0b%b", va_arg(args, Uint)); break; + case 'X': Debug_FmtS(TRACE_TO_KTERM, "0x%llx", va_arg(args, Uint64)); break; // Extended (64-Bit) + case 'B': Debug_FmtS(TRACE_TO_KTERM, "0b%llb", va_arg(args, Uint64)); break; // Extended (64-Bit) } if(pos != -1) { - Debug_Putchar(','); Debug_Putchar(' '); + Debug_Puts(TRACE_TO_KTERM, ", "); } if(pos == -1) break; @@ -280,29 +284,52 @@ void Debug_Enter(char *FuncName, char *ArgTypes, ...) } va_end(args); - Debug_Putchar(')'); Debug_Putchar('\n'); + Debug_Puts(TRACE_TO_KTERM, ")\r\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(); - va_start(args, Fmt); + #if LOCK_DEBUG_OUTPUT + SHORTLOCK(&glDebug_Lock); + #endif - while(i--) Debug_Putchar(' '); + Debug_FmtS(TRACE_TO_KTERM, "%014lli ", now()); + while(i--) Debug_Puts(TRACE_TO_KTERM, " "); - Debug_Puts(1, FuncName); Debug_Puts(1, ": "); - Debug_Fmt(Fmt, args); + Debug_Puts(TRACE_TO_KTERM, FuncName); + Debug_FmtS(TRACE_TO_KTERM, "[%i]", tid); + Debug_Puts(TRACE_TO_KTERM, ": "); + va_start(args, Fmt); + Debug_Fmt(TRACE_TO_KTERM, Fmt, args); va_end(args); - Debug_Putchar('\n'); + + Debug_Puts(TRACE_TO_KTERM, "\r\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,50 +337,64 @@ void Debug_Leave(char *FuncName, char RetType, ...) gDebug_Level = 0; i = 0; } + Debug_FmtS(TRACE_TO_KTERM, "%014lli ", now()); // Indenting - while(i--) Debug_Putchar(' '); + while(i--) Debug_Puts(TRACE_TO_KTERM, " "); - Debug_Puts(1, FuncName); Debug_Puts(1, ": RETURN"); + Debug_Puts(TRACE_TO_KTERM, FuncName); + Debug_FmtS(TRACE_TO_KTERM, "[%i]", tid); + Debug_Puts(TRACE_TO_KTERM, ": RETURN"); // No Return if(RetType == '-') { - Debug_Putchar('\n'); + Debug_Puts(TRACE_TO_KTERM, "\r\n"); + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif return; } - Debug_Putchar(' '); switch(RetType) { - case 'n': Debug_Puts(1, "NULL"); break; - case 'p': Debug_Fmt("%p", args); break; - case 's': Debug_Fmt("'%s'", args); break; - case 'i': Debug_Fmt("%i", args); break; - case 'u': Debug_Fmt("%u", args); break; - case 'x': Debug_Fmt("0x%x", args); break; + case 'n': Debug_Puts(TRACE_TO_KTERM, " NULL"); break; + case 'p': Debug_Fmt(TRACE_TO_KTERM, " %p", args); break; + case 'P': Debug_Fmt(TRACE_TO_KTERM, " %P", args); break; // PAddr + case 's': Debug_Fmt(TRACE_TO_KTERM, " '%s'", args); break; + case 'i': Debug_Fmt(TRACE_TO_KTERM, " %i", args); break; + case 'u': Debug_Fmt(TRACE_TO_KTERM, " %u", args); break; + case 'x': Debug_Fmt(TRACE_TO_KTERM, " 0x%x", args); break; // Extended (64-Bit) - case 'X': Debug_Fmt("0x%llx", args); break; + case 'X': Debug_Fmt(TRACE_TO_KTERM, " 0x%llx", args); break; } - Debug_Putchar('\n'); + Debug_Puts(TRACE_TO_KTERM, "\r\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; + LogF("%014lli ", now()); 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" + LogF("%014lli 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", + " %c%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c\r\n", + now(), pos, - cdat[0], cdat[1], cdat[2], cdat[3], cdat[4], cdat[5], cdat[6], cdat[7], - cdat[8], cdat[9], cdat[10], cdat[11], cdat[12], cdat[13], cdat[14], cdat[15], + cdat[ 0], cdat[ 1], cdat[ 2], cdat[ 3], cdat[ 4], cdat[ 5], cdat[ 6], cdat[ 7], + cdat[ 8], cdat[ 9], cdat[10], cdat[11], cdat[12], cdat[13], cdat[14], cdat[15], CH(0), CH(1), CH(2), CH(3), CH(4), CH(5), CH(6), CH(7), CH(8), CH(9), CH(10), CH(11), CH(12), CH(13), CH(14), CH(15) ); @@ -362,15 +403,24 @@ 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("%014lli Log: %04x: ", now(), 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'); } - Debug_Putchar('\n'); } // --- EXPORTS ---