X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdebug.c;h=2444cb1604fc568c4f12be8905fe5b1684c1a6a0;hb=17ebf0cdf584b5eb63aa96149de3e4f76cb82e01;hp=dab20addce7204a1e43f852b1d582332e5ba520f;hpb=11dbd684e9a3d907d43d71a3145205f1a86992fb;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/debug.c b/KernelLand/Kernel/debug.c
index dab20add..2444cb16 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;
@@ -111,10 +113,14 @@ void Debug_FmtS(int bUseKTerm, const char *format, ...)
 
 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);
+	}
+	gbDebug_IsKPanic ++;
 	KernelPanic_SetMode();
 }
 
@@ -149,7 +155,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: ");
@@ -162,27 +168,47 @@ void Debug(const char *Fmt, ...)
 	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;
@@ -207,7 +233,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
 	
@@ -221,6 +248,7 @@ void Panic(const char *Fmt, ...)
 	Debug_Putchar('\n');
 
 	Threads_Dump();
+	Heap_Dump();
 
 	for(;;)	;
 }
@@ -384,7 +412,7 @@ void Debug_Leave(const char *FuncName, char RetType, ...)
 	#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;