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

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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) (7 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -55 +55 @@
 #include <arch/cycle.h>
 #include <str.h>
+#include <trace.h>
 
 exc_table_t exc_table[IVT_ITEMS];
@@ -97 +98 @@
  *
  */
-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 +112 @@
         
         /* 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();
@@ -143 +144 @@
         uint64_t end_cycle = get_cycle();
         
+        irq_spinlock_lock(&exctbl_lock, false);
         exc_table[n].cycles += end_cycle - begin_cycle;
         exc_table[n].count++;
+        irq_spinlock_unlock(&exctbl_lock, false);
         
         /* Do not charge THREAD for exception cycles */
@@ -157 +160 @@
  *
  */
-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);
 }
 
@@ -166 +169 @@
  *
  */
-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))
@@ -213 +216 @@
  *
  */
-static int cmd_exc_print(cmd_arg_t *argv)
+NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
 {
         bool excs_all;