X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FDiskTool%2Fsrc%2Flogging.c;h=2b03c6ff0b4ef16983513c7590b0d1784d30c510;hb=151e0400c6cf69d71a51e49bc75fac3d7bdfc2f7;hp=3a0d9f1ef17b73251161367589ec32c1462718ba;hpb=c6944db0d69feec15477318c21c9019392f4be73;p=tpg%2Facess2.git

diff --git a/Tools/DiskTool/src/logging.c b/Tools/DiskTool/src/logging.c
index 3a0d9f1e..2b03c6ff 100644
--- a/Tools/DiskTool/src/logging.c
+++ b/Tools/DiskTool/src/logging.c
@@ -7,6 +7,7 @@
 #include <stdint.h>
 #include <acess_logging.h>
 #include <ctype.h>
+#include <inttypes.h>
 
 #define LOGHDR(col,type)	fprintf(stderr, "\e["col"m[%-8.8s]"type" ", Ident)
 #define LOGTAIL()	fprintf(stderr, "\e[0m\n")
@@ -22,7 +23,7 @@
 // === CODE ===
 void Log_KernelPanic(const char *Ident, const char *Message, ...) {
 	PUTERR("35", "k")
-	exit(-1);
+	abort();
 }
 void Log_Panic(const char *Ident, const char *Message, ...)
 	PUTERR("34", "p")
@@ -116,6 +117,9 @@ void Debug_TraceEnter(const char *Function, const char *Format, ...)
 		case 'x':
 			fprintf(stderr, "0x%x", va_arg(args,unsigned int));
 			break;
+		case 'X':
+			fprintf(stderr, "0x%"PRIx64, va_arg(args,uint64_t));
+			break;
 		default:
 			va_arg(args,uintptr_t);
 			fprintf(stderr, "?");
@@ -174,9 +178,18 @@ void Debug_TraceLeave(const char *Function, char Type, ...)
 	case 'i':
 		fprintf(stderr, " %i", va_arg(args, int));
 		break;
-	case 'p':
+	case 'x':
+		fprintf(stderr, " 0x%x", va_arg(args, unsigned int));
+		break;
+	case 'X':
+		fprintf(stderr, " 0x%"PRIx64, va_arg(args,uint64_t));
+		break;
+	case 's':
 		fprintf(stderr, " \"%s\"", va_arg(args, const char *));
 		break;
+	case 'p':
+		fprintf(stderr, " %p", va_arg(args, const void *));
+		break;
 	default:
 		fprintf(stderr, " ?");
 		break;