X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FDiskTool%2Fsrc%2Flogging.c;h=07d7a522f77f2eba5b9609054d6454186eae4579;hb=e4342ad9de52043cb8f820643794dc44076f9bd9;hp=fde905525cfa8bbc17e1630d19a8360ba2165814;hpb=11dbd684e9a3d907d43d71a3145205f1a86992fb;p=tpg%2Facess2.git

diff --git a/Tools/DiskTool/src/logging.c b/Tools/DiskTool/src/logging.c
index fde90552..07d7a522 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, "?");
@@ -177,12 +181,18 @@ void Debug_TraceLeave(const char *Function, char Type, ...)
 	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;
+	case 'n':
+		fprintf(stderr, " NULL");
+		break;
 	default:
 		fprintf(stderr, " ?");
 		break;