Decoupling Architectural-specific Code (#35)

[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 84a29c1ea4f98384ad250233cc6188357dc1ae5c..d7eced3e6a9aaa33abf2b3fff8457ede47d0f83b 100644 (file)
--- a/lunaix-os/arch/i386/exceptions/interrupts.c
+++ b/lunaix-os/arch/i386/exceptions/interrupts.c
@@ -1,12 +1,11 @@
 #include <sys/cpu.h>
 #include <sys/i386_intr.h>
-#include <sys/interrupts.h>
-#include <sys/x86_isa.h>
+#include <sys/hart.h>
+#include "sys/x86_isa.h"
 
-#include <hal/intc.h>
+#include "sys/x86_isa.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>
@@ -14,21 +13,35 @@
 
 LOG_MODULE("INTR")
 
-void
-intr_handler(isr_param* param)
+static inline void
+update_thread_context(struct hart_state* state)
 {
-    param->execp->saved_prev_ctx = __current->intr_ctx;
-    __current->intr_ctx = param;
+    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;
+    }
+}
 
-    volatile struct exec_param* execp = __current->intr_ctx->execp;
+void
+intr_handler(struct hart_state* state)
+{
+    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;
     }
 
-    kprintf(KERROR "INT %u: (%x) [%p: %p] Unknown",
+    ERROR("INT %u: (%x) [%p: %p] Unknown",
             execp->vector,
             execp->err_code,
             execp->cs,
@@ -36,7 +49,9 @@ intr_handler(isr_param* param)
 
 done:
 
-    intc_notify_eoi(0, execp->vector);
+    if (execp->vector > IV_BASE_END) {
+        isrm_notify_eoi(0, execp->vector);
+    }
 
     return;
 }
\ No newline at end of file