ld-tool portability fix: MacOS build experience

[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 c45f961018d8199e565536d6ccf07878b34647c8..d7eced3e6a9aaa33abf2b3fff8457ede47d0f83b 100644 (file)
--- a/lunaix-os/arch/i386/exceptions/interrupts.c
+++ b/lunaix-os/arch/i386/exceptions/interrupts.c
@@ -1,44 +1,57 @@
-#include <sys/interrupts.h>
-#include <sys/x86_isa.h>
-

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

-#include <hal/intc.h>
+#include <sys/i386_intr.h>
+#include <sys/hart.h>
+#include "sys/x86_isa.h"

 
 

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

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

 
 LOG_MODULE("INTR")
 
 
 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;
+    }

 
 

-    volatile struct exec_param* execp = __current->intr_ctx->execp;
+    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(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);
     if (execp->vector <= 255) {
         isr_cb subscriber = isrm_get(execp->vector);

-        subscriber(param);
+        subscriber(state);

         goto done;
     }
 
         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:
 

-    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
 
     return;
 }
\ No newline at end of file