Changeset 00287cc in mainline for kernel/arch/arm32/src/exception.c

Timestamp:

2009-03-12T23:26:32Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

648c9d9

Parents:

3b122e9

Message:

arm32: update for the new scheme of device drivers and keyboard/serial modules
streamline arm32 port (as GXemul is still the only machine supported), more cleanup is needed

File:

• kernel/arch/arm32/src/exception.c (modified) (8 diffs)

kernel/arch/arm32/src/exception.c

@@ -35 +35 @@
 
 #include <arch/exception.h>
-#include <arch/debug/print.h>
 #include <arch/memstr.h>
 #include <arch/regutils.h>
 #include <interrupt.h>
-#include <arch/machine.h>
 #include <arch/mm/page_fault.h>
 #include <arch/barrier.h>
+#include <arch/drivers/gxemul.h>
 #include <print.h>
 #include <syscall/syscall.h>
@@ -261 +260 @@
 static void prefetch_abort_exception_entry(void)
 {
-        asm("sub lr, lr, #4");
+        asm volatile (
+                "sub lr, lr, #4"
+        );
+        
         PROCESS_EXCEPTION(EXC_PREFETCH_ABORT);
 } 
@@ -268 +270 @@
 static void data_abort_exception_entry(void)
 {
-        asm("sub lr, lr, #8");
+        asm volatile (
+                "sub lr, lr, #8"
+        );
+        
         PROCESS_EXCEPTION(EXC_DATA_ABORT);
 }
@@ -280 +285 @@
 static void irq_exception_entry(void)
 {
-        asm("sub lr, lr, #4");
+        asm volatile (
+                "sub lr, lr, #4"
+        );
+        
         setup_stack_and_save_regs();
         
@@ -300 +308 @@
 }
 
+/** Returns the mask of active interrupts. */
+static inline uint32_t gxemul_irqc_get_sources(void)
+{
+        return *((uint32_t *) gxemul_irqc);
+}
+
 /** Interrupt Exception handler.
  *
@@ -306 +320 @@
 static void irq_exception(int exc_no, istate_t *istate)
 {
-        machine_irq_exception(exc_no, istate);
+        uint32_t sources = gxemul_irqc_get_sources();
+        unsigned int i;
+        
+        for (i = 0; i < GXEMUL_IRQC_MAX_IRQ; i++) {
+                if (sources & (1 << i)) {
+                        irq_t *irq = irq_dispatch_and_lock(i);
+                        if (irq) {
+                                /* The IRQ handler was found. */
+                                irq->handler(irq);
+                                spinlock_unlock(&irq->lock);
+                        } else {
+                                /* Spurious interrupt.*/
+                                printf("cpu%d: spurious interrupt (inum=%d)\n",
+                                    CPU->id, i);
+                        }
+                }
+        }
 }
 
@@ -330 +360 @@
             (unsigned *) EXC_IRQ_VEC);
         
-        install_handler((unsigned)fiq_exception_entry,
+        install_handler((unsigned) fiq_exception_entry,
             (unsigned *) EXC_FIQ_VEC);
 }
@@ -380 +410 @@
 void print_istate(istate_t *istate)
 {
-        dprintf("istate dump:\n");
-
-        dprintf(" r0: %x    r1: %x    r2: %x    r3: %x\n",
+        printf("istate dump:\n");
+        
+        printf(" r0: %x    r1: %x    r2: %x    r3: %x\n",
             istate->r0, istate->r1, istate->r2, istate->r3);
-        dprintf(" r4: %x    r5: %x    r6: %x    r7: %x\n", 
+        printf(" r4: %x    r5: %x    r6: %x    r7: %x\n", 
             istate->r4, istate->r5, istate->r6, istate->r7);
-        dprintf(" r8: %x    r8: %x   r10: %x   r11: %x\n", 
+        printf(" r8: %x    r8: %x   r10: %x   r11: %x\n", 
             istate->r8, istate->r9, istate->r10, istate->r11);
-        dprintf(" r12: %x    sp: %x    lr: %x  spsr: %x\n",
+        printf(" r12: %x    sp: %x    lr: %x  spsr: %x\n",
             istate->r12, istate->sp, istate->lr, istate->spsr);
-
-        dprintf(" pc: %x\n", istate->pc);
+        
+        printf(" pc: %x\n", istate->pc);
 }