Changeset 31198c12 in mainline for kernel/generic/include/debug.h

Timestamp:

2010-05-21T19:04:58Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5f0e39e8

Parents:

7de7cde

Message:

get rid of get_ip() and HERE (the functionality is replaced more elegantly by program_counter_get())
don't print the "caller=%p" part on assertions, rely on the stack trace
print the stack trace also in the non-debug builds (this should be helpful when dealing with external bugreports)

File:

• kernel/generic/include/debug.h (modified) (6 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))
-
-
-#ifndef HERE
-
-/** Current Instruction Pointer address */
-#define HERE ((uintptr_t *) 0)
-
-#endif /* HERE */
-
 
 #ifdef CONFIG_DEBUG
@@ -62 +53 @@
  */
 #define ASSERT(expr) \
-        if (!(expr)) { \
-                panic("Assertion failed (%s), caller=%p.", #expr, CALLER); \
-        }
+        do { \
+                if (!(expr)) \
+                        panic("Assertion failed (%s)", #expr); \
+        } while (0)
 
 /** Debugging verbose ASSERT macro
@@ -78 +70 @@
  */
 #define ASSERT_VERBOSE(expr, msg) \
-        if (!(expr)) { \
-                panic("Assertion failed (%s, %s), caller=%p.", #expr, msg, CALLER); \
-        }
+        do { \
+                if (!(expr)) \
+                        panic("Assertion failed (%s, %s)", #expr, msg); \
+        } while (0)
 
 #else /* CONFIG_DEBUG */
@@ -88 +81 @@
 
 #endif /* CONFIG_DEBUG */
-
 
 #ifdef CONFIG_LOG
@@ -100 +92 @@
  */
 #define LOG(format, ...) \
-        printf("%s() at %s:%u: " format "\n", __func__, __FILE__, \
-            __LINE__, ##__VA_ARGS__);
+        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
@@ -111 +105 @@
  */
 #define LOG_EXEC(fnc) \
-        { \
-                printf("%s() at %s:%u: " #fnc "\n", __func__, __FILE__, \
-                    __LINE__); \
+        do { \
+                printf("%s->%s() at %s:%u: " #fnc "\n", symtab_fmt_name_lookup(CALLER), \
+                    __func__, __FILE__, __LINE__); \
                 fnc; \
-        }
-        
-#else /* CONFOG_LOG */
+        } while (0)
+
+#else /* CONFIG_LOG */
 
 #define LOG(format, ...)
-#define LOG_EXEC(fnc) fnc
+#define LOG_EXEC(fnc)     fnc
 
 #endif /* CONFOG_LOG */