Changeset 61c0402 in mainline for kernel/generic/include/interrupt.h

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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/interrupt.h (modified) (2 diffs)

kernel/generic/include/interrupt.h

@@ -42 +42 @@
 #include <arch.h>
 #include <ddi/irq.h>
+#include <stacktrace.h>
 
 typedef void (* iroutine)(int n, istate_t *istate);
@@ -49 +50 @@
         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__); \
+                printf("Task %s (%" PRIu64 ") killed due to an exception at " \
+                    "program counter %p.\n", task->name, task->taskid, istate_get_pc(istate)); \
+                stack_trace_istate(istate); \
+                printf("Kill message: " fmt "\n", ##__VA_ARGS__); \
                 task_kill(task->taskid); \
                 thread_exit(); \