X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/088403ac98acf7991507715d29a282dcba222053..38965e3e83ba1b03c9c9a0f14cce85c1d0cd8fd8:/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 0b05e75..cf03b95 100644 --- a/lunaix-os/kernel/asm/x86/intr_routines.c +++ b/lunaix-os/kernel/asm/x86/intr_routines.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -36,8 +37,10 @@ intr_routine_divide_zero(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 "Expected: %p\n", __current->intr_ctx.eip); + kprintf(KERROR "Expected: %p\n", (&debug_resv)[1]); + console_flush(0); __print_panic_msg("General Protection", param); spin(); } @@ -83,9 +86,10 @@ 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_set_fallback_handler); + intr_set_fallback_handler(intr_routine_fallback); } \ No newline at end of file