VT100 - Replace global buffer with per-terminal, further implementation of escape...

[tpg/acess2.git] / KernelLand / Kernel / include / logdebug.h

diff --git a/KernelLand/Kernel/include/logdebug.h b/KernelLand/Kernel/include/logdebug.h
index 340dda9..0710c6b 100644 (file)
--- 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
@@ -43,6 +47,7 @@ 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__)
 #if DEBUG
 # define ENTER(_types...)      Debug_Enter((char*)__func__, _types)
@@ -59,7 +64,7 @@ extern void   Debug_HexDump(const char *Header, const void *Data, size_t Length);
 #endif
 #if !DISABLE_ASSERTS
 # 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: Assertion '"#expr"' failed"msg,__FILE__,__LINE__,(char*)__func__ , ##args);return rv;}}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 ASSERTV(expr)
 # define ASSERTRV(expr)