Changeset 04803bf in mainline for kernel/generic/include/interrupt.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

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

kernel/generic/include/interrupt.h

@@ -37 +37 @@
 
 #include <arch/interrupt.h>
-#include <arch/types.h>
+#include <print.h>
+#include <typedefs.h>
 #include <proc/task.h>
 #include <proc/thread.h>
 #include <arch.h>
 #include <ddi/irq.h>
+#include <stacktrace.h>
 
-typedef void (* iroutine)(int n, istate_t *istate);
+typedef void (* iroutine_t)(unsigned int, istate_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(); \
-        } \
-}
+typedef struct {
+        const char *name;
+        bool hot;
+        iroutine_t handler;
+        uint64_t cycles;
+        uint64_t count;
+} exc_table_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);
+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 *);
 
 #endif