IRQ_GETSTATE(): New macro; Rename IRQ macros for consistency.

[bertos.git] / debug.h

diff --git a/debug.h b/debug.h
index edd3c5db6c22a96cf1d50c09b425f504f644ab18..7daee2c38ab97db2756f9c8cea9f038940ec7585 100755 (executable)
--- a/debug.h
+++ b/debug.h
@@ -17,6 +17,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.3  2004/09/20 03:31:27  bernie
+ *#* Sanitize for C++.
+ *#*
+ *#* Revision 1.2  2004/09/14 21:01:46  bernie
+ *#* Mark assertions as LIKELY().
+ *#*
  *#* Revision 1.1  2004/09/14 20:19:47  bernie
  *#* Unified debug macros.
  *#*
@@ -162,7 +168,7 @@
                #define ASSERT_VALID_PTR_OR_NULL(p)  ASSERT((((p) == NULL) || ((unsigned long)(p) >= 0x200)))
        #else /* !OS_HOSTED */
 
-               /* Implemented in drv/kdebug.h */
+               /* These are implemented in drv/kdebug.c */
                void kdbg_init(void);
                void kputchar(char c);
                void kdump(const void *buf, size_t len);
@@ -188,18 +194,17 @@
                int __check_wall(long *wall, int size, const char *name, const char *file, int line);
 
                #ifndef CONFIG_KDEBUG_ASSERT_NO_TEXT
-                       #define ASSERT(x)                   ((x) ? 0 : __assert(#x, THIS_FILE, __LINE__))
-                       #define ASSERT2(x, help)            ((x) ? 0 : __assert(help " (" #x ")", THIS_FILE, __LINE__))
+                       #define ASSERT(x)         ((void)(LIKELY(x) ? 0 : __assert(#x, THIS_FILE, __LINE__)))
+                       #define ASSERT2(x, help)  ((void)(LIKELY(x) ? 0 : __assert(help " (" #x ")", THIS_FILE, __LINE__)))
                #else
-                       #define ASSERT(x)                   ((x) ? 0 : __assert("", THIS_FILE, __LINE__))
-                       #define ASSERT2(x, help)            ASSERT(x)
+                       #define ASSERT(x)         ((void)(LIKELY(x) ? 0 : __assert("", THIS_FILE, __LINE__)))
+                       #define ASSERT2(x, help)  ((void)ASSERT(x))
                #endif
 
-               #define ASSERT_VALID_PTR(p)             (((p) >= 0x200) ? 0 : __invalid_ptr(p, #p, THIS_FILE, __LINE__))
-               #define ASSERT_VALID_PTR_OR_NULL(p)     (((p == NULL) || ((p) >= 0x200)) ? 0 : __invalid_ptr((p), #p, THIS_FILE, __LINE__))
-               #define TRACE                           kprintf("%s()\n", __FUNCTION__)
-               #define TRACEMSG(msg,...)               kprintf("%s(): " msg "\n", __FUNCTION__, ## __VA_ARGS__)
-
+               #define ASSERT_VALID_PTR(p)         ((void)(LIKELY((p) >= 0x200) ? 0 : __invalid_ptr(p, #p, THIS_FILE, __LINE__)))
+               #define ASSERT_VALID_PTR_OR_NULL(p) ((void)(LIKELY((p == NULL) || ((p) >= 0x200)) ? 0 : __invalid_ptr((p), #p, THIS_FILE, __LINE__)))
+               #define TRACE                       kprintf("%s()\n", __FUNCTION__)
+               #define TRACEMSG(msg,...)           kprintf("%s(): " msg "\n", __FUNCTION__, ## __VA_ARGS__)
 
        #endif /* !OS_HOSTED */
 
@@ -305,7 +310,13 @@
        INLINE void kdbg_init(void) { /* nop */ }
        INLINE void kputchar(UNUSED(char, c)) { /* nop */ }
        INLINE void kputs(UNUSED(const char*, str)) { /* nop */ }
-       INLINE void kprintf(UNUSED(const char*, fmt), ...) { /* nop */ }
+       #ifdef __cplusplus
+               /* G++ can't inline functions with variable arguments... */
+               #define kprintf(fmt,...) do { (void)(fmt); } while(0)
+       #else
+               /* ...but GCC can. */
+               INLINE void kprintf(UNUSED(const char*, fmt), ...) { /* nop */ }
+       #endif
 
 #endif /* _DEBUG */