#define DEBUG_TO_SERIAL 1
#define SERIAL_PORT 0x3F8
#define GDB_SERIAL_PORT 0x2F8
+#define DEBUG_USE_VSNPRINTF 1
+#define DEBUG_MAX_LINE_LEN 256
// === IMPORTS ===
-extern void Threads_Dump();
+extern void Threads_Dump(void);
+extern void KernelPanic_SetMode(void);
+extern void KernelPanic_PutChar(char Ch);
+
+// === PROTOTYPES ===
+ int putDebugChar(char ch);
+ int getDebugChar();
+static void Debug_Putchar(char ch);
+static void Debug_Puts(char *Str);
+void Debug_Fmt(const char *format, va_list args);
// === 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;
// === CODE ===
int putDebugChar(char ch)
static void Debug_Putchar(char ch)
{
- if(giDebug_KTerm != -1)
- VFS_Write(giDebug_KTerm, 1, &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
while( (inb(SERIAL_PORT + 5) & 0x20) == 0 );
outb(SERIAL_PORT, ch);
#endif
-
- #if DEBUG_TO_E9
- __asm__ __volatile__ ( "outb %%al, $0xe9" :: "a"(((Uint8)ch)) );
- #endif
+
+ if( !gbDebug_IsKPanic )
+ {
+ if(gbInPutChar) return ;
+ gbInPutChar = 1;
+ if(giDebug_KTerm != -1)
+ VFS_Write(giDebug_KTerm, 1, &ch);
+ gbInPutChar = 0;
+ }
+ else
+ KernelPanic_PutChar(ch);
}
static void Debug_Puts(char *Str)
{
- while(*Str) Debug_Putchar(*Str++);
+ int len = 0;
+ while( *Str )
+ {
+ #if DEBUG_TO_E9
+ __asm__ __volatile__ ( "outb %%al, $0xe9" :: "a" ((Uint8)*Str) );
+ #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, *Str);
+ #endif
+
+ if( gbDebug_IsKPanic )
+ KernelPanic_PutChar(*Str);
+ len ++;
+ Str ++;
+ }
+
+ Str -= len;
+
+ if( !gbDebug_IsKPanic && giDebug_KTerm != -1)
+ {
+ if(gbInPutChar) return ;
+ gbInPutChar = 1;
+ VFS_Write(giDebug_KTerm, len, Str);
+ gbInPutChar = 0;
+ }
}
-void Debug_Fmt(const char *format, va_list *args)
+void Debug_Fmt(const char *format, va_list args)
{
+ #if DEBUG_USE_VSNPRINTF
+ char buf[DEBUG_MAX_LINE_LEN];
+ int len;
+ len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
+ //if( len < DEBUG_MAX_LINE )
+ // do something
+ Debug_Puts(buf);
+ return ;
+ #else
char c, pad = ' ';
- int minSize = 0;
+ int minSize = 0, len;
char tmpBuf[34]; // For Integers
char *p = NULL;
int isLongLong = 0;
Uint64 arg;
+ int bPadLeft = 0;
while((c = *format++) != 0)
{
// Get Argument
arg = va_arg(*args, Uint);
+ // - Padding Side Flag
+ if(c == '+') {
+ bPadLeft = 1;
+ c = *format++;
+ }
+
// Padding
if(c == '0') {
pad = '0';
itoa(p, arg, 2, minSize, pad);
goto printString;
+ printString:
+ if(!p) p = "(null)";
+ while(*p) Debug_Putchar(*p++);
+ break;
+
case 'B': //Boolean
if(arg) Debug_Puts("True");
else Debug_Puts("False");
case 's':
p = (char*)(Uint)arg;
- printString:
if(!p) p = "(null)";
+ len = strlen(p);
+ if( !bPadLeft ) while(len++ < minSize) Debug_Putchar(pad);
while(*p) Debug_Putchar(*p++);
+ if( bPadLeft ) while(len++ < minSize) Debug_Putchar(pad);
break;
// Single Character / Array
break;
}
}
+ #endif
+}
+
+void Debug_KernelPanic()
+{
+ gbDebug_IsKPanic = 1;
+ KernelPanic_SetMode();
}
/**
va_start(args, Fmt);
- Debug_Fmt(Fmt, &args);
+ Debug_Fmt(Fmt, args);
va_end(args);
}
Debug_Puts("Log: ");
va_start(args, Fmt);
- Debug_Fmt(Fmt, &args);
+ Debug_Fmt(Fmt, args);
va_end(args);
Debug_Putchar('\n');
}
va_list args;
Debug_Puts("Warning: ");
va_start(args, Fmt);
- Debug_Fmt(Fmt, &args);
+ Debug_Fmt(Fmt, args);
va_end(args);
Debug_Putchar('\n');
}
void Panic(char *Fmt, ...)
{
va_list args;
+
+ Debug_KernelPanic();
+
Debug_Puts("Panic: ");
va_start(args, Fmt);
- Debug_Fmt(Fmt, &args);
+ Debug_Fmt(Fmt, args);
va_end(args);
Debug_Putchar('\n');
void Debug_SetKTerminal(char *File)
{
- if(giDebug_KTerm != -1)
- VFS_Close(giDebug_KTerm);
- giDebug_KTerm = VFS_Open(File, VFS_OPENFLAG_WRITE);
- Log("Opened '%s' as 0x%x", File, giDebug_KTerm);
+ int tmp;
+ if(giDebug_KTerm != -1) {
+ tmp = giDebug_KTerm;
+ giDebug_KTerm = -1;
+ VFS_Close(tmp);
+ }
+ tmp = VFS_Open(File, VFS_OPENFLAG_WRITE);
+ Log_Log("Debug", "Opened '%s' as 0x%x", File, tmp);
+ giDebug_KTerm = tmp;
+ Log_Log("Debug", "Returning to %p", __builtin_return_address(0));
}
void Debug_Enter(char *FuncName, char *ArgTypes, ...)
if(pos != -1) ArgTypes[pos] = ' ';
switch(*ArgTypes)
{
- 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 'b': Debug_Fmt("0b%b", &args); 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 'b': Debug_Fmt("0b%b", args); break;
// Extended (64-Bit)
- case 'X': Debug_Fmt("0x%llx", &args); break;
- case 'B': Debug_Fmt("0b%llb", &args); break;
+ case 'X': Debug_Fmt("0x%llx", args); break;
+ case 'B': Debug_Fmt("0b%llb", args); break;
}
if(pos != -1) {
Debug_Putchar(','); Debug_Putchar(' ');
while(i--) Debug_Putchar(' ');
Debug_Puts(FuncName); Debug_Puts(": ");
- Debug_Fmt(Fmt, &args);
+ Debug_Fmt(Fmt, args);
va_end(args);
Debug_Putchar('\n');
switch(RetType)
{
case 'n': Debug_Puts("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 '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;
// Extended (64-Bit)
- case 'X': Debug_Fmt("0x%llx", &args); break;
+ case 'X': Debug_Fmt("0x%llx", args); break;
}
Debug_Putchar('\n');