Merge branch 'master' into prog-loader

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / interrupts.c

diff --git a/lunaix-os/kernel/asm/x86/interrupts.c b/lunaix-os/kernel/asm/x86/interrupts.c
index c79ed07300e12492d01e8c97ed6a4383543c2ca2..3fb24cbc054eab3d955078da2a27d42d35ee00e7 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupts.c
+++ b/lunaix-os/kernel/asm/x86/interrupts.c
@@ -1,60 +1,47 @@
 #include <arch/x86/interrupts.h>
 #include <arch/x86/interrupts.h>

+#include <arch/x86/tss.h>
+
+#include <hal/apic.h>

 #include <hal/cpu.h>
 #include <hal/cpu.h>

-#include <libc/stdio.h>
+
+#include <lunaix/isrm.h>
+#include <lunaix/mm/page.h>
+#include <lunaix/mm/vmm.h>
+#include <lunaix/process.h>
+#include <lunaix/sched.h>
+#include <lunaix/syslog.h>

 #include <lunaix/tty/tty.h>
 
 #include <lunaix/tty/tty.h>
 

-void
-panic_msg(const char* msg)
-{
-    tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_RED);
-    tty_clear_line(10);
-    tty_clear_line(11);
-    tty_clear_line(12);
-    tty_set_cpos(0, 11);
-    printf("  %s", msg);
-}
+LOG_MODULE("INTR")

 
 

-void
-panic(const char* msg, isr_param* param)
-{
-    char buf[1024];
-    sprintf(buf,
-            "INT %u: (%x) [%p: %p] %s",
-            param->vector,
-            param->err_code,
-            param->cs,
-            param->eip,
-            msg);
-    panic_msg(buf);
-    while (1)
-        ;
-}
+extern x86_page_table* __kernel_ptd;

 
 void
 
 void

-interrupt_handler(isr_param* param)
+intr_handler(isr_param* param)

 {
 {

-    switch (param->vector) {
-        case 0:
-            panic("Division by 0", param);
-            break; // never reach
-        case FAULT_GENERAL_PROTECTION:
-            panic("General Protection", param);
-            break; // never reach
-        case FAULT_PAGE_FAULT:
-            void* pg_fault_ptr = cpu_rcr2();
-            if (pg_fault_ptr) {
-                panic("Page Fault", param);
-            } else {
-                panic("Null pointer reference", param);
-            }
-            break; // never reach
-        case LUNAIX_SYS_PANIC:
-            panic_msg((char*)(param->registers.edi));
-            while (1)
-                ;
-            break; // never reach
-        default:
-            panic("Unknown Interrupt", param);
-            break; // never reach
+    param->execp->saved_prev_ctx = __current->intr_ctx;
+    __current->intr_ctx = *param;
+
+    volatile struct exec_param* execp = __current->intr_ctx.execp;
+
+    if (execp->vector <= 255) {
+        isr_cb subscriber = isrm_get(execp->vector);
+        subscriber(param);
+        goto done;
+    }
+
+    kprint_panic("INT %u: (%x) [%p: %p] Unknown",
+                 execp->vector,
+                 execp->err_code,
+                 execp->cs,
+                 execp->eip);
+
+done:
+    // for all external interrupts except the spurious interrupt
+    //  this is required by Intel Manual Vol.3A, section 10.8.1 & 10.8.5
+    if (execp->vector >= IV_EX && execp->vector != APIC_SPIV_IV) {
+        apic_done_servicing();

     }
     }

+
+    return;

 }
\ No newline at end of file
 }
\ No newline at end of file