#define LOCK_DEBUG_OUTPUT 1
// === IMPORTS ===
-extern void Threads_Dump(void);
+extern void Threads_Dump(void);
extern void KernelPanic_SetMode(void);
extern void KernelPanic_PutChar(char Ch);
va_start(args, Fmt);
Debug_DbgOnlyFmt(Fmt, args);
va_end(args);
- Debug_PutCharDebug('\r');
Debug_PutCharDebug('\n');
#if LOCK_DEBUG_OUTPUT
SHORTREL(&glDebug_Lock);
va_start(args, Fmt);
Debug_Fmt(Fmt, args);
va_end(args);
- Debug_Putchar('\r');
Debug_Putchar('\n');
#if LOCK_DEBUG_OUTPUT
va_start(args, Fmt);
Debug_Fmt(Fmt, args);
va_end(args);
- Debug_Putchar('\r');
Debug_Putchar('\n');
#if LOCK_DEBUG_OUTPUT
va_start(args, Fmt);
Debug_Fmt(Fmt, args);
va_end(args);
- Debug_Putchar('\r');
Debug_Putchar('\n');
Threads_Dump();
va_start(args, ArgTypes);
- LogF("%012lli ", now());
+ LogF("%014lli ", now());
while(i--) Debug_Putchar(' ');
Debug_Puts(1, FuncName);
}
va_end(args);
- Debug_Putchar(')'); Debug_Putchar('\r'); Debug_Putchar('\n');
+ Debug_Putchar(')'); Debug_Putchar('\n');
#if LOCK_DEBUG_OUTPUT
SHORTREL(&glDebug_Lock);
va_start(args, Fmt);
- LogF("%012lli ", now());
+ LogF("%014lli ", now());
while(i--) Debug_Putchar(' ');
Debug_Puts(1, FuncName);
Debug_Fmt(Fmt, args);
va_end(args);
- Debug_Putchar('\r');
Debug_Putchar('\n');
#if LOCK_DEBUG_OUTPUT
gDebug_Level = 0;
i = 0;
}
- LogF("%012lli ", now());
+ LogF("%014lli ", now());
// Indenting
while(i--) Debug_Putchar(' ');
// No Return
if(RetType == '-') {
- Debug_Putchar('\r');
Debug_Putchar('\n');
#if LOCK_DEBUG_OUTPUT
SHORTREL(&glDebug_Lock);
// Extended (64-Bit)
case 'X': Debug_Fmt("0x%llx", args); break;
}
- Debug_Putchar('\r');
Debug_Putchar('\n');
va_end(args);
{
const Uint8 *cdat = Data;
Uint pos = 0;
+ LogF("%014lli ", now());
Debug_Puts(1, Header);
- LogF(" (Hexdump of %p)\r\n", Data);
+ LogF(" (Hexdump of %p)\n", Data);
- #define CH(n) ((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.')
+ #define CH(n) ((' '<=cdat[(n)]&&cdat[(n)]<0x7F) ? cdat[(n)] : '.')
while(Length >= 16)
{
- Log("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
+ LogF("%014lli Log: %04x:"
" %02x %02x %02x %02x %02x %02x %02x %02x"
- " %c%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c",
+ " %02x %02x %02x %02x %02x %02x %02x %02x"
+ " %c%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c\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],
+ 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)
);
{
int i ;
- LogF("Log: %04x: ", pos);
+ LogF("%014lli Log: %04x: ", now(), pos);
for(i = 0; i < Length; i ++)
{
LogF("%02x ", cdat[i]);
if( i == 8 ) LogF(" ");
LogF("%c", CH(i));
}
- }
- Debug_Putchar('\r');
- Debug_Putchar('\n');
+ Debug_Putchar('\n');
+ }
}
// --- EXPORTS ---