Changeset aac10f86 in mainline

Timestamp:

2008-06-03T14:56:47Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7ac426e

Parents:

419886f6

Message:

LOG, LOG_EXEC() macros (used if CONFIG_EDEBUG is set)
cosmetic changes

Location:

kernel/generic/include

Files:

• debug.h (modified) (2 diffs)
• panic.h (modified) (1 diff)

kernel/generic/include/debug.h

@@ -39 +39 @@
 #include <arch/debug.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)
+#       define HERE ((uintptr_t *) 0)
 #endif
 
@@ -56 +56 @@
  */
 #ifdef CONFIG_DEBUG
-#       define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%.*p\n", #expr, sizeof(uintptr_t) * 2, CALLER); }
+#       define ASSERT(expr) \
+                if (!(expr)) { \
+                        panic("assertion failed (%s), caller=%p\n", #expr, CALLER); \
+                }
 #else
 #       define ASSERT(expr)
 #endif
+
+/** Extensive debugging output macro
+ *
+ * If CONFIG_EDEBUG is set, the LOG() macro
+ * will print whatever message is indicated plus
+ * an information about the location.
+ *
+ */
+
+#ifdef CONFIG_EDEBUG
+#       define LOG(format, ...) \
+                printf("%s() at %s:%u: " format "\n", __func__, __FILE__, \
+                        __LINE__, ##__VA_ARGS__);
+#else
+#       define LOG(format, ...)
+#endif
+
+/** Extensive debugging execute macro
+ *
+ * If CONFIG_EDEBUG is set, the LOG_EXEC() macro
+ * will print an information about calling a given
+ * function and call it.
+ *
+ */
+
+#ifdef CONFIG_EDEBUG
+#       define LOG_EXEC(fnc) \
+                { \
+                        printf("%s() at %s:%u: " #fnc "\n", __func__, __FILE__, \
+                        __LINE__); \
+                        fnc; \
+                }
+#else
+#       define LOG_EXEC(fnc) fnc
+#endif
+
 
 #endif

kernel/generic/include/panic.h

@@ -37 +37 @@
 
 #ifdef CONFIG_DEBUG
-#define panic(format, ...) \
-    panic_printf("Kernel panic in %s() at %s on line %d: " format, __func__, \
-    __FILE__, __LINE__, ##__VA_ARGS__);
+#       define panic(format, ...) \
+                panic_printf("Kernel panic in %s() at %s:%u: " format, __func__, \
+                __FILE__, __LINE__, ##__VA_ARGS__);
 #else
-#define panic(format, ...) \
-    panic_printf("Kernel panic: " format, ##__VA_ARGS__);
+#       define panic(format, ...) \
+                panic_printf("Kernel panic: " format, ##__VA_ARGS__);
 #endif
 
-extern void panic_printf(char *fmt, ...) __attribute__((noreturn)) ;
+extern void panic_printf(char *fmt, ...) __attribute__((noreturn));
 
 #endif