Changeset bd48f4c in mainline for kernel/generic/include/debug.h

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/generic/include/debug.h

@@ -55 +55 @@
         do { \
                 if (!(expr)) \
-                        panic("Assertion failed (%s)", #expr); \
+                        panic_assert("%s", #expr); \
         } while (0)
 
@@ -72 +72 @@
         do { \
                 if (!(expr)) \
-                        panic("Assertion failed (%s, %s)", #expr, msg); \
+                        panic_assert("%s, %s", #expr, msg); \
         } while (0)
 
@@ -93 +93 @@
 #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
- *
- * If CONFIG_LOG is set, the LOG_EXEC() macro
- * will print an information about calling a given
- * function and call it.
- *
- */
-#define LOG_EXEC(fnc) \
-        do { \
-                printf("%s->%s() at %s:%u: " #fnc "\n", symtab_fmt_name_lookup(CALLER), \
-                    __func__, __FILE__, __LINE__); \
-                fnc; \
+                printf("%s() from %s at %s:%u: " format "\n", __func__, \
+                    symtab_fmt_name_lookup(CALLER), __FILE__, __LINE__, \
+                    ##__VA_ARGS__); \
         } while (0)
 
@@ -114 +101 @@
 
 #define LOG(format, ...)
-#define LOG_EXEC(fnc)     fnc
 
-#endif /* CONFOG_LOG */
+#endif /* CONFIG_LOG */
+
+#ifdef CONFIG_TRACE
+
+extern void __cyg_profile_func_enter(void *, void *);
+extern void __cyg_profile_func_exit(void *, void *);
+
+#endif /* CONFIG_TRACE */
 
 #endif