X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Finclude%2Flogdebug.h;h=39bdba388b5bab053a92f9bd76e5c8c489d73093;hb=31bf9d6faae9630f2de1244fc4317fc91db8bc07;hp=c2faf7d23fb97040ea1ad91097efd5678c451130;hpb=015f48988e0ff398409d71dfc692005ab439490a;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/include/logdebug.h b/KernelLand/Kernel/include/logdebug.h
index c2faf7d2..39bdba38 100644
--- a/KernelLand/Kernel/include/logdebug.h
+++ b/KernelLand/Kernel/include/logdebug.h
@@ -10,6 +10,10 @@
 
 #include <stdarg.h>
 
+#ifndef NORETURN
+#define NORETURN	__attribute__((noreturn))
+#endif
+
 // --- Logging ---
 /**
  * \name Logging to kernel ring buffer
@@ -32,9 +36,9 @@ 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, ...);	//!< Print a panic message (initiates 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)
@@ -43,7 +47,9 @@ extern void	Debug_Enter(const char *FuncName, const char *ArgTypes, ...);
 extern void	Debug_Log(const char *FuncName, const char *Fmt, ...);
 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)
@@ -58,10 +64,17 @@ extern void	Debug_HexDump(const char *Header, const void *Data, size_t Length);
 # define LEAVE_RET0()	return
 #endif
 #if !DISABLE_ASSERTS
-# define ASSERT(expr) do{if(!(expr))Panic("%s:%i - %s: Assertion '"#expr"' failed",__FILE__,__LINE__,(char*)__func__);}while(0)
+# define ASSERTV(expr,msg,args...) do{if(!(expr))Panic("%s:%i - %s: Assertion '"#expr"' failed"msg,__FILE__,__LINE__,(char*)__func__,##args);}while(0)
+# define ASSERTRV(expr,rv,msg,args...)	do{if(!(expr)){Warning("%s:%i - %s: Assertion '"#expr"' failed"msg,__FILE__,__LINE__,(char*)__func__ , ##args);return rv;}}while(0)
 #else
-# define ASSERT(expr)
+# define ASSERTV(expr)
+# define ASSERTRV(expr)
 #endif
+#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)
 /**
  * \}
  */