X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/7804c2dae30700296c3205aaf7f546f491999bf4..d1b1c8d9119229dbeed06cd252917e54a1cb77f6:/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 d63628b..d7eced3 100644
--- 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/hart.h>
+#include "sys/x86_isa.h"
 
-#include <hal/apic.h>
-#include <hal/cpu.h>
+#include "sys/x86_isa.h"
 
-#include <arch/exception.h>
-
-#include <lunaix/isrm.h>
-#include <lunaix/mm/page.h>
+#include <lunaix/generic/isrm.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")
 
-extern x86_page_table* __kernel_ptd;
-
-void
-exception_init()
+static inline void
+update_thread_context(struct hart_state* state)
 {
-    exception_install_handler();
-    isrm_init();
-    intr_routine_init();
+    if (!current_thread) {
+        return;
+    }
+
+    struct hart_state* parent = current_thread->hstate;
+    hart_push_state(parent, state);
+    current_thread->hstate = state;
+
+    if (parent) {
+        state->depth = parent->depth + 1;
+    }
 }
 
 void
-intr_handler(isr_param* param)
+intr_handler(struct hart_state* state)
 {
-    param->execp->saved_prev_ctx = __current->intr_ctx;
-    __current->intr_ctx = param;
-
-    volatile struct exec_param* execp = __current->intr_ctx->execp;
+    update_thread_context(state);
 
+    volatile struct exec_param* execp = state->execp;
     if (execp->vector <= 255) {
         isr_cb subscriber = isrm_get(execp->vector);
-        subscriber(param);
+        subscriber(state);
         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:
-    // 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) {
+        isrm_notify_eoi(0, execp->vector);
     }
 
     return;