#include <acess.h>
#include <stdarg.h>
-#define DEBUG_TO_E9 1
-#define DEBUG_TO_SERIAL 1
-#define SERIAL_PORT 0x3F8
-#define GDB_SERIAL_PORT 0x2F8
#define DEBUG_MAX_LINE_LEN 256
#define LOCK_DEBUG_OUTPUT 1
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
#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, 0x0C); // Set divisor to 12 (lo byte) 9600 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, 0x0C); // Set divisor to 12 (lo byte) 9600 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);
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 ;
}
/**
- * \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;
#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;
#endif
}
/**
- * \fn void Log(char *Msg, ...)
+ * \fn void Log(const char *Msg, ...)
*/
-void Log(char *Fmt, ...)
+void Log(const char *Fmt, ...)
{
va_list args;
SHORTREL(&glDebug_Lock);
#endif
}
-void Warning(char *Fmt, ...)
+void Warning(const char *Fmt, ...)
{
va_list args;
SHORTREL(&glDebug_Lock);
#endif
}
-void Panic(char *Fmt, ...)
+void Panic(const char *Fmt, ...)
{
va_list args;
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) {
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;
va_start(args, ArgTypes);
+ LogF("%012lli ", now());
while(i--) Debug_Putchar(' ');
Debug_Puts(1, FuncName);
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;
#endif
}
-void Debug_Log(char *FuncName, char *Fmt, ...)
+void Debug_Log(const char *FuncName, const char *Fmt, ...)
{
va_list args;
int i = gDebug_Level;
va_start(args, Fmt);
+ LogF("%012lli ", now());
while(i--) Debug_Putchar(' ');
Debug_Puts(1, FuncName);
#endif
}
-void Debug_Leave(char *FuncName, char RetType, ...)
+void Debug_Leave(const char *FuncName, char RetType, ...)
{
va_list args;
int i;
gDebug_Level = 0;
i = 0;
}
+ LogF("%012lli ", now());
// Indenting
while(i--) Debug_Putchar(' ');
#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)\r\n", Data);