Changes in kernel/generic/include/debug.h [b83ba81:31198c12] in mainline

File:

• kernel/generic/include/debug.h (modified) (4 diffs)

kernel/generic/include/debug.h

@@ -37 +37 @@
 
 #include <panic.h>
-#include <arch/debug.h>
+#include <symtab.h>
 
-#define CALLER ((uintptr_t) __builtin_return_address(0))
+#define CALLER  ((uintptr_t) __builtin_return_address(0))
 
-#ifndef HERE
-/** Current Instruction Pointer address */
-#       define HERE ((uintptr_t *) 0)
-#endif
+#ifdef CONFIG_DEBUG
 
 /** Debugging ASSERT macro
@@ -55 +52 @@
  *
  */
-#ifdef CONFIG_DEBUG
-#       define ASSERT(expr) \
-                if (!(expr)) { \
-                        panic("Assertion failed (%s), caller=%p.", #expr, CALLER); \
-                }
-#else
-#       define ASSERT(expr)
-#endif
+#define ASSERT(expr) \
+        do { \
+                if (!(expr)) \
+                        panic("Assertion failed (%s)", #expr); \
+        } while (0)
+
+/** Debugging verbose ASSERT macro
+ *
+ * If CONFIG_DEBUG is set, the ASSERT() macro
+ * evaluates expr and if it is false raises
+ * kernel panic. The panic message contains also
+ * the supplied message.
+ *
+ * @param expr Expression which is expected to be true.
+ * @param msg  Additional message to show (string).
+ *
+ */
+#define ASSERT_VERBOSE(expr, msg) \
+        do { \
+                if (!(expr)) \
+                        panic("Assertion failed (%s, %s)", #expr, msg); \
+        } while (0)
+
+#else /* CONFIG_DEBUG */
+
+#define ASSERT(expr)
+#define ASSERT_VERBOSE(expr, msg)
+
+#endif /* CONFIG_DEBUG */
+
+#ifdef CONFIG_LOG
 
 /** Extensive logging output macro
@@ -71 +91 @@
  *
  */
-
-#ifdef CONFIG_LOG
-#       define LOG(format, ...) \
-                printf("%s() at %s:%u: " format "\n", __func__, __FILE__, \
-                    __LINE__, ##__VA_ARGS__);
-#else
-#       define LOG(format, ...)
-#endif
+#define LOG(format, ...) \
+        do { \
+                printf("%s->%s() at %s:%u: " format "\n", symtab_fmt_name_lookup(CALLER), \
+                    __func__, __FILE__, __LINE__, ##__VA_ARGS__); \
+        } while (0)
 
 /** Extensive logging execute macro
@@ -87 +104 @@
  *
  */
+#define LOG_EXEC(fnc) \
+        do { \
+                printf("%s->%s() at %s:%u: " #fnc "\n", symtab_fmt_name_lookup(CALLER), \
+                    __func__, __FILE__, __LINE__); \
+                fnc; \
+        } while (0)
 
-#ifdef CONFIG_LOG
-#       define LOG_EXEC(fnc) \
-                { \
-                        printf("%s() at %s:%u: " #fnc "\n", __func__, __FILE__, \
-                            __LINE__); \
-                        fnc; \
-                }
-#else
-#       define LOG_EXEC(fnc) fnc
-#endif
+#else /* CONFIG_LOG */
 
+#define LOG(format, ...)
+#define LOG_EXEC(fnc)     fnc
+
+#endif /* CONFOG_LOG */
 
 #endif