refactor: re-structure the kernel address space for a more integral layout.

[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 09bd1eb1409cfdcf18a78a64784739112f30107e..688799f29212f26548502b1fa9e0a6bcf89a024b 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupts.c
+++ b/lunaix-os/kernel/asm/x86/interrupts.c
@@ -1,33 +1,36 @@
 #include <arch/x86/interrupts.h>
 #include <hal/apic.h>
 #include <hal/cpu.h>
 #include <arch/x86/interrupts.h>
 #include <hal/apic.h>
 #include <hal/cpu.h>

-#include <lunaix/syslog.h>
-#include <lunaix/tty/tty.h>
-#include <lunaix/process.h>
-#include <lunaix/sched.h>

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

+#include <lunaix/process.h>
+#include <lunaix/sched.h>
+#include <lunaix/syslog.h>
+#include <lunaix/tty/tty.h>

 
 LOG_MODULE("intr")
 
 static int_subscriber subscribers[256];
 
 
 LOG_MODULE("intr")
 
 static int_subscriber subscribers[256];
 

-static int_subscriber fallback = (int_subscriber) 0;
+static int_subscriber fallback = (int_subscriber)0;

 
 void
 
 void

-intr_subscribe(const uint8_t vector, int_subscriber subscriber) {
+intr_subscribe(const uint8_t vector, int_subscriber subscriber)
+{

     subscribers[vector] = subscriber;
 }
 
 void
     subscribers[vector] = subscriber;
 }
 
 void

-intr_unsubscribe(const uint8_t vector, int_subscriber subscriber) {
+intr_unsubscribe(const uint8_t vector, int_subscriber subscriber)
+{

     if (subscribers[vector] == subscriber) {
     if (subscribers[vector] == subscriber) {

-        subscribers[vector] = (int_subscriber) 0;
+        subscribers[vector] = (int_subscriber)0;

     }
 }
 
 void
     }
 }
 
 void

-intr_set_fallback_handler(int_subscriber subscribers) {
+intr_set_fallback_handler(int_subscriber subscribers)
+{

     fallback = subscribers;
 }
 
     fallback = subscribers;
 }
 


@@ -36,22 +39,14 @@ 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;
 

-    cpu_lcr3(__kernel_ptd);
+    isr_param* lparam = &__current->intr_ctx;

 
 

-    // 将当前进程的页目录挂载到内核地址空间里（页目录挂载点#1），方便访问。
-    vmm_mount_pd(PD_MOUNT_1, __current->page_table);
-
-    isr_param *lparam = &__current->intr_ctx;
-    

     if (lparam->vector <= 255) {
         int_subscriber subscriber = subscribers[lparam->vector];
         if (subscriber) {
     if (lparam->vector <= 255) {
         int_subscriber subscriber = subscribers[lparam->vector];
         if (subscriber) {

-            subscriber(lparam);
+            subscriber(param);

             goto done;
         }
     }
             goto done;
         }
     }


@@ -60,28 +55,20 @@ intr_handler(isr_param* param)
         fallback(lparam);
         goto done;
     }
         fallback(lparam);
         goto done;
     }

-    
+

     kprint_panic("INT %u: (%x) [%p: %p] Unknown",
     kprint_panic("INT %u: (%x) [%p: %p] Unknown",

-            lparam->vector,
-            lparam->err_code,
-            lparam->cs,
-            lparam->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 (lparam->vector >= EX_INTERRUPT_BEGIN && lparam->vector != APIC_SPIV_IV) {
+    if (lparam->vector >= EX_INTERRUPT_BEGIN &&
+        lparam->vector != APIC_SPIV_IV) {

         apic_done_servicing();
     }
 
         apic_done_servicing();
     }
 

-    cpu_lcr3(__current->page_table);
-
-    *param = __current->intr_ctx;
-

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