Unifying the Lunaix's Physical Memory Model (#28)

[lunaix-os.git] / lunaix-os / arch / i386 / exceptions / interrupts.c

diff --git a/lunaix-os/arch/i386/exceptions/interrupts.c b/lunaix-os/arch/i386/exceptions/interrupts.c
index d63628b3803296d8f8118ddf9765ff0d28f798fc..8e6fa208e0782c61606a903d35f29452ae400e72 100644 (file)
--- a/lunaix-os/arch/i386/exceptions/interrupts.c
+++ b/lunaix-os/arch/i386/exceptions/interrupts.c
@@ -1,58 +1,56 @@
-#include <arch/i386/interrupts.h>
-#include <arch/i386/tss.h>
+#include <sys/cpu.h>
+#include <sys/i386_intr.h>
+#include <sys/interrupts.h>
+#include <sys/x86_isa.h>

 
 

-#include <hal/apic.h>
-#include <hal/cpu.h>
-
-#include <arch/exception.h>
+#include <hal/intc.h>

 
 #include <lunaix/isrm.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/mm/vmm.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/syslog.h>

-#include <lunaix/tty/tty.h>
-
-#include "i386_intr.h"

 
 LOG_MODULE("INTR")
 
 
 LOG_MODULE("INTR")
 

-extern x86_page_table* __kernel_ptd;
-
-void
-exception_init()
+static inline void
+update_thread_context(isr_param* param)

 {
 {

-    exception_install_handler();
-    isrm_init();
-    intr_routine_init();
+    if (!current_thread) {
+        return;
+    }
+
+    isr_param* ppctx = current_thread->intr_ctx;
+    param->execp->saved_prev_ctx = ppctx;
+    current_thread->intr_ctx = param;
+
+    if (ppctx) {
+        param->depth = ppctx->depth + 1;
+    }

 }
 
 void
 intr_handler(isr_param* param)
 {
 }
 
 void
 intr_handler(isr_param* param)
 {

-    param->execp->saved_prev_ctx = __current->intr_ctx;
-    __current->intr_ctx = param;
-
-    volatile struct exec_param* execp = __current->intr_ctx->execp;
+    update_thread_context(param);

 
 

+    volatile struct exec_param* execp = param->execp;

     if (execp->vector <= 255) {
         isr_cb subscriber = isrm_get(execp->vector);
         subscriber(param);
         goto done;
     }
 
     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);
+    ERROR("INT %u: (%x) [%p: %p] Unknown",
+            execp->vector,
+            execp->err_code,
+            execp->cs,
+            execp->eip);

 
 done:
 
 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();
+
+    if (execp->vector > IV_BASE_END) {
+        intc_notify_eoi(0, execp->vector);

     }
 
     return;
     }
 
     return;