Changeset 3e828ea in mainline for kernel/arch/mips32/src/exception.c

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• kernel/arch/mips32/src/exception.c (modified) (3 diffs)

kernel/arch/mips32/src/exception.c

@@ -47 +47 @@
 #include <symtab.h>
 #include <log.h>
+#include <arch/machine_func.h>
 
 static const char *exctable[] = {
@@ -174 +175 @@
 
         unsigned int i;
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < MIPS_INTERRUPTS; i++) {
 
                 /*
@@ -183 +184 @@
                  */
                 if (im & ip & (1 << i)) {
-                        irq_t *irq = irq_dispatch_and_lock(i);
-                        if (irq) {
-                                /*
-                                 * The IRQ handler was found.
-                                 */
-                                irq->handler(irq);
-                                if (irq->cir)
-                                        irq->cir(irq->cir_arg, i);
-                                irq_spinlock_unlock(&irq->lock, false);
-                        } else {
+                        if (int_handler[i])
+                                int_handler[i](i);
+                        else {
                                 /*
                                  * Spurious interrupt.