Changeset eb522e8 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (4 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -45 +45 @@
 #include <console/console.h>
 #include <console/cmd.h>
-#include <ipc/event.h>
 #include <synch/mutex.h>
 #include <time/delay.h>
@@ -176 +175 @@
         printf("Task %s (%" PRIu64 ") killed due to an exception at "
             "program counter %p.\n", TASK->name, TASK->taskid,
-            istate_get_pc(istate));
+            (void *) istate_get_pc(istate));
         
         stack_trace_istate(istate);
@@ -188 +187 @@
         printf("\n");
         
+        task_kill_self(true);
+}
+
+/** Get istate structure of a thread.
+ *
+ * Get pointer to the istate structure at the bottom of the kernel stack.
+ *
+ * This function can be called in interrupt or user context. In interrupt
+ * context the istate structure is created by the low-level exception
+ * handler. In user context the istate structure is created by the
+ * low-level syscall handler.
+ */
+istate_t *istate_get(thread_t *thread)
+{
         /*
-         * Userspace can subscribe for FAULT events to take action
-         * whenever a thread faults. (E.g. take a dump, run a debugger).
-         * The notification is always available, but unless Udebug is enabled,
-         * that's all you get.
+         * The istate structure should be right at the bottom of the kernel
+         * stack.
          */
-        if (event_is_subscribed(EVENT_FAULT)) {
-                /* Notify the subscriber that a fault occurred. */
-                event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
-                    UPPER32(TASK->taskid), (unative_t) THREAD);
-                
-#ifdef CONFIG_UDEBUG
-                /* Wait for a debugging session. */
-                udebug_thread_fault();
-#endif
-        }
-        
-        task_kill(TASK->taskid);
-        thread_exit();
+        return (istate_t *) ((uint8_t *) thread->kstack + THREAD_STACK_SIZE -
+            sizeof(istate_t));
 }
 
@@ -263 +263 @@
                 
                 const char *symbol =
-                    symtab_fmt_name_lookup((unative_t) exc_table[i].handler);
+                    symtab_fmt_name_lookup((sysarg_t) exc_table[i].handler);
                 
 #ifdef __32_BITS__