Changeset da1bafb in mainline for kernel/arch/ia32/src/interrupt.c

Timestamp:

2010-05-24T18:57:31Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0095368

Parents:

666f492

Message:

major code revision

• replace spinlocks taken with interrupts disabled with irq_spinlocks
• change spacing (not indendation) to be tab-size independent
• use unsigned integer types where appropriate (especially bit flags)
• visual separation
• remove argument names in function prototypes
• string changes
• correct some formating directives
• replace various cryptic single-character variables (t, a, m, c, b, etc.) with proper identifiers (thread, task, timeout, as, itm, itc, etc.)
• unify some assembler constructs
• unused page table levels are now optimized out in compile time
• replace several ints (with boolean semantics) with bools
• use specifically sized types instead of generic types where appropriate (size_t, uint32_t, btree_key_t)
• improve comments
• split asserts with conjuction into multiple independent asserts

File:

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

kernel/arch/ia32/src/interrupt.c

@@ -94 +94 @@
 {
         fault_if_from_uspace(istate, "Unserviced interrupt: %d.", n);
-
+        
         decode_istate(istate);
         panic("Unserviced interrupt: %d.", n);
@@ -102 +102 @@
 {
         fault_if_from_uspace(istate, "Divide error.");
-
+        
         decode_istate(istate);
         panic("Divide error.");
@@ -111 +111 @@
 {
         if (TASK) {
-                size_t ver;
+                irq_spinlock_lock(&TASK->lock, false);
+                size_t ver = TASK->arch.iomapver;
+                irq_spinlock_unlock(&TASK->lock, false);
                 
-                spinlock_lock(&TASK->lock);
-                ver = TASK->arch.iomapver;
-                spinlock_unlock(&TASK->lock);
-        
                 if (CPU->arch.iomapver_copy != ver) {
                         /*
@@ -130 +128 @@
                 fault_if_from_uspace(istate, "General protection fault.");
         }
-
+        
         decode_istate(istate);
         panic("General protection fault.");
@@ -138 +136 @@
 {
         fault_if_from_uspace(istate, "Stack fault.");
-
+        
         decode_istate(istate);
         panic("Stack fault.");
@@ -146 +144 @@
 {
         uint32_t mxcsr;
-        asm (
+        asm volatile (
                 "stmxcsr %[mxcsr]\n"
                 : [mxcsr] "=m" (mxcsr)
         );
+        
         fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR: %#zx.",
             (unative_t) mxcsr);
@@ -158 +157 @@
 }
 
-static void nm_fault(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
-{
-#ifdef CONFIG_FPU_LAZY     
+static void nm_fault(int n __attribute__((unused)),
+    istate_t *istate __attribute__((unused)))
+{
+#ifdef CONFIG_FPU_LAZY
         scheduler_fpu_lazy_request();
 #else
@@ -169 +169 @@
 
 #ifdef CONFIG_SMP
-static void tlb_shootdown_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
+static void tlb_shootdown_ipi(int n __attribute__((unused)),
+    istate_t *istate __attribute__((unused)))
 {
         trap_virtual_eoi();
@@ -191 +192 @@
                  * The IRQ handler was found.
                  */
-                 
+                
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
@@ -198 +199 @@
                 }
                 irq->handler(irq);
-                spinlock_unlock(&irq->lock);
+                irq_spinlock_unlock(&irq->lock, false);
         } else {
                 /*