Changes in kernel/generic/include/interrupt.h [63594c0:12bf33a] in mainline

File:

• kernel/generic/include/interrupt.h (modified) (1 diff)

kernel/generic/include/interrupt.h

@@ -37 +37 @@
 
 #include <arch/interrupt.h>
-#include <print.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <proc/task.h>
 #include <proc/thread.h>
 #include <arch.h>
 #include <ddi/irq.h>
-#include <stacktrace.h>
 
-typedef void (* iroutine_t)(unsigned int, istate_t *);
+typedef void (* iroutine)(int n, istate_t *istate);
 
-typedef struct {
-        const char *name;
-        bool hot;
-        iroutine_t handler;
-        uint64_t cycles;
-        uint64_t count;
-} exc_table_t;
+#define fault_if_from_uspace(istate, fmt, ...) \
+{ \
+        if (istate_from_uspace(istate)) { \
+                task_t *task = TASK; \
+                printf("Task %s (%" PRIu64 ") killed due to an exception at %p: ", task->name, task->taskid, istate_get_pc(istate)); \
+                printf(fmt "\n", ##__VA_ARGS__); \
+                task_kill(task->taskid); \
+                thread_exit(); \
+        } \
+}
 
-IRQ_SPINLOCK_EXTERN(exctbl_lock);
-extern exc_table_t exc_table[];
-
-extern void fault_if_from_uspace(istate_t *, const char *, ...)
-    PRINTF_ATTRIBUTE(2, 3);
-extern istate_t *istate_get(thread_t *);
-extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);
-extern void exc_dispatch(unsigned int, istate_t *);
-extern void exc_init(void);
-
-extern void irq_initialize_arch(irq_t *);
-
-extern void istate_decode(istate_t *);
+extern iroutine exc_register(int n, const char *name, iroutine f);
+extern void exc_dispatch(int n, istate_t *t);
+void exc_init(void);
 
 #endif