Merge branch 'device-sys'

[lunaix-os.git] / 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 0b05e751554245e2c19be72252a8035e99ff426e..402ceeaf2648090ef030d6542538d81504f7abb8 100644 (file)
--- a/lunaix-os/kernel/asm/x86/intr_routines.c
+++ b/lunaix-os/kernel/asm/x86/intr_routines.c
@@ -1,5 +1,7 @@
 #include <arch/x86/interrupts.h>
 #include <arch/x86/interrupts.h>

+#include <lunaix/lxconsole.h>

 #include <lunaix/process.h>
 #include <lunaix/process.h>

+#include <lunaix/sched.h>

 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/tty/tty.h>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/tty/tty.h>


@@ -29,6 +31,7 @@ __print_panic_msg(const char* msg, const isr_param* param)
 void
 intr_routine_divide_zero(const isr_param* param)
 {
 void
 intr_routine_divide_zero(const isr_param* param)
 {

+    console_flush();

     __print_panic_msg("Divide by zero!", param);
     spin();
 }
     __print_panic_msg("Divide by zero!", param);
     spin();
 }


@@ -36,8 +39,10 @@ intr_routine_divide_zero(const isr_param* param)
 void
 intr_routine_general_protection(const isr_param* param)
 {
 void
 intr_routine_general_protection(const isr_param* param)
 {

+    kprintf(KERROR "Pid: %d\n", __current->pid);

     kprintf(KERROR "Addr: %p\n", (&debug_resv)[0]);
     kprintf(KERROR "Addr: %p\n", (&debug_resv)[0]);

-    kprintf(KERROR "Expected: %p\n", __current->intr_ctx.eip);
+    kprintf(KERROR "Expected: %p\n", (&debug_resv)[1]);
+    console_flush();

     __print_panic_msg("General Protection", param);
     spin();
 }
     __print_panic_msg("General Protection", param);
     spin();
 }


@@ -45,6 +50,7 @@ intr_routine_general_protection(const isr_param* param)
 void
 intr_routine_sys_panic(const isr_param* param)
 {
 void
 intr_routine_sys_panic(const isr_param* param)
 {

+    console_flush();

     __print_panic_msg((char*)(param->registers.edi), param);
     spin();
 }
     __print_panic_msg((char*)(param->registers.edi), param);
     spin();
 }


@@ -52,6 +58,7 @@ intr_routine_sys_panic(const isr_param* param)
 void
 intr_routine_fallback(const isr_param* param)
 {
 void
 intr_routine_fallback(const isr_param* param)
 {

+    console_flush();

     __print_panic_msg("Unknown Interrupt", param);
     spin();
 }
     __print_panic_msg("Unknown Interrupt", param);
     spin();
 }


@@ -72,20 +79,31 @@ intr_routine_apic_error(const isr_param* param)
 {
     uint32_t error_reg = apic_read_reg(APIC_ESR);
     char buf[32];
 {
     uint32_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();
 }
 
     __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);
 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(LUNAIX_SYS_PANIC, intr_routine_sys_panic);

+    intr_subscribe(LUNAIX_SCHED, intr_routine_sched);
+

     intr_subscribe(APIC_SPIV_IV, intr_routine_apic_spi);
     intr_subscribe(APIC_ERROR_IV, intr_routine_apic_error);
 
     intr_subscribe(APIC_SPIV_IV, intr_routine_apic_spi);
     intr_subscribe(APIC_ERROR_IV, intr_routine_apic_error);
 

-    intr_set_fallback_handler(intr_set_fallback_handler);
+    intr_set_fallback_handler(intr_routine_fallback);

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