Changes in kernel/generic/src/interrupt/interrupt.c [07640dfd:da1bafb] in mainline

File:

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

kernel/generic/src/interrupt/interrupt.c

@@ -32 +32 @@
 /**
  * @file
- * @brief       Interrupt redirector.
+ * @brief Interrupt redirector.
  *
  * This file provides means of registering interrupt handlers
  * by kernel functions and calling the handlers when interrupts
  * occur.
+ *
  */
 
@@ -61 +62 @@
 
 /** Register exception handler
- * 
- * @param n Exception number
- * @param name Description 
- * @param f Exception handler
- */
-iroutine exc_register(int n, const char *name, iroutine f)
+ *
+ * @param n       Exception number
+ * @param name    Description
+ * @param handler Exception handler
+ *
+ */
+iroutine exc_register(int n, const char *name, iroutine handler)
 {
         ASSERT(n < IVT_ITEMS);
         
-        iroutine old;
-        
         spinlock_lock(&exctbl_lock);
         
-        old = exc_table[n].f;
-        exc_table[n].f = f;
+        iroutine old = exc_table[n].f;
+        exc_table[n].f = handler;
         exc_table[n].name = name;
         
@@ -87 +87 @@
  * Called directly from the assembler code.
  * CPU is interrupts_disable()'d.
+ *
  */
 void exc_dispatch(int n, istate_t *istate)
 {
         ASSERT(n < IVT_ITEMS);
-
+        
         /* Account user cycles */
+        if (THREAD) {
+                irq_spinlock_lock(&THREAD->lock, false);
+                thread_update_accounting(true);
+                irq_spinlock_unlock(&THREAD->lock, false);
+        }
+        
+#ifdef CONFIG_UDEBUG
         if (THREAD)
-                thread_update_accounting(true);
-
+                THREAD->udebug.uspace_state = istate;
+#endif
+        
+        exc_table[n].f(n + IVT_FIRST, istate);
+        
 #ifdef CONFIG_UDEBUG
-        if (THREAD) THREAD->udebug.uspace_state = istate;
-#endif
-        
-        exc_table[n].f(n + IVT_FIRST, istate);
-
-#ifdef CONFIG_UDEBUG
-        if (THREAD) THREAD->udebug.uspace_state = NULL;
-#endif
-
+        if (THREAD)
+                THREAD->udebug.uspace_state = NULL;
+#endif
+        
         /* This is a safe place to exit exiting thread */
-        if (THREAD && THREAD->interrupted && istate_from_uspace(istate))
+        if ((THREAD) && (THREAD->interrupted) && (istate_from_uspace(istate)))
                 thread_exit();
-
-        if (THREAD)
+        
+        if (THREAD) {
+                irq_spinlock_lock(&THREAD->lock, false);
                 thread_update_accounting(false);
-}
-
-/** Default 'null' exception handler */
+                irq_spinlock_unlock(&THREAD->lock, false);
+        }
+}
+
+/** Default 'null' exception handler
+ *
+ */
 static void exc_undef(int n, istate_t *istate)
 {
@@ -121 +132 @@
 }
 
-/** Terminate thread and task if exception came from userspace. */
+/** Terminate thread and task if exception came from userspace.
+ *
+ */
 void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
 {
-        task_t *task = TASK;
-        va_list args;
-
         if (!istate_from_uspace(istate))
                 return;
-
+        
         printf("Task %s (%" PRIu64 ") killed due to an exception at "
-            "program counter %p.\n", task->name, task->taskid,
+            "program counter %p.\n", TASK->name, TASK->taskid,
             istate_get_pc(istate));
-
+        
         stack_trace_istate(istate);
-
+        
         printf("Kill message: ");
+        
+        va_list args;
         va_start(args, fmt);
         vprintf(fmt, args);
         va_end(args);
         printf("\n");
-
+        
         /*
          * Userspace can subscribe for FAULT events to take action
@@ -152 +164 @@
                 event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
                     UPPER32(TASK->taskid), (unative_t) THREAD);
-
+                
 #ifdef CONFIG_UDEBUG
                 /* Wait for a debugging session. */
@@ -158 +170 @@
 #endif
         }
-
-        task_kill(task->taskid);
+        
+        task_kill(TASK->taskid);
         thread_exit();
 }
@@ -165 +177 @@
 #ifdef CONFIG_KCONSOLE
 
-/** kconsole cmd - print all exceptions */
+/** Print all exceptions
+ *
+ */
 static int cmd_exc_print(cmd_arg_t *argv)
 {
 #if (IVT_ITEMS > 0)
         unsigned int i;
-
+        
         spinlock_lock(&exctbl_lock);
-
+        
 #ifdef __32_BITS__
         printf("Exc Description          Handler    Symbol\n");
         printf("--- -------------------- ---------- --------\n");
 #endif
-
+        
 #ifdef __64_BITS__
         printf("Exc Description          Handler            Symbol\n");
@@ -185 +199 @@
         for (i = 0; i < IVT_ITEMS; i++) {
                 const char *symbol = symtab_fmt_name_lookup((unative_t) exc_table[i].f);
-
+                
 #ifdef __32_BITS__
                 printf("%-3u %-20s %10p %s\n", i + IVT_FIRST, exc_table[i].name,
                         exc_table[i].f, symbol);
 #endif
-
+                
 #ifdef __64_BITS__
                 printf("%-3u %-20s %18p %s\n", i + IVT_FIRST, exc_table[i].name,
@@ -210 +224 @@
         return 1;
 }
-
 
 static cmd_info_t exc_info = {
@@ -221 +234 @@
 };
 
-#endif
-
-/** Initialize generic exception handling support */
+#endif /* CONFIG_KCONSOLE */
+
+/** Initialize generic exception handling support
+ *
+ */
 void exc_init(void)
 {
-        int i;
-
+        (void) exc_undef;
+        
+#if (IVT_ITEMS > 0)
+        unsigned int i;
+        
         for (i = 0; i < IVT_ITEMS; i++)
                 exc_register(i, "undef", (iroutine) exc_undef);
-
+#endif
+        
 #ifdef CONFIG_KCONSOLE
         cmd_initialize(&exc_info);