X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Fdebug.c;h=ce87d9de41be79e67429eb63a4d3c43099b6609b;hb=34dbc845a86903c0b531216b166a4d596255bc9a;hp=ac5c0597f9f97bc143e671448d3cff162ca410f6;hpb=b7d27cb988daadd457370e7e1a19aaec342e8415;p=tpg%2Facess2.git

diff --git a/Kernel/debug.c b/Kernel/debug.c
index ac5c0597..ce87d9de 100644
--- a/Kernel/debug.c
+++ b/Kernel/debug.c
@@ -11,9 +11,10 @@
 #define DEBUG_TO_SERIAL	1
 #define	SERIAL_PORT	0x3F8
 #define	GDB_SERIAL_PORT	0x2F8
-#define DEBUG_USE_VSNPRINTF	0
 #define	DEBUG_MAX_LINE_LEN	256
 
+#define	LOCK_DEBUG_OUTPUT	1
+
 // === IMPORTS ===
 extern void Threads_Dump(void);
 extern void	KernelPanic_SetMode(void);
@@ -33,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
+tShortSpinlock	glDebug_Lock;
+#endif
 
 // === CODE ===
 int putDebugChar(char ch)
@@ -56,8 +60,8 @@ int getDebugChar(void)
 	if(!gbGDB_SerialSetup) {
 		outb(GDB_SERIAL_PORT + 1, 0x00);    // Disable all interrupts
 		outb(GDB_SERIAL_PORT + 3, 0x80);    // Enable DLAB (set baud rate divisor)
-		outb(GDB_SERIAL_PORT + 0, 0x03);    // Set divisor to 3 (lo byte) 38400 baud
-		outb(GDB_SERIAL_PORT + 1, 0x00);    //                  (hi byte)
+		outb(GDB_SERIAL_PORT + 0, 0x0C);    // Set divisor to 12 (lo byte) 9600 baud
+		outb(GDB_SERIAL_PORT + 1, 0x00);    //                   (hi byte)
 		outb(GDB_SERIAL_PORT + 3, 0x03);    // 8 bits, no parity, one stop bit
 		outb(GDB_SERIAL_PORT + 2, 0xC7);    // Enable FIFO with 14-byte threshold and clear it
 		outb(GDB_SERIAL_PORT + 4, 0x0B);    // IRQs enabled, RTS/DSR set
@@ -77,8 +81,8 @@ static void Debug_PutCharDebug(char ch)
 	if(!gbDebug_SerialSetup) {
 		outb(SERIAL_PORT + 1, 0x00);	// Disable all interrupts
 		outb(SERIAL_PORT + 3, 0x80);	// Enable DLAB (set baud rate divisor)
-		outb(SERIAL_PORT + 0, 0x03);	// Set divisor to 3 (lo byte) 38400 baud
-		outb(SERIAL_PORT + 1, 0x00);	//                  (hi byte)
+		outb(SERIAL_PORT + 0, 0x0C);	// Set divisor to 12 (lo byte) 9600 baud
+		outb(SERIAL_PORT + 1, 0x00);	//                   (hi byte)
 		outb(SERIAL_PORT + 3, 0x03);	// 8 bits, no parity, one stop bit
 		outb(SERIAL_PORT + 2, 0xC7);	// Enable FIFO with 14-byte threshold and clear it
 		outb(SERIAL_PORT + 4, 0x0B);	// IRQs enabled, RTS/DSR set
@@ -151,6 +155,14 @@ void Debug_Fmt(const char *format, va_list args)
 	return ;
 }
 
+void Debug_FmtS(const char *format, ...)
+{
+	va_list	args;	
+	va_start(args, format);
+	Debug_Fmt(format, args);
+	va_end(args);
+}
+
 void Debug_KernelPanic()
 {
 	gbDebug_IsKPanic = 1;
@@ -164,11 +176,19 @@ void LogF(char *Fmt, ...)
 {
 	va_list	args;
 
+	#if LOCK_DEBUG_OUTPUT
+	SHORTLOCK(&glDebug_Lock);
+	#endif
+	
 	va_start(args, Fmt);
 
 	Debug_Fmt(Fmt, args);
 
 	va_end(args);
+	
+	#if LOCK_DEBUG_OUTPUT
+	SHORTREL(&glDebug_Lock);
+	#endif
 }
 /**
  * \fn void Debug(char *Msg, ...)
@@ -177,12 +197,20 @@ void LogF(char *Fmt, ...)
 void Debug(char *Fmt, ...)
 {
 	va_list	args;
+	
+	#if LOCK_DEBUG_OUTPUT
+	SHORTLOCK(&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
+	SHORTREL(&glDebug_Lock);
+	#endif
 }
 /**
  * \fn void Log(char *Msg, ...)
@@ -190,32 +218,57 @@ void Debug(char *Fmt, ...)
 void Log(char *Fmt, ...)
 {
 	va_list	args;
+	
+	#if LOCK_DEBUG_OUTPUT
+	SHORTLOCK(&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
+	SHORTREL(&glDebug_Lock);
+	#endif
 }
 void Warning(char *Fmt, ...)
 {
 	va_list	args;
+	
+	#if LOCK_DEBUG_OUTPUT
+	SHORTLOCK(&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
+	SHORTREL(&glDebug_Lock);
+	#endif
 }
 void Panic(char *Fmt, ...)
 {
 	va_list	args;
 	
+	#if LOCK_DEBUG_OUTPUT
+	SHORTLOCK(&glDebug_Lock);
+	#endif
+	// And never SHORTREL
+	
 	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();
@@ -242,14 +295,23 @@ void Debug_SetKTerminal(char *File)
 void Debug_Enter(char *FuncName, char *ArgTypes, ...)
 {
 	va_list	args;
-	 int	i = gDebug_Level ++;
+	 int	i;
 	 int	pos;
+	tTID	tid = Threads_GetTID();
+	 
+	#if LOCK_DEBUG_OUTPUT
+	SHORTLOCK(&glDebug_Lock);
+	#endif
+
+	i = gDebug_Level ++;
 
 	va_start(args, ArgTypes);
 
 	while(i--)	Debug_Putchar(' ');
 
-	Debug_Puts(1, FuncName);	Debug_Puts(1, ": (");
+	Debug_Puts(1, FuncName);
+	Debug_FmtS("[%i]", tid);
+	Debug_Puts(1, ": (");
 
 	while(*ArgTypes)
 	{
@@ -280,29 +342,52 @@ void Debug_Enter(char *FuncName, char *ArgTypes, ...)
 	}
 
 	va_end(args);
-	Debug_Putchar(')');	Debug_Putchar('\n');
+	Debug_Putchar(')');	Debug_Putchar('\r');	Debug_Putchar('\n');
+	
+	#if LOCK_DEBUG_OUTPUT
+	SHORTREL(&glDebug_Lock);
+	#endif
 }
 
 void Debug_Log(char *FuncName, char *Fmt, ...)
 {
 	va_list	args;
 	 int	i = gDebug_Level;
+	tTID	tid = Threads_GetTID();
+
+	#if LOCK_DEBUG_OUTPUT
+	SHORTLOCK(&glDebug_Lock);
+	#endif
 
 	va_start(args, Fmt);
 
 	while(i--)	Debug_Putchar(' ');
 
-	Debug_Puts(1, FuncName);	Debug_Puts(1, ": ");
+	Debug_Puts(1, FuncName);
+	Debug_FmtS("[%i]", tid);
+	Debug_Puts(1, ": ");
 	Debug_Fmt(Fmt, args);
 
 	va_end(args);
+	Debug_Putchar('\r');
 	Debug_Putchar('\n');
+	
+	#if LOCK_DEBUG_OUTPUT
+	SHORTREL(&glDebug_Lock);
+	#endif
 }
 
 void Debug_Leave(char *FuncName, char RetType, ...)
 {
 	va_list	args;
-	 int	i = --gDebug_Level;
+	 int	i;
+	tTID	tid = Threads_GetTID();
+
+	#if LOCK_DEBUG_OUTPUT
+	SHORTLOCK(&glDebug_Lock);
+	#endif
+	
+	i = --gDebug_Level;
 
 	va_start(args, RetType);
 
@@ -313,11 +398,17 @@ void Debug_Leave(char *FuncName, char RetType, ...)
 	// Indenting
 	while(i--)	Debug_Putchar(' ');
 
-	Debug_Puts(1, FuncName);	Debug_Puts(1, ": RETURN");
+	Debug_Puts(1, FuncName);
+	Debug_FmtS("(%i)", tid);
+	Debug_Puts(1, ": RETURN");
 
 	// No Return
 	if(RetType == '-') {
+		Debug_Putchar('\r');
 		Debug_Putchar('\n');
+		#if LOCK_DEBUG_OUTPUT
+		SHORTREL(&glDebug_Lock);
+		#endif
 		return;
 	}
 
@@ -333,9 +424,14 @@ 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);
+	
+	#if LOCK_DEBUG_OUTPUT
+	SHORTREL(&glDebug_Lock);
+	#endif
 }
 
 void Debug_HexDump(char *Header, void *Data, Uint Length)
@@ -343,11 +439,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",
@@ -362,14 +459,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');
 }