X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/2e21eb2f39dd80aa166216381d5d402be943686e..86a9cfeadbbe180abf6c8bd8c64c86957fdacfeb:/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 8330bc2..55d7e9b 100644
--- a/lunaix-os/kernel/asm/x86/interrupts.c
+++ b/lunaix-os/kernel/asm/x86/interrupts.c
@@ -6,6 +6,7 @@
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/mm/page.h>
+#include <lunaix/mm/vmm.h>
 
 LOG_MODULE("intr")
 
@@ -35,19 +36,20 @@ extern x86_page_table* __kernel_ptd;
 void
 intr_handler(isr_param* param)
 {
-    // if (param->vector == LUNAIX_SYS_CALL) {
-    //     kprintf(KDEBUG "%p", param->registers.esp);
-    // }
     __current->intr_ctx = *param;
-
+    
+#ifdef USE_KERNEL_PT
     cpu_lcr3(__kernel_ptd);
 
+    vmm_mount_pd(PD_MOUNT_1, __current->page_table);
+#endif
+
     isr_param *lparam = &__current->intr_ctx;
     
     if (lparam->vector <= 255) {
         int_subscriber subscriber = subscribers[lparam->vector];
         if (subscriber) {
-            subscriber(lparam);
+            subscriber(param);
             goto done;
         }
     }
@@ -64,20 +66,14 @@ intr_handler(isr_param* param)
             lparam->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 (lparam->vector >= EX_INTERRUPT_BEGIN && lparam->vector != APIC_SPIV_IV) {
         apic_done_servicing();
     }
 
+#ifdef USE_KERNEL_PT
     cpu_lcr3(__current->page_table);
-
-    *param = __current->intr_ctx;
-
+#endif
     return;
 }
\ No newline at end of file