X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Finclude%2Flogdebug.h;fp=KernelLand%2FKernel%2Finclude%2Flogdebug.h;h=f13187e67f5ff065b41940b63dba530c8d88c100;hb=845b6f9d90bb87b5e760e4d49aa93b0e003ab750;hp=0710c6bc2cae9d901bb36f79e4940e224761840f;hpb=67a7fe2bb79eceaf10c572a99bd8345c4e81cf5b;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/include/logdebug.h b/KernelLand/Kernel/include/logdebug.h index 0710c6bc..f13187e6 100644 --- a/KernelLand/Kernel/include/logdebug.h +++ b/KernelLand/Kernel/include/logdebug.h @@ -38,7 +38,7 @@ extern void Log_Debug(const char *Ident, const char *Message, ...); extern void Debug_KernelPanic(void); //!< Initiate a kernel panic extern void Panic(const char *Msg, ...) NORETURN; //!< Print a panic message (initiates a kernel panic) extern void Warning(const char *Msg, ...); //!< Print a warning message -extern void LogF(const char *Fmt, ...); //!< Print a log message without a trailing newline +extern bool LogF(const char *Fmt, ...); //!< Print a log message without a trailing newline extern void LogFV(const char *Fmt, va_list Args); //!< va_list non-newline log message extern void Log(const char *Fmt, ...); //!< Print a log message extern void Debug(const char *Fmt, ...); //!< Print a debug message (doesn't go to KTerm) @@ -49,6 +49,7 @@ extern void Debug_Leave(const char *FuncName, char RetType, ...); extern void Debug_HexDump(const char *Header, const void *Data, size_t Length); #define UNIMPLEMENTED() Warning("'%s' unimplemented", __func__) +#define TODO(fmt, ...) Panic("TODO: ", fmt ,## __VA_ARGS__) #if DEBUG # define ENTER(_types...) Debug_Enter((char*)__func__, _types) # define LOG(_fmt...) Debug_Log((char*)__func__, _fmt) @@ -72,8 +73,8 @@ extern void Debug_HexDump(const char *Header, const void *Data, size_t Length); #define assert(expr) ASSERTV(expr, "") #define ASSERT(expr) ASSERTV(expr, "") #define ASSERTR(expr,rv) ASSERTRV(expr, rv, "") -#define ASSERTC(l,rel,r) ASSERTV(l rel r, ": 0x%x"#rel"0x%x", l, r) -#define ASSERTCR(l,rel,r,rv) ASSERTRV(l rel r, rv, ": 0x%x"#rel"0x%x", l, r) +#define ASSERTC(l,rel,r) ASSERTV ((l) rel (r), ": 0x%x"#rel"0x%x", (Uint)l, (Uint)r) +#define ASSERTCR(l,rel,r,rv) ASSERTRV((l) rel (r), rv, ": 0x%x"#rel"0x%x", (Uint)l, (Uint)r) /** * \} */