X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/05b7549a0f980efa33265a091a5174a78851ce05..48b4a227035048fdebcd32532deb7a857c6199ac:/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 869569f..f6b5538 100644
--- a/lunaix-os/kernel/asm/x86/interrupts.c
+++ b/lunaix-os/kernel/asm/x86/interrupts.c
@@ -3,8 +3,12 @@
 #include <hal/cpu.h>
 #include <lunaix/syslog.h>
 #include <lunaix/tty/tty.h>
+#include <lunaix/process.h>
+#include <lunaix/sched.h>
 
-int_subscriber subscribers[256];
+LOG_MODULE("intr")
+
+static int_subscriber subscribers[256];
 
 static int_subscriber fallback = (int_subscriber) 0;
 
@@ -25,9 +29,15 @@ intr_set_fallback_handler(int_subscriber subscribers) {
     fallback = subscribers;
 }
 
+
 void
 intr_handler(isr_param* param)
 {
+    // if (param->vector == LUNAIX_SYS_CALL) {
+    //     kprintf(KDEBUG "%p", param->registers.esp);
+    // }
+    __current->intr_ctx = *param;
+    
     if (param->vector <= 255) {
         int_subscriber subscriber = subscribers[param->vector];
         if (subscriber) {
@@ -48,10 +58,18 @@ intr_handler(isr_param* param)
             param->eip);
 
 done:
+
+    // if (__current->state != PROC_RUNNING) {
+    //     schedule();
+    // }
+
     // for all external interrupts except the spurious interrupt
     //  this is required by Intel Manual Vol.3A, section 10.8.1 & 10.8.5
     if (param->vector >= EX_INTERRUPT_BEGIN && param->vector != APIC_SPIV_IV) {
         apic_done_servicing();
     }
+
+    *param = __current->intr_ctx;
+
     return;
 }
\ No newline at end of file