Merge branch 'master' of git://localhost/acess2

[tpg/acess2.git] / Tools / DiskTool / src / logging.c

diff --git a/Tools/DiskTool/src/logging.c b/Tools/DiskTool/src/logging.c
index fde9055..0cb3ed3 100644 (file)
--- 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")
@@ -66,7 +67,7 @@ void Debug_HexDump(const char *Prefix, const void *Data, size_t Length)
        fprintf(stderr, "[HexDump ]d %s:", Prefix);
        for( ; ofs < Length; ofs ++ )
        {
-               if( ofs % 16 == 8 )     fprintf(stderr, " ");
+               if( ofs % 8 == 0 )      fprintf(stderr, " ");
                fprintf(stderr, " %02x", data[ofs%16]);
        }
        fprintf(stderr, "\n");
@@ -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;