Changeset 89c57b6 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/src/interrupt/interrupt.c (modified) (10 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>
@@ -55 +54 @@
 #include <arch/cycle.h>
 #include <str.h>
+#include <trace.h>
 
 exc_table_t exc_table[IVT_ITEMS];
@@ -97 +97 @@
  *
  */
-void exc_dispatch(unsigned int n, istate_t *istate)
-{
-        ASSERT(CPU);
-        
+NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
+{
 #if (IVT_ITEMS > 0)
         ASSERT(n < IVT_ITEMS);
@@ -113 +111 @@
         
         /* Account CPU usage if it has waked up from sleep */
-        irq_spinlock_lock(&CPU->lock, false);
-        if (CPU->idle) {
-                uint64_t now = get_cycle();
-                CPU->idle_cycles += now - CPU->last_cycle;
-                CPU->last_cycle = now;
-                CPU->idle = false;
-        }
-        irq_spinlock_unlock(&CPU->lock, false);
+        if (CPU) {
+                irq_spinlock_lock(&CPU->lock, false);
+                if (CPU->idle) {
+                        uint64_t now = get_cycle();
+                        CPU->idle_cycles += now - CPU->last_cycle;
+                        CPU->last_cycle = now;
+                        CPU->idle = false;
+                }
+                irq_spinlock_unlock(&CPU->lock, false);
+        }
         
         uint64_t begin_cycle = get_cycle();
@@ -159 +159 @@
  *
  */
-static void exc_undef(unsigned int n, istate_t *istate)
+NO_TRACE static void exc_undef(unsigned int n, istate_t *istate)
 {
         fault_if_from_uspace(istate, "Unhandled exception %u.", n);
-        panic("Unhandled exception %u.", n);
+        panic_badtrap(istate, n, "Unhandled exception %u.", n);
 }
 
@@ -168 +168 @@
  *
  */
-void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
+NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
 {
         if (!istate_from_uspace(istate))
@@ -175 +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);
@@ -187 +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));
 }
 
@@ -215 +216 @@
  *
  */
-static int cmd_exc_print(cmd_arg_t *argv)
+NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
 {
         bool excs_all;
@@ -262 +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__