Changeset f7a33de in mainline

Timestamp:

2013-12-12T21:30:37Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

0c2d9bb

Parents:

382fb4ba

Message:

Enable interrupts support.

Location:

kernel

Files:

• arch/sparc32/include/arch/exception.h (modified) (1 diff)
• arch/sparc32/src/exception.c (modified) (2 diffs)
• arch/sparc32/src/trap_table.S (modified) (2 diffs)
• genarch/src/drivers/grlib_irqmp/grlib_irqmp.c (modified) (1 diff)

kernel/arch/sparc32/include/arch/exception.h

@@ -68 +68 @@
 extern void mem_address_not_aligned(int n, istate_t *istate);
 extern sysarg_t syscall(sysarg_t a1, sysarg_t a2, sysarg_t a3, sysarg_t a4, sysarg_t a5, sysarg_t a6, sysarg_t id);
+extern void irq_exception(unsigned int nr, istate_t *istate);
 
 #endif /* !__ASM__ */

kernel/arch/sparc32/src/exception.c

@@ -40 +40 @@
 #include <arch/exception.h>
 #include <arch/regwin.h>
+#include <arch/machine_func.h>
 #include <syscall/syscall.h>
 #include <interrupt.h>
@@ -149 +150 @@
 //      printf("syscall %d\n", id);
 //      printf("args: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n", a1, a2, a3, a4, a5, a6);
-        if (id == 0x4f) {
-            flush_windows();
-            return 0;
-        }
+//        if (id == 0x4f) {
+  //          flush_windows();
+    //        return 0;
+      //  }
     
         return syscall_handler(a1, a2, a3, a4, a5, a6, id);
+}
+
+void irq_exception(unsigned int nr, istate_t *istate)
+{
+        machine_irq_exception(nr, istate);
 }
 

kernel/arch/sparc32/src/trap_table.S

@@ -669 +669 @@
         nop
 
-9:      ld [%sp + 104], %g1
+9:      inline_restore_kernel
+
+        ld [%sp + 104], %g1
         ld [%sp + 108], %g2
         ld [%sp + 112], %g3
@@ -754 +756 @@
         /* Jump to actual subroutine */
         mov %g2, %o0
-        call exc_dispatch
+        call irq_exception
         add %sp, 128, %o1
 

kernel/genarch/src/drivers/grlib_irqmp/grlib_irqmp.c

@@ -48 +48 @@
 
         /* Mask all interrupts */
-        pio_write_32((void *)irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0);
+        pio_write_32((void *)irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0x8);
 }