X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdebug.c;h=f59704ad5bb552747d7e26ae8ae84189c2091331;hb=9d85201216cb35e1b1e051b1d7cdc38eaa5befa4;hp=6bea250e70633cb1f344e543db6b42f51456bf4c;hpb=41769c02317835472d7678d3531ecfc23df8e17a;p=tpg%2Facess2.git

diff --git a/Kernel/debug.c b/Kernel/debug.c
index 6bea250e..f59704ad 100644
--- a/Kernel/debug.c
+++ b/Kernel/debug.c
@@ -24,8 +24,11 @@ extern void	KernelPanic_PutChar(char Ch);
  int	putDebugChar(char ch);
  int	getDebugChar(void);
 static void	Debug_Putchar(char ch);
-static void	Debug_Puts(int DbgOnly, char *Str);
+static void	Debug_Puts(int DbgOnly, const char *Str);
+void	Debug_DbgOnlyFmt(const char *format, va_list args);
+void	Debug_FmtS(const char *format, ...);
 void	Debug_Fmt(const char *format, va_list args);
+void	Debug_SetKTerminal(const char *File);
 
 // === GLOBALS ===
  int	gDebug_Level = 0;
@@ -108,7 +111,7 @@ static void Debug_Putchar(char ch)
 		KernelPanic_PutChar(ch);
 }
 
-static void Debug_Puts(int UseKTerm, char *Str)
+static void Debug_Puts(int UseKTerm, const char *Str)
 {
 	 int	len = 0;
 	while( *Str )
@@ -170,9 +173,10 @@ void Debug_KernelPanic()
 }
 
 /**
- * \fn void LogF(char *Msg, ...)
+ * \fn void LogF(const char *Msg, ...)
+ * \brief Raw debug log (no new line, no prefix)
  */
-void LogF(char *Fmt, ...)
+void LogF(const char *Fmt, ...)
 {
 	va_list	args;
 
@@ -191,10 +195,10 @@ void LogF(char *Fmt, ...)
 	#endif
 }
 /**
- * \fn void Debug(char *Msg, ...)
+ * \fn void Debug(const char *Msg, ...)
  * \brief Print only to the debug channel
  */
-void Debug(char *Fmt, ...)
+void Debug(const char *Fmt, ...)
 {
 	va_list	args;
 	
@@ -213,9 +217,9 @@ void Debug(char *Fmt, ...)
 	#endif
 }
 /**
- * \fn void Log(char *Msg, ...)
+ * \fn void Log(const char *Msg, ...)
  */
-void Log(char *Fmt, ...)
+void Log(const char *Fmt, ...)
 {
 	va_list	args;
 	
@@ -234,7 +238,7 @@ void Log(char *Fmt, ...)
 	SHORTREL(&glDebug_Lock);
 	#endif
 }
-void Warning(char *Fmt, ...)
+void Warning(const char *Fmt, ...)
 {
 	va_list	args;
 	
@@ -253,7 +257,7 @@ void Warning(char *Fmt, ...)
 	SHORTREL(&glDebug_Lock);
 	#endif
 }
-void Panic(char *Fmt, ...)
+void Panic(const char *Fmt, ...)
 {
 	va_list	args;
 	
@@ -278,7 +282,7 @@ void Panic(char *Fmt, ...)
 	for(;;)	__asm__ __volatile__ ("hlt");
 }
 
-void Debug_SetKTerminal(char *File)
+void Debug_SetKTerminal(const char *File)
 {
 	 int	tmp;
 	if(giDebug_KTerm != -1) {
@@ -292,7 +296,7 @@ void Debug_SetKTerminal(char *File)
 	Log_Log("Debug", "Returning to %p", __builtin_return_address(0));
 }
 
-void Debug_Enter(char *FuncName, char *ArgTypes, ...)
+void Debug_Enter(const char *FuncName, const char *ArgTypes, ...)
 {
 	va_list	args;
 	 int	i;
@@ -307,6 +311,7 @@ void Debug_Enter(char *FuncName, char *ArgTypes, ...)
 
 	va_start(args, ArgTypes);
 
+	LogF("%012lli ", now());
 	while(i--)	Debug_Putchar(' ');
 
 	Debug_Puts(1, FuncName);
@@ -316,12 +321,15 @@ void Debug_Enter(char *FuncName, char *ArgTypes, ...)
 	while(*ArgTypes)
 	{
 		pos = strpos(ArgTypes, ' ');
-		if(pos != -1)	ArgTypes[pos] = '\0';
 		if(pos == -1 || pos > 1) {
-			Debug_Puts(1, ArgTypes+1);
+			if(pos == -1)
+				Debug_Puts(1, ArgTypes+1);
+			else {
+				for( i = 1; i < pos; i ++ )
+					Debug_Putchar(ArgTypes[i]);
+			}
 			Debug_Putchar('=');
 		}
-		if(pos != -1)	ArgTypes[pos] = ' ';
 		switch(*ArgTypes)
 		{
 		case 'p':	LogF("%p", va_arg(args, void*));	break;
@@ -349,7 +357,7 @@ void Debug_Enter(char *FuncName, char *ArgTypes, ...)
 	#endif
 }
 
-void Debug_Log(char *FuncName, char *Fmt, ...)
+void Debug_Log(const char *FuncName, const char *Fmt, ...)
 {
 	va_list	args;
 	 int	i = gDebug_Level;
@@ -361,6 +369,7 @@ void Debug_Log(char *FuncName, char *Fmt, ...)
 
 	va_start(args, Fmt);
 
+	LogF("%012lli ", now());
 	while(i--)	Debug_Putchar(' ');
 
 	Debug_Puts(1, FuncName);
@@ -377,7 +386,7 @@ void Debug_Log(char *FuncName, char *Fmt, ...)
 	#endif
 }
 
-void Debug_Leave(char *FuncName, char RetType, ...)
+void Debug_Leave(const char *FuncName, char RetType, ...)
 {
 	va_list	args;
 	 int	i;
@@ -395,6 +404,7 @@ void Debug_Leave(char *FuncName, char RetType, ...)
 		gDebug_Level = 0;
 		i = 0;
 	}
+	LogF("%012lli ", now());
 	// Indenting
 	while(i--)	Debug_Putchar(' ');
 
@@ -434,9 +444,9 @@ void Debug_Leave(char *FuncName, char RetType, ...)
 	#endif
 }
 
-void Debug_HexDump(char *Header, void *Data, Uint Length)
+void Debug_HexDump(const char *Header, const void *Data, Uint Length)
 {
-	Uint8	*cdat = Data;
+	const Uint8	*cdat = Data;
 	Uint	pos = 0;
 	Debug_Puts(1, Header);
 	LogF(" (Hexdump of %p)\r\n", Data);