git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SpiderScript - Bugs, Documentation and a few language features
[tpg/acess2.git]
/
Kernel
/
debug.c
diff --git
a/Kernel/debug.c
b/Kernel/debug.c
index
66c2059
..
f59704a
100644
(file)
--- a/
Kernel/debug.c
+++ b/
Kernel/debug.c
@@
-13,6
+13,8
@@
#define GDB_SERIAL_PORT 0x2F8
#define DEBUG_MAX_LINE_LEN 256
#define GDB_SERIAL_PORT 0x2F8
#define DEBUG_MAX_LINE_LEN 256
+#define LOCK_DEBUG_OUTPUT 1
+
// === IMPORTS ===
extern void Threads_Dump(void);
extern void KernelPanic_SetMode(void);
// === IMPORTS ===
extern void Threads_Dump(void);
extern void KernelPanic_SetMode(void);
@@
-22,8
+24,11
@@
extern void KernelPanic_PutChar(char Ch);
int putDebugChar(char ch);
int getDebugChar(void);
static void Debug_Putchar(char ch);
int putDebugChar(char ch);
int getDebugChar(void);
static void Debug_Putchar(char ch);
-static void Debug_Puts(int DbgOnly, char *Str);
+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_Fmt(const char *format, va_list args);
+void Debug_SetKTerminal(const char *File);
// === GLOBALS ===
int gDebug_Level = 0;
// === GLOBALS ===
int gDebug_Level = 0;
@@
-32,6
+37,9
@@
void Debug_Fmt(const char *format, va_list args);
int gbGDB_SerialSetup = 0;
int gbDebug_IsKPanic = 0;
volatile int gbInPutChar = 0;
int gbGDB_SerialSetup = 0;
int gbDebug_IsKPanic = 0;
volatile int gbInPutChar = 0;
+#if LOCK_DEBUG_OUTPUT
+tShortSpinlock glDebug_Lock;
+#endif
// === CODE ===
int putDebugChar(char ch)
// === CODE ===
int putDebugChar(char ch)
@@
-103,7
+111,7
@@
static void Debug_Putchar(char ch)
KernelPanic_PutChar(ch);
}
KernelPanic_PutChar(ch);
}
-static void Debug_Puts(int UseKTerm, char *Str)
+static void Debug_Puts(int UseKTerm, c
onst c
har *Str)
{
int len = 0;
while( *Str )
{
int len = 0;
while( *Str )
@@
-150,6
+158,14
@@
void Debug_Fmt(const char *format, va_list args)
return ;
}
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;
void Debug_KernelPanic()
{
gbDebug_IsKPanic = 1;
@@
-157,25
+173,38
@@
void Debug_KernelPanic()
}
/**
}
/**
- * \fn void LogF(char *Msg, ...)
+ * \fn void LogF(const char *Msg, ...)
+ * \brief Raw debug log (no new line, no prefix)
*/
*/
-void LogF(char *Fmt, ...)
+void LogF(c
onst c
har *Fmt, ...)
{
va_list args;
{
va_list args;
+ #if LOCK_DEBUG_OUTPUT
+ SHORTLOCK(&glDebug_Lock);
+ #endif
+
va_start(args, Fmt);
Debug_Fmt(Fmt, args);
va_end(args);
va_start(args, Fmt);
Debug_Fmt(Fmt, args);
va_end(args);
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
}
/**
}
/**
- * \fn void Debug(char *Msg, ...)
+ * \fn void Debug(c
onst c
har *Msg, ...)
* \brief Print only to the debug channel
*/
* \brief Print only to the debug channel
*/
-void Debug(char *Fmt, ...)
+void Debug(c
onst c
har *Fmt, ...)
{
va_list args;
{
va_list args;
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTLOCK(&glDebug_Lock);
+ #endif
Debug_Puts(0, "Debug: ");
va_start(args, Fmt);
Debug_Puts(0, "Debug: ");
va_start(args, Fmt);
@@
-183,13
+212,20
@@
void Debug(char *Fmt, ...)
va_end(args);
Debug_PutCharDebug('\r');
Debug_PutCharDebug('\n');
va_end(args);
Debug_PutCharDebug('\r');
Debug_PutCharDebug('\n');
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
}
/**
}
/**
- * \fn void Log(char *Msg, ...)
+ * \fn void Log(c
onst c
har *Msg, ...)
*/
*/
-void Log(char *Fmt, ...)
+void Log(c
onst c
har *Fmt, ...)
{
va_list args;
{
va_list args;
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTLOCK(&glDebug_Lock);
+ #endif
Debug_Puts(1, "Log: ");
va_start(args, Fmt);
Debug_Puts(1, "Log: ");
va_start(args, Fmt);
@@
-197,21
+233,39
@@
void Log(char *Fmt, ...)
va_end(args);
Debug_Putchar('\r');
Debug_Putchar('\n');
va_end(args);
Debug_Putchar('\r');
Debug_Putchar('\n');
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
}
}
-void Warning(char *Fmt, ...)
+void Warning(c
onst c
har *Fmt, ...)
{
va_list args;
{
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');
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(char *Fmt, ...)
+void Panic(c
onst c
har *Fmt, ...)
{
va_list args;
{
va_list args;
+ #if LOCK_DEBUG_OUTPUT
+ SHORTLOCK(&glDebug_Lock);
+ #endif
+ // And never SHORTREL
+
Debug_KernelPanic();
Debug_Puts(1, "Panic: ");
Debug_KernelPanic();
Debug_Puts(1, "Panic: ");
@@
-228,7
+282,7
@@
void Panic(char *Fmt, ...)
for(;;) __asm__ __volatile__ ("hlt");
}
for(;;) __asm__ __volatile__ ("hlt");
}
-void Debug_SetKTerminal(char *File)
+void Debug_SetKTerminal(c
onst c
har *File)
{
int tmp;
if(giDebug_KTerm != -1) {
{
int tmp;
if(giDebug_KTerm != -1) {
@@
-242,27
+296,40
@@
void Debug_SetKTerminal(char *File)
Log_Log("Debug", "Returning to %p", __builtin_return_address(0));
}
Log_Log("Debug", "Returning to %p", __builtin_return_address(0));
}
-void Debug_Enter(c
har *FuncName,
char *ArgTypes, ...)
+void Debug_Enter(c
onst char *FuncName, const
char *ArgTypes, ...)
{
va_list args;
{
va_list args;
- int i
= gDebug_Level ++
;
+ int i;
int pos;
int pos;
+ tTID tid = Threads_GetTID();
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTLOCK(&glDebug_Lock);
+ #endif
+
+ i = gDebug_Level ++;
va_start(args, ArgTypes);
va_start(args, ArgTypes);
+ LogF("%012lli ", now());
while(i--) Debug_Putchar(' ');
while(i--) Debug_Putchar(' ');
- Debug_Puts(1, FuncName); Debug_Puts(1, ": (");
+ Debug_Puts(1, FuncName);
+ Debug_FmtS("[%i]", tid);
+ Debug_Puts(1, ": (");
while(*ArgTypes)
{
pos = strpos(ArgTypes, ' ');
while(*ArgTypes)
{
pos = strpos(ArgTypes, ' ');
- if(pos != -1) ArgTypes[pos] = '\0';
if(pos == -1 || pos > 1) {
if(pos == -1 || pos > 1) {
- Debug_Puts(1, ArgTypes+1);
+ if(pos == -1)
+ Debug_Puts(1, ArgTypes+1);
+ else {
+ for( i = 1; i < pos; i ++ )
+ Debug_Putchar(ArgTypes[i]);
+ }
Debug_Putchar('=');
}
Debug_Putchar('=');
}
- if(pos != -1) ArgTypes[pos] = ' ';
switch(*ArgTypes)
{
case 'p': LogF("%p", va_arg(args, void*)); break;
switch(*ArgTypes)
{
case 'p': LogF("%p", va_arg(args, void*)); break;
@@
-284,29
+351,52
@@
void Debug_Enter(char *FuncName, char *ArgTypes, ...)
va_end(args);
Debug_Putchar(')'); Debug_Putchar('\r'); Debug_Putchar('\n');
va_end(args);
Debug_Putchar(')'); Debug_Putchar('\r'); Debug_Putchar('\n');
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
}
}
-void Debug_Log(c
har *FuncName,
char *Fmt, ...)
+void Debug_Log(c
onst char *FuncName, const
char *Fmt, ...)
{
va_list args;
int i = gDebug_Level;
{
va_list args;
int i = gDebug_Level;
+ tTID tid = Threads_GetTID();
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTLOCK(&glDebug_Lock);
+ #endif
va_start(args, Fmt);
va_start(args, Fmt);
+ LogF("%012lli ", now());
while(i--) Debug_Putchar(' ');
while(i--) Debug_Putchar(' ');
- Debug_Puts(1, FuncName); Debug_Puts(1, ": ");
+ Debug_Puts(1, FuncName);
+ Debug_FmtS("[%i]", tid);
+ Debug_Puts(1, ": ");
Debug_Fmt(Fmt, args);
va_end(args);
Debug_Putchar('\r');
Debug_Putchar('\n');
Debug_Fmt(Fmt, args);
va_end(args);
Debug_Putchar('\r');
Debug_Putchar('\n');
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
}
}
-void Debug_Leave(char *FuncName, char RetType, ...)
+void Debug_Leave(c
onst c
har *FuncName, char RetType, ...)
{
va_list args;
{
va_list args;
- int i = --gDebug_Level;
+ int i;
+ tTID tid = Threads_GetTID();
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTLOCK(&glDebug_Lock);
+ #endif
+
+ i = --gDebug_Level;
va_start(args, RetType);
va_start(args, RetType);
@@
-314,15
+404,21
@@
void Debug_Leave(char *FuncName, char RetType, ...)
gDebug_Level = 0;
i = 0;
}
gDebug_Level = 0;
i = 0;
}
+ LogF("%012lli ", now());
// Indenting
while(i--) Debug_Putchar(' ');
// Indenting
while(i--) Debug_Putchar(' ');
- Debug_Puts(1, FuncName); Debug_Puts(1, ": RETURN");
+ Debug_Puts(1, FuncName);
+ Debug_FmtS("[%i]", tid);
+ Debug_Puts(1, ": RETURN");
// No Return
if(RetType == '-') {
Debug_Putchar('\r');
Debug_Putchar('\n');
// No Return
if(RetType == '-') {
Debug_Putchar('\r');
Debug_Putchar('\n');
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
return;
}
return;
}
@@
-342,18
+438,23
@@
void Debug_Leave(char *FuncName, char RetType, ...)
Debug_Putchar('\n');
va_end(args);
Debug_Putchar('\n');
va_end(args);
+
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
}
}
-void Debug_HexDump(c
har *Header,
void *Data, Uint Length)
+void Debug_HexDump(c
onst char *Header, const
void *Data, Uint Length)
{
{
-
Uint8
*cdat = Data;
+
const Uint8
*cdat = Data;
Uint pos = 0;
Debug_Puts(1, Header);
LogF(" (Hexdump of %p)\r\n", Data);
Uint pos = 0;
Debug_Puts(1, Header);
LogF(" (Hexdump of %p)\r\n", Data);
+ #define CH(n) ((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.')
+
while(Length >= 16)
{
while(Length >= 16)
{
- #define CH(n) ((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.')
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",
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",
@@
-368,14
+469,22
@@
void Debug_HexDump(char *Header, void *Data, Uint Length)
pos += 16;
}
pos += 16;
}
- LogF("Log: %04x: ", pos);
- while(Length)
{
{
- Uint byte = *cdat;
- LogF("%02x ", byte);
- Length--;
- cdat ++;
+ int i ;
+ LogF("Log: %04x: ", 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');
}
Debug_Putchar('\r');
Debug_Putchar('\n');
}
UCC
git Repository :: git.ucc.asn.au