Changeset cefb126 in mainline for kernel/generic/include/panic.h

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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/panic.h (modified) (2 diffs)

kernel/generic/include/panic.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2010 Jakub Jermar
  * All rights reserved.
  *
@@ -37 +37 @@
 
 #include <typedefs.h>
-#include <stacktrace.h>
-#include <print.h>
 
-#ifdef CONFIG_DEBUG
+#define panic(fmt, ...) \
+        panic_common(PANIC_OTHER, NULL, 0, 0, fmt, ##__VA_ARGS__)
 
-#define panic(format, ...) \
-        do { \
-                silent = false; \
-                printf("Kernel panic in %s() at %s:%u\n", \
-                    __func__, __FILE__, __LINE__); \
-                stack_trace(); \
-                panic_printf("Panic message: " format "\n", \
-                    ##__VA_ARGS__);\
-        } while (0)
+#define panic_assert(fmt, ...) \
+        panic_common(PANIC_ASSERT, NULL, 0, 0, fmt, ##__VA_ARGS__)
 
-#else /* CONFIG_DEBUG */
+#define panic_badtrap(istate, n, fmt, ...) \
+        panic_common(PANIC_BADTRAP, istate, 0, n, fmt, ##__VA_ARGS__)
 
-#define panic(format, ...) \
-        do { \
-                silent = false; \
-                panic_printf("Kernel panic: " format "\n", ##__VA_ARGS__); \
-                stack_trace(); \
-        } while (0)
+#define panic_memtrap(istate, access, addr, fmt, ...) \
+        panic_common(PANIC_MEMTRAP, istate, access, addr, fmt, ##__VA_ARGS__)
 
-#endif /* CONFIG_DEBUG */
+typedef enum {
+        PANIC_OTHER,
+        PANIC_ASSERT,
+        PANIC_BADTRAP,
+        PANIC_MEMTRAP
+} panic_category_t;
+
+struct istate;
 
 extern bool silent;
 
-extern void panic_printf(const char *fmt, ...) __attribute__((noreturn));
+extern void panic_common(panic_category_t, struct istate *, int,
+    uintptr_t, const char *, ...) __attribute__ ((noreturn));
 
 #endif