#define DEBUG_MAX_LINE_LEN 256
#define LOCK_DEBUG_OUTPUT 1 // Avoid interleaving of output lines?
-#define TRACE_TO_KTERM 0 // Send ENTER/DEBUG/LEAVE to debug?
+#define TRACE_TO_KTERM 1 // Send ENTER/DEBUG/LEAVE to debug?
// === IMPORTS ===
extern void Threads_Dump(void);
+extern void Heap_Dump(void);
extern void KernelPanic_SetMode(void);
extern void KernelPanic_PutChar(char Ch);
+extern void IPStack_SendDebugText(const char *Text);
// === PROTOTYPES ===
static void Debug_Putchar(char ch);
#if LOCK_DEBUG_OUTPUT
tShortSpinlock glDebug_Lock;
#endif
+// - Disabled because it breaks shit
+ int gbSendNetworkDebug = 0;
// === CODE ===
static void Debug_Putchar(char ch)
{
Debug_PutCharDebug(ch);
- if( !gbDebug_IsKPanic )
+
+ if( gbDebug_IsKPanic )
+ KernelPanic_PutChar(ch);
+
+ if( gbDebug_IsKPanic < 2 )
{
if(gbInPutChar) return ;
gbInPutChar = 1;
VFS_Write(giDebug_KTerm, 1, &ch);
gbInPutChar = 0;
}
- else
- KernelPanic_PutChar(ch);
+
+ if( gbSendNetworkDebug )
+ {
+ char str[2] = {ch, 0};
+ IPStack_SendDebugText(str);
+ }
}
static void Debug_Puts(int UseKTerm, const char *Str)
}
else
for( len = 0; Str[len]; len ++ );
-
+
+ if( gbSendNetworkDebug )
+ IPStack_SendDebugText(Str);
+
// Output to the kernel terminal
- if( UseKTerm && !gbDebug_IsKPanic && giDebug_KTerm != -1)
+ if( UseKTerm && gbDebug_IsKPanic < 2 && giDebug_KTerm != -1)
{
if(gbInPutChar) return ;
gbInPutChar = 1;
void Debug_Fmt(int bUseKTerm, const char *format, va_list args)
{
char buf[DEBUG_MAX_LINE_LEN];
- int len;
+// int len;
buf[DEBUG_MAX_LINE_LEN-1] = 0;
- len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
+ /*len = */vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
//if( len < DEBUG_MAX_LINE )
// do something
Debug_Puts(bUseKTerm, buf);
void Debug_KernelPanic(void)
{
- #if LOCK_DEBUG_OUTPUT
- SHORTREL(&glDebug_Lock);
- #endif
- gbDebug_IsKPanic = 1;
+ if( !gbDebug_IsKPanic )
+ {
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
+ VT_SetTerminal(7);
+ }
+ // 5 nested panics? Fuck it
+ if( gbDebug_IsKPanic > 5 )
+ for(;;);
+ gbDebug_IsKPanic ++;
KernelPanic_SetMode();
}
va_list args;
#if LOCK_DEBUG_OUTPUT
- SHORTLOCK(&glDebug_Lock);
+ if(!CPU_HAS_LOCK(&glDebug_Lock)) SHORTLOCK(&glDebug_Lock);
#endif
Debug_Puts(0, "Debug: ");
SHORTREL(&glDebug_Lock);
#endif
}
-/**
- * \fn void Log(const char *Msg, ...)
- */
-void Log(const char *Fmt, ...)
+
+
+void LogFV(const char *Fmt, va_list args)
{
- va_list args;
+ #if LOCK_DEBUG_OUTPUT
+ SHORTLOCK(&glDebug_Lock);
+ #endif
+
+ Debug_Fmt(1, Fmt, args);
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
+}
+
+void LogV(const char *Fmt, va_list args)
+{
#if LOCK_DEBUG_OUTPUT
SHORTLOCK(&glDebug_Lock);
#endif
Debug_Puts(1, "Log: ");
- va_start(args, Fmt);
Debug_Fmt(1, Fmt, args);
- va_end(args);
Debug_Puts(1, "\r\n");
#if LOCK_DEBUG_OUTPUT
SHORTREL(&glDebug_Lock);
#endif
}
+
+/**
+ * \fn void Log(const char *Msg, ...)
+ */
+void Log(const char *Fmt, ...)
+{
+ va_list args;
+ va_start(args, Fmt);
+ LogV(Fmt, args);
+ va_end(args);
+}
+
void Warning(const char *Fmt, ...)
{
va_list args;
va_list args;
#if LOCK_DEBUG_OUTPUT
- SHORTLOCK(&glDebug_Lock);
+ if( !CPU_HAS_LOCK(&glDebug_Lock) )
+ SHORTLOCK(&glDebug_Lock);
#endif
// And never SHORTREL
Debug_Putchar('\r');
Debug_Putchar('\n');
- Threads_Dump();
+ //Threads_Dump();
+ //Heap_Dump();
for(;;) ;
}
#endif
}
-void Debug_HexDump(const char *Header, const void *Data, Uint Length)
+void Debug_HexDump(const char *Header, const void *Data, size_t Length)
{
const Uint8 *cdat = Data;
Uint pos = 0;