X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Fdebug.c;h=7e8acba7ddce4c3dd36cb00bf67a347c8afc4cd2;hb=a1473d9066eb08a25c85784e6839a31abd6393fb;hp=49600c20e565a8a68b3bd37545a95cc381e7de3b;hpb=7ba570fe3cc5418f42decf5b72ac2295cce9e60f;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/debug.c b/KernelLand/Kernel/debug.c
index 49600c20..7e8acba7 100644
--- a/KernelLand/Kernel/debug.c
+++ b/KernelLand/Kernel/debug.c
@@ -7,12 +7,11 @@
 
 #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	Heap_Dump(void);
 extern void	KernelPanic_SetMode(void);
 extern void	KernelPanic_PutChar(char Ch);
 extern void	IPStack_SendDebugText(const char *Text);
@@ -24,7 +23,6 @@ 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);
-void	LogFV(const char *Fmt, va_list args);
 
 // === GLOBALS ===
  int	gDebug_Level = 0;
@@ -115,9 +113,16 @@ void Debug_FmtS(int bUseKTerm, const char *format, ...)
 
 void Debug_KernelPanic(void)
 {
-	#if LOCK_DEBUG_OUTPUT
-	SHORTREL(&glDebug_Lock);
-	#endif
+	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();
 }
@@ -245,8 +250,8 @@ void Panic(const char *Fmt, ...)
 	Debug_Putchar('\r');
 	Debug_Putchar('\n');
 
-	Threads_Dump();
-	Heap_Dump();
+	//Threads_Dump();
+	//Heap_Dump();
 
 	for(;;)	;
 }