X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdebug.c;h=8533a9e8c143cee3348932a85098851cbdb8553d;hb=b2934fe046a55291ae03035a6270db3b32950c8f;hp=1fe332ccde72d4e26c437fd7c0cde9ab79826e02;hpb=30e30d7bc325852a8677819d11a47373b08d6271;p=tpg%2Facess2.git

diff --git a/Kernel/debug.c b/Kernel/debug.c
index 1fe332cc..8533a9e8 100644
--- a/Kernel/debug.c
+++ b/Kernel/debug.c
@@ -13,6 +13,8 @@
 #define	GDB_SERIAL_PORT	0x2F8
 #define	DEBUG_MAX_LINE_LEN	256
 
+#define	LOCK_DEBUG_OUTPUT	0
+
 // === IMPORTS ===
 extern void Threads_Dump(void);
 extern void	KernelPanic_SetMode(void);
@@ -32,6 +34,9 @@ void	Debug_Fmt(const char *format, va_list args);
  int	gbGDB_SerialSetup = 0;
  int	gbDebug_IsKPanic = 0;
 volatile int	gbInPutChar = 0;
+#if LOCK_DEBUG_OUTPUT
+tSpinlock	glDebug_Lock;
+#endif
 
 // === CODE ===
 int putDebugChar(char ch)
@@ -163,11 +168,19 @@ void LogF(char *Fmt, ...)
 {
 	va_list	args;
 
+	#if LOCK_DEBUG_OUTPUT
+	VTIGHTLOCK(&glDebug_Lock);
+	#endif
+	
 	va_start(args, Fmt);
 
 	Debug_Fmt(Fmt, args);
 
 	va_end(args);
+	
+	#if LOCK_DEBUG_OUTPUT
+	RELEASE(&glDebug_Lock);
+	#endif
 }
 /**
  * \fn void Debug(char *Msg, ...)
@@ -176,12 +189,20 @@ void LogF(char *Fmt, ...)
 void Debug(char *Fmt, ...)
 {
 	va_list	args;
+	
+	#if LOCK_DEBUG_OUTPUT
+	LOCK(&glDebug_Lock);
+	#endif
 
 	Debug_Puts(0, "Debug: ");
 	va_start(args, Fmt);
 	Debug_DbgOnlyFmt(Fmt, args);
 	va_end(args);
+	Debug_PutCharDebug('\r');
 	Debug_PutCharDebug('\n');
+	#if LOCK_DEBUG_OUTPUT
+	RELEASE(&glDebug_Lock);
+	#endif
 }
 /**
  * \fn void Log(char *Msg, ...)
@@ -189,32 +210,57 @@ void Debug(char *Fmt, ...)
 void Log(char *Fmt, ...)
 {
 	va_list	args;
+	
+	#if LOCK_DEBUG_OUTPUT
+	LOCK(&glDebug_Lock);
+	#endif
 
 	Debug_Puts(1, "Log: ");
 	va_start(args, Fmt);
 	Debug_Fmt(Fmt, args);
 	va_end(args);
+	Debug_Putchar('\r');
 	Debug_Putchar('\n');
+	
+	#if LOCK_DEBUG_OUTPUT
+	RELEASE(&glDebug_Lock);
+	#endif
 }
 void Warning(char *Fmt, ...)
 {
 	va_list	args;
+	
+	#if LOCK_DEBUG_OUTPUT
+	LOCK(&glDebug_Lock);
+	#endif
+	
 	Debug_Puts(1, "Warning: ");
 	va_start(args, Fmt);
 	Debug_Fmt(Fmt, args);
 	va_end(args);
+	Debug_Putchar('\r');
 	Debug_Putchar('\n');
+	
+	#if LOCK_DEBUG_OUTPUT
+	RELEASE(&glDebug_Lock);
+	#endif
 }
 void Panic(char *Fmt, ...)
 {
 	va_list	args;
 	
+	#if LOCK_DEBUG_OUTPUT
+	LOCK(&glDebug_Lock);
+	#endif
+	// And never release
+	
 	Debug_KernelPanic();
 	
 	Debug_Puts(1, "Panic: ");
 	va_start(args, Fmt);
 	Debug_Fmt(Fmt, args);
 	va_end(args);
+	Debug_Putchar('\r');
 	Debug_Putchar('\n');
 
 	Threads_Dump();
@@ -279,7 +325,7 @@ void Debug_Enter(char *FuncName, char *ArgTypes, ...)
 	}
 
 	va_end(args);
-	Debug_Putchar(')');	Debug_Putchar('\n');
+	Debug_Putchar(')');	Debug_Putchar('\r');	Debug_Putchar('\n');
 }
 
 void Debug_Log(char *FuncName, char *Fmt, ...)
@@ -295,6 +341,7 @@ void Debug_Log(char *FuncName, char *Fmt, ...)
 	Debug_Fmt(Fmt, args);
 
 	va_end(args);
+	Debug_Putchar('\r');
 	Debug_Putchar('\n');
 }
 
@@ -303,6 +350,10 @@ void Debug_Leave(char *FuncName, char RetType, ...)
 	va_list	args;
 	 int	i = --gDebug_Level;
 
+	#if LOCK_DEBUG_OUTPUT
+	LOCK(&glDebug_Lock);
+	#endif
+
 	va_start(args, RetType);
 
 	if( i == -1 ) {
@@ -316,6 +367,7 @@ void Debug_Leave(char *FuncName, char RetType, ...)
 
 	// No Return
 	if(RetType == '-') {
+		Debug_Putchar('\r');
 		Debug_Putchar('\n');
 		return;
 	}
@@ -332,6 +384,7 @@ void Debug_Leave(char *FuncName, char RetType, ...)
 	// Extended (64-Bit)
 	case 'X':	Debug_Fmt("0x%llx", args);	break;
 	}
+	Debug_Putchar('\r');
 	Debug_Putchar('\n');
 
 	va_end(args);
@@ -342,11 +395,12 @@ void Debug_HexDump(char *Header, void *Data, Uint Length)
 	Uint8	*cdat = Data;
 	Uint	pos = 0;
 	Debug_Puts(1, Header);
-	LogF(" (Hexdump of %p)\n", Data);
+	LogF(" (Hexdump of %p)\r\n", Data);
+
+	#define	CH(n)	((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.')
 
 	while(Length >= 16)
 	{
-		#define	CH(n)	((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.')
 		Log("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
 			" %02x %02x %02x %02x %02x %02x %02x %02x"
 			"  %c%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c",
@@ -361,14 +415,23 @@ void Debug_HexDump(char *Header, void *Data, Uint Length)
 		pos += 16;
 	}
 
-	LogF("Log: %04x: ", pos);
-	while(Length)
 	{
-		Uint	byte = *cdat;
-		LogF("%02x ", byte);
-		Length--;
-		cdat ++;
+		 int	i ;
+		LogF("Log: %04x: ", pos);
+		for(i = 0; i < Length; i ++)
+		{
+			LogF("%02x ", cdat[i]);
+		}
+		for( ; i < 16; i ++)	LogF("   ");
+		LogF(" ");
+		for(i = 0; i < Length; i ++)
+		{
+			if( i == 8 )	LogF(" ");
+			LogF("%c", CH(i));
+		}
 	}
+	
+	Debug_Putchar('\r');
 	Debug_Putchar('\n');
 }