Unifying the Lunaix's Physical Memory Model (#28)

[lunaix-os.git] / lunaix-os / arch / i386 / exceptions / intr_routines.c

diff --git a/lunaix-os/arch/i386/exceptions/intr_routines.c b/lunaix-os/arch/i386/exceptions/intr_routines.c
index d0b0d492915043264a0e54827a3eb012c47cc588..b93e6799ec35dcee4095633f4d62fbc0f5292ccf 100644 (file)
--- a/lunaix-os/arch/i386/exceptions/intr_routines.c
+++ b/lunaix-os/arch/i386/exceptions/intr_routines.c
@@ -1,14 +1,14 @@
 #include <sys/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/trace.h>
+#include <lunaix/failsafe.h>
 
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>
 
 #include <sys/apic.h>
 #include <sys/i386_intr.h>
@@ -23,44 +23,32 @@ extern u32_t debug_resv;
 void
 __print_panic_msg(const char* msg, const isr_param* param)
 {
-    kprintf(KERROR "panic: %s\n", msg);
-    trace_printstack_isr(param);
+    ERROR("panic: %s", msg);
+    failsafe_diagnostic();
 }
 
 void
 intr_routine_divide_zero(const isr_param* param)
 {
     __print_panic_msg("div zero", param);
-
-    console_flush();
-    spin();
 }
 
 void
 intr_routine_general_protection(const isr_param* param)
 {
     __print_panic_msg("general protection", param);
-
-    console_flush();
-    spin();
 }
 
 void
 intr_routine_sys_panic(const isr_param* param)
 {
     __print_panic_msg((char*)(param->registers.edi), param);
-
-    console_flush();
-    spin();
 }
 
 void
 intr_routine_fallback(const isr_param* param)
 {
     __print_panic_msg("unknown interrupt", param);
-
-    console_flush();
-    spin();
 }
 
 /**
@@ -81,10 +69,7 @@ intr_routine_apic_error(const isr_param* param)
     char buf[32];
     ksprintf(buf, "APIC error, ESR=0x%x", error_reg);
 
-    __print_panic_msg(buf, param);
-
-    console_flush();
-    spin();
+    failsafe_diagnostic();
 }
 
 void