X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdebug.c;h=f0d21fa7d7f396e4a8618c29540709aad486c162;hb=0e844bc15a212d0e933b6243a9a9964ab7925c4f;hp=6132bd90226a1d858e2afc654bffe7500756531f;hpb=04a050f42807686dc119838c82372409246d55bb;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/debug.c b/KernelLand/Kernel/debug.c
index 6132bd90..f0d21fa7 100644
--- a/KernelLand/Kernel/debug.c
+++ b/KernelLand/Kernel/debug.c
@@ -11,6 +11,7 @@
 
 // === 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);
@@ -39,7 +40,10 @@ 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;
@@ -47,8 +51,6 @@ static void Debug_Putchar(char ch)
 			VFS_Write(giDebug_KTerm, 1, &ch);
 		gbInPutChar = 0;
 	}
-	else
-		KernelPanic_PutChar(ch);
 	
 	if( gbSendNetworkDebug )
 	{
@@ -75,7 +77,7 @@ static void Debug_Puts(int UseKTerm, const char *Str)
 		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;
@@ -114,7 +116,7 @@ void Debug_KernelPanic(void)
 	#if LOCK_DEBUG_OUTPUT
 	SHORTREL(&glDebug_Lock);
 	#endif
-	gbDebug_IsKPanic = 1;
+	gbDebug_IsKPanic ++;
 	KernelPanic_SetMode();
 }
 
@@ -149,7 +151,7 @@ void Debug(const char *Fmt, ...)
 	va_list	args;
 	
 	#if LOCK_DEBUG_OUTPUT
-	SHORTLOCK(&glDebug_Lock);
+	if(!CPU_HAS_LOCK(&glDebug_Lock)) SHORTLOCK(&glDebug_Lock);
 	#endif
 
 	Debug_Puts(0, "Debug: ");
@@ -227,7 +229,8 @@ void Panic(const char *Fmt, ...)
 	va_list	args;
 	
 	#if LOCK_DEBUG_OUTPUT
-	SHORTLOCK(&glDebug_Lock);
+	if( !CPU_HAS_LOCK(&glDebug_Lock) )
+		SHORTLOCK(&glDebug_Lock);
 	#endif
 	// And never SHORTREL