Changeset 06737a0 in mainline

Timestamp:

2010-06-25T04:22:36Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a043e39

Parents:

5c8de00

Message:

Foundations for the unified panic architecture.

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• generic/include/debug.h (modified) (2 diffs)
• generic/include/panic.h (modified) (2 diffs)
• generic/src/debug/panic.c (added)

kernel/Makefile

@@ -201 +201 @@
         generic/src/debug/symtab.c \
         generic/src/debug/stacktrace.c \
+        generic/src/debug/panic.c \
         generic/src/interrupt/interrupt.c \
         generic/src/main/main.c \

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)
 

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