X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/03944e7734220bf7e7aa7b7113bcbdf9c22808a5..bb793d5c6918efee6a86de442463a7c9aaa4ecdd:/lunaix-os/kernel/asm/x86/intr_routines.c

diff --git a/lunaix-os/kernel/asm/x86/intr_routines.c b/lunaix-os/kernel/asm/x86/intr_routines.c
index 807dbe4..ea7a324 100644
--- a/lunaix-os/kernel/asm/x86/intr_routines.c
+++ b/lunaix-os/kernel/asm/x86/intr_routines.c
@@ -1,6 +1,9 @@
 #include <arch/x86/interrupts.h>
+
+#include <lunaix/isrm.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/process.h>
+#include <lunaix/sched.h>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/tty/tty.h>
@@ -14,16 +17,18 @@ LOG_MODULE("INTR")
 extern void
 intr_routine_page_fault(const isr_param* param);
 
-extern uint32_t debug_resv;
+extern u32_t debug_resv;
 
 void
 __print_panic_msg(const char* msg, const isr_param* param)
 {
+    volatile struct exec_param* execp = param->execp;
+
     kprint_panic("  INT %u: (%x) [%p: %p] %s",
-                 param->vector,
-                 param->err_code,
-                 param->cs,
-                 param->eip,
+                 execp->vector,
+                 execp->err_code,
+                 execp->cs,
+                 execp->eip,
                  msg);
 }
 
@@ -76,24 +81,31 @@ intr_routine_apic_spi(const isr_param* param)
 void
 intr_routine_apic_error(const isr_param* param)
 {
-    uint32_t error_reg = apic_read_reg(APIC_ESR);
+    u32_t error_reg = apic_read_reg(APIC_ESR);
     char buf[32];
-    sprintf(buf, "APIC error, ESR=0x%x", error_reg);
+    ksprintf(buf, "APIC error, ESR=0x%x", error_reg);
     console_flush();
     __print_panic_msg(buf, param);
     spin();
 }
 
+void
+intr_routine_sched(const isr_param* param)
+{
+    schedule();
+}
+
 void
 intr_routine_init()
 {
-    intr_subscribe(FAULT_DIVISION_ERROR, intr_routine_divide_zero);
-    intr_subscribe(FAULT_GENERAL_PROTECTION, intr_routine_general_protection);
-    intr_subscribe(FAULT_PAGE_FAULT, intr_routine_page_fault);
-    intr_subscribe(FAULT_STACK_SEG_FAULT, intr_routine_page_fault);
-    intr_subscribe(LUNAIX_SYS_PANIC, intr_routine_sys_panic);
-    intr_subscribe(APIC_SPIV_IV, intr_routine_apic_spi);
-    intr_subscribe(APIC_ERROR_IV, intr_routine_apic_error);
-
-    intr_set_fallback_handler(intr_routine_fallback);
+    isrm_bindiv(FAULT_DIVISION_ERROR, intr_routine_divide_zero);
+    isrm_bindiv(FAULT_GENERAL_PROTECTION, intr_routine_general_protection);
+    isrm_bindiv(FAULT_PAGE_FAULT, intr_routine_page_fault);
+    isrm_bindiv(FAULT_STACK_SEG_FAULT, intr_routine_page_fault);
+
+    isrm_bindiv(LUNAIX_SYS_PANIC, intr_routine_sys_panic);
+    isrm_bindiv(LUNAIX_SCHED, intr_routine_sched);
+
+    isrm_bindiv(APIC_SPIV_IV, intr_routine_apic_spi);
+    isrm_bindiv(APIC_ERROR_IV, intr_routine_apic_error);
 }
\ No newline at end of file