X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdebug.c;h=db67f49601f6c4ca18fe059f60bb1766d6ca5c62;hb=HEAD;hp=0ad746974ee70ca1a0da63a591d120aca9b1aceb;hpb=9dc3cf2a69c5c4563091f37a06eece1723f51d0d;p=tpg%2Facess2.git

diff --git a/Kernel/debug.c b/Kernel/debug.c
deleted file mode 100644
index 0ad74697..00000000
--- a/Kernel/debug.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * AcessOS Microkernel Version
- * debug.c
- * 
- * TODO: Move the Debug_putchar methods out to the arch/ tree
- */
-#include <acess.h>
-#include <stdarg.h>
-
-#define	DEBUG_MAX_LINE_LEN	256
-
-#define	LOCK_DEBUG_OUTPUT	1
-
-// === IMPORTS ===
-extern void	Threads_Dump(void);
-extern void	KernelPanic_SetMode(void);
-extern void	KernelPanic_PutChar(char Ch);
-
-// === PROTOTYPES ===
-static void	Debug_Putchar(char ch);
-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;
- int	giDebug_KTerm = -1;
- int	gbDebug_IsKPanic = 0;
-volatile int	gbInPutChar = 0;
-#if LOCK_DEBUG_OUTPUT
-tShortSpinlock	glDebug_Lock;
-#endif
-
-// === CODE ===
-static void Debug_Putchar(char ch)
-{	
-	Debug_PutCharDebug(ch);
-	if( !gbDebug_IsKPanic )
-	{
-		if(gbInPutChar)	return ;
-		gbInPutChar = 1;
-		if(giDebug_KTerm != -1)
-			VFS_Write(giDebug_KTerm, 1, &ch);
-		gbInPutChar = 0;
-	}
-	else
-		KernelPanic_PutChar(ch);
-}
-
-static void Debug_Puts(int UseKTerm, const char *Str)
-{
-	 int	len = 0;
-	
-	Debug_PutStringDebug(Str);
-	
-	if( gbDebug_IsKPanic )
-	{		
-		for( len = 0; Str[len]; len ++ )
-			KernelPanic_PutChar( Str[len] );
-	}
-	else
-		for( len = 0; Str[len]; len ++ );
-	
-	// Output to the kernel terminal
-	if( UseKTerm && !gbDebug_IsKPanic && giDebug_KTerm != -1)
-	{
-		if(gbInPutChar)	return ;
-		gbInPutChar = 1;
-		VFS_Write(giDebug_KTerm, len, Str);
-		gbInPutChar = 0;
-	}
-}
-
-void Debug_DbgOnlyFmt(const char *format, va_list args)
-{
-	char	buf[DEBUG_MAX_LINE_LEN];
-	 int	len;
-	buf[DEBUG_MAX_LINE_LEN-1] = 0;
-	len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
-	//if( len < DEBUG_MAX_LINE )
-		// do something
-	Debug_Puts(0, buf);
-}
-
-void Debug_Fmt(const char *format, va_list args)
-{
-	char	buf[DEBUG_MAX_LINE_LEN];
-	 int	len;
-	buf[DEBUG_MAX_LINE_LEN-1] = 0;
-	len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
-	//if( len < DEBUG_MAX_LINE )
-		// do something
-	Debug_Puts(1, buf);
-	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;
-	KernelPanic_SetMode();
-}
-
-/**
- * \fn void LogF(const char *Msg, ...)
- * \brief Raw debug log (no new line, no prefix)
- */
-void LogF(const 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(const char *Msg, ...)
- * \brief Print only to the debug channel (not KTerm)
- */
-void Debug(const 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(const char *Msg, ...)
- */
-void Log(const 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(const 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(const 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();
-
-//	__asm__ __volatile__ ("xchg %bx, %bx");
-//	__asm__ __volatile__ ("cli;\n\thlt");
-//	for(;;)	__asm__ __volatile__ ("hlt");
-	for(;;)	;
-}
-
-void Debug_SetKTerminal(const char *File)
-{
-	 int	tmp;
-	if(giDebug_KTerm != -1) {
-		tmp = giDebug_KTerm;
-		giDebug_KTerm = -1;
-		VFS_Close(tmp);
-	}
-	tmp = VFS_Open(File, VFS_OPENFLAG_WRITE);
-	Log_Log("Debug", "Opened '%s' as 0x%x", File, tmp);
-	giDebug_KTerm = tmp;
-	Log_Log("Debug", "Returning to %p", __builtin_return_address(0));
-}
-
-void Debug_Enter(const char *FuncName, const char *ArgTypes, ...)
-{
-	va_list	args;
-	 int	i;
-	 int	pos;
-	tTID	tid = Threads_GetTID();
-	 
-	#if LOCK_DEBUG_OUTPUT
-	SHORTLOCK(&glDebug_Lock);
-	#endif
-
-	i = gDebug_Level ++;
-
-	va_start(args, ArgTypes);
-
-	LogF("%014lli ", now());
-	while(i--)	Debug_Putchar(' ');
-
-	Debug_Puts(1, FuncName);
-	Debug_FmtS("[%i]", tid);
-	Debug_Puts(1, ": (");
-
-	while(*ArgTypes)
-	{
-		pos = strpos(ArgTypes, ' ');
-		if(pos == -1 || pos > 1) {
-			if(pos == -1)
-				Debug_Puts(1, ArgTypes+1);
-			else {
-				for( i = 1; i < pos; i ++ )
-					Debug_Putchar(ArgTypes[i]);
-			}
-			Debug_Putchar('=');
-		}
-		switch(*ArgTypes)
-		{
-		case 'p':	LogF("%p", va_arg(args, void*));	break;
-		case 's':	LogF("'%s'", va_arg(args, char*));	break;
-		case 'i':	LogF("%i", va_arg(args, int));	break;
-		case 'u':	LogF("%u", va_arg(args, Uint));	break;
-		case 'x':	LogF("0x%x", va_arg(args, Uint));	break;
-		case 'b':	LogF("0b%b", va_arg(args, Uint));	break;
-		case 'X':	LogF("0x%llx", va_arg(args, Uint64));	break;	// Extended (64-Bit)
-		case 'B':	LogF("0b%llb", va_arg(args, Uint64));	break;	// Extended (64-Bit)
-		}
-		if(pos != -1) {
-			Debug_Putchar(',');	Debug_Putchar(' ');
-		}
-
-		if(pos == -1)	break;
-		ArgTypes = &ArgTypes[pos+1];
-	}
-
-	va_end(args);
-	Debug_Putchar(')');	Debug_Putchar('\r');	Debug_Putchar('\n');
-	
-	#if LOCK_DEBUG_OUTPUT
-	SHORTREL(&glDebug_Lock);
-	#endif
-}
-
-void Debug_Log(const char *FuncName, const 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);
-
-	LogF("%014lli ", now());
-	while(i--)	Debug_Putchar(' ');
-
-	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(const char *FuncName, char RetType, ...)
-{
-	va_list	args;
-	 int	i;
-	tTID	tid = Threads_GetTID();
-
-	#if LOCK_DEBUG_OUTPUT
-	SHORTLOCK(&glDebug_Lock);
-	#endif
-	
-	i = --gDebug_Level;
-
-	va_start(args, RetType);
-
-	if( i == -1 ) {
-		gDebug_Level = 0;
-		i = 0;
-	}
-	LogF("%014lli ", now());
-	// Indenting
-	while(i--)	Debug_Putchar(' ');
-
-	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;
-	}
-
-	Debug_Putchar(' ');
-	switch(RetType)
-	{
-	case 'n':	Debug_Puts(1, "NULL");	break;
-	case 'p':	Debug_Fmt("%p", args);	break;
-	case 's':	Debug_Fmt("'%s'", args);	break;
-	case 'i':	Debug_Fmt("%i", args);	break;
-	case 'u':	Debug_Fmt("%u", args);	break;
-	case 'x':	Debug_Fmt("0x%x", args);	break;
-	// 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(const char *Header, const void *Data, Uint Length)
-{
-	const Uint8	*cdat = Data;
-	Uint	pos = 0;
-	LogF("%014lli ", now());
-	Debug_Puts(1, Header);
-	LogF(" (Hexdump of %p)\r\n", Data);
-
-	#define	CH(n)	((' '<=cdat[(n)]&&cdat[(n)]<0x7F) ? cdat[(n)] : '.')
-
-	while(Length >= 16)
-	{
-		LogF("%014lli 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\r\n",
-			now(),
-			pos,
-			cdat[ 0], cdat[ 1], cdat[ 2], cdat[ 3], cdat[ 4], cdat[ 5], cdat[ 6], cdat[ 7],
-			cdat[ 8], cdat[ 9], cdat[10], cdat[11], cdat[12], cdat[13], cdat[14], cdat[15],
-			CH(0),	CH(1),	CH(2),	CH(3),	CH(4),	CH(5),	CH(6),	CH(7),
-			CH(8),	CH(9),	CH(10),	CH(11),	CH(12),	CH(13),	CH(14),	CH(15)
-			);
-		Length -= 16;
-		cdat += 16;
-		pos += 16;
-	}
-
-	{
-		 int	i ;
-		LogF("%014lli Log: %04x: ", now(), 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');
-	}
-}
-
-// --- EXPORTS ---
-EXPORT(Debug);
-EXPORT(Log);
-EXPORT(Warning);
-EXPORT(Debug_Enter);
-EXPORT(Debug_Log);
-EXPORT(Debug_Leave);