Changes in kernel/generic/src/interrupt/interrupt.c [8df5f20:11909ce3] in mainline

File:

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

kernel/generic/src/interrupt/interrupt.c

@@ -58 +58 @@
 #include <trace.h>
 
+/*
+ * If IVT_ITEMS is zero (e.g. for special/abs32le) we hide completely any
+ * access to the exception table array and panic if the function is called
+ * at all. It also silences (correct) compiler warnings about possible
+ * out-of-bound array access.
+ */
+
 exc_table_t exc_table[IVT_ITEMS];
 IRQ_SPINLOCK_INITIALIZE(exctbl_lock);
@@ -77 +84 @@
 #if (IVT_ITEMS > 0)
         assert(n < IVT_ITEMS);
-#endif
 
         irq_spinlock_lock(&exctbl_lock, true);
@@ -91 +97 @@
 
         return old;
+#else
+        panic("No space for any exception handler, cannot register.");
+#endif
 }
 
@@ -103 +112 @@
 #if (IVT_ITEMS > 0)
         assert(n < IVT_ITEMS);
-#endif
 
         /* Account user cycles */
-        if (THREAD) {
-                irq_spinlock_lock(&THREAD->lock, false);
+        if (THREAD)
                 thread_update_accounting(true);
-                irq_spinlock_unlock(&THREAD->lock, false);
-        }
 
         /* Account CPU usage if it woke up from sleep */
-        if (CPU && CPU->idle) {
-                irq_spinlock_lock(&CPU->lock, false);
+        if (CPU && CPU_LOCAL->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);
+                atomic_time_increment(&CPU->idle_cycles, now - CPU_LOCAL->last_cycle);
+                CPU_LOCAL->last_cycle = now;
+                CPU_LOCAL->idle = false;
         }
 
@@ -149 +152 @@
 
         /* Do not charge THREAD for exception cycles */
-        if (THREAD) {
-                irq_spinlock_lock(&THREAD->lock, false);
+        if (THREAD)
                 THREAD->last_cycle = end_cycle;
-                irq_spinlock_unlock(&THREAD->lock, false);
-        }
+#else
+        panic("No space for any exception handler, yet we want to handle some exception.");
+#endif
 }