*/
#include <acess.h>
#include <stdarg.h>
+#include <debug_hooks.h>
#define DEBUG_MAX_LINE_LEN 256
#define LOCK_DEBUG_OUTPUT 1 // Avoid interleaving of output lines?
-#define TRACE_TO_KTERM 1 // Send ENTER/DEBUG/LEAVE to debug?
+#define TRACE_TO_KTERM 0 // 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);
+extern void VT_SetTerminal(int TerminalID);
// === PROTOTYPES ===
static void Debug_Putchar(char ch);
void Debug_Fmt(int bUseKTerm, 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
+ int len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
Debug_Puts(bUseKTerm, buf);
+ if( len > DEBUG_MAX_LINE_LEN-1 ) {
+ // do something
+ Debug_Puts(bUseKTerm, "[...]");
+ }
return ;
}
void Debug_KernelPanic(void)
{
- if( !gbDebug_IsKPanic )
+ // 5 nested panics? Fuck it
+ if( gbDebug_IsKPanic > 5 )
+ HALT_CPU();
+ gbDebug_IsKPanic ++;
+ if( gbDebug_IsKPanic == 1 )
{
#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
+ if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
SHORTLOCK(&glDebug_Lock);
#endif
va_list args;
#if LOCK_DEBUG_OUTPUT
- if(!CPU_HAS_LOCK(&glDebug_Lock)) SHORTLOCK(&glDebug_Lock);
+ if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
+ SHORTLOCK(&glDebug_Lock);
#endif
Debug_Puts(0, "Debug: ");
void LogFV(const char *Fmt, va_list args)
{
#if LOCK_DEBUG_OUTPUT
+ if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
SHORTLOCK(&glDebug_Lock);
#endif
void LogV(const char *Fmt, va_list args)
{
#if LOCK_DEBUG_OUTPUT
+ if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
SHORTLOCK(&glDebug_Lock);
#endif
va_list args;
#if LOCK_DEBUG_OUTPUT
+ if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
SHORTLOCK(&glDebug_Lock);
#endif
Debug_KernelPanic();
+ Debug_Puts(1, "\x1b[31m");
Debug_Puts(1, "Panic: ");
va_start(args, Fmt);
Debug_Fmt(1, Fmt, args);
va_end(args);
- Debug_Putchar('\r');
- Debug_Putchar('\n');
+ Debug_Puts(1, "\x1b[0m\r\n");
+ Proc_PrintBacktrace();
//Threads_Dump();
//Heap_Dump();
- for(;;) ;
+ HALT_CPU();
}
void Debug_SetKTerminal(const char *File)
tTID tid = Threads_GetTID();
#if LOCK_DEBUG_OUTPUT
+ if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
SHORTLOCK(&glDebug_Lock);
#endif
tTID tid = Threads_GetTID();
#if LOCK_DEBUG_OUTPUT
+ if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
SHORTLOCK(&glDebug_Lock);
#endif
tTID tid = Threads_GetTID();
#if LOCK_DEBUG_OUTPUT
+ if(CPU_HAS_LOCK(&glDebug_Lock)) return ;
SHORTLOCK(&glDebug_Lock);
#endif