Create LICENSE

[lunaix-os.git] / 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 f6b55389ae68d8e43fd35db574f93301cdfb7528..55d7e9b9a1e1002773b7d4ce8303c11bc2c24b1c 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupts.c
+++ b/lunaix-os/kernel/asm/x86/interrupts.c
@@ -5,6 +5,8 @@
 #include <lunaix/tty/tty.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>
 #include <lunaix/tty/tty.h>
 #include <lunaix/process.h>
 #include <lunaix/sched.h>

+#include <lunaix/mm/page.h>
+#include <lunaix/mm/vmm.h>

 
 LOG_MODULE("intr")
 
 
 LOG_MODULE("intr")
 


@@ -29,17 +31,23 @@ intr_set_fallback_handler(int_subscriber subscribers) {
     fallback = subscribers;
 }
 
     fallback = subscribers;
 }
 

+extern x86_page_table* __kernel_ptd;

 
 void
 intr_handler(isr_param* param)
 {
 
 void
 intr_handler(isr_param* param)
 {

-    // if (param->vector == LUNAIX_SYS_CALL) {
-    //     kprintf(KDEBUG "%p", param->registers.esp);
-    // }

     __current->intr_ctx = *param;
     
     __current->intr_ctx = *param;
     

-    if (param->vector <= 255) {
-        int_subscriber subscriber = subscribers[param->vector];
+#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(param);
             goto done;
         if (subscriber) {
             subscriber(param);
             goto done;


@@ -47,29 +55,25 @@ intr_handler(isr_param* param)
     }
 
     if (fallback) {
     }
 
     if (fallback) {

-        fallback(param);
+        fallback(lparam);

         goto done;
     }
     
     kprint_panic("INT %u: (%x) [%p: %p] Unknown",
         goto done;
     }
     
     kprint_panic("INT %u: (%x) [%p: %p] Unknown",

-            param->vector,
-            param->err_code,
-            param->cs,
-            param->eip);
+            lparam->vector,
+            lparam->err_code,
+            lparam->cs,
+            lparam->eip);

 
 done:
 
 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
     // 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) {
+    if (lparam->vector >= EX_INTERRUPT_BEGIN && lparam->vector != APIC_SPIV_IV) {

         apic_done_servicing();
     }
 
         apic_done_servicing();
     }
 

-    *param = __current->intr_ctx;
-
+#ifdef USE_KERNEL_PT
+    cpu_lcr3(__current->page_table);
+#endif

     return;
 }
\ No newline at end of file
     return;
 }
\ No newline at end of file