regression: elf loading

[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 f68b2ceeb80dec144b6b624f2a1a6809453c2b0d..97903cffebfdc5c1e3e145485e71825605527e90 100644 (file)
--- a/lunaix-os/kernel/asm/x86/intr_routines.c
+++ b/lunaix-os/kernel/asm/x86/intr_routines.c
@@ -1,7 +1,12 @@
 #include <arch/x86/interrupts.h>
-#include <lunaix/tty/tty.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>
 
 #include <klibc/stdio.h>
 
@@ -10,77 +15,95 @@
 LOG_MODULE("INTR")
 
 extern void
-intr_routine_page_fault (const isr_param* param);
+intr_routine_page_fault(const isr_param* param);
 
-void 
-__print_panic_msg(const char* msg, const isr_param* param) 
+extern u32_t debug_resv;
+
+void
+__print_panic_msg(const char* msg, const isr_param* param)
 {
     kprint_panic("  INT %u: (%x) [%p: %p] %s",
-            param->vector,
-            param->err_code,
-            param->cs,
-            param->eip,
-            msg);
+                 param->vector,
+                 param->err_code,
+                 param->cs,
+                 param->eip,
+                 msg);
 }
 
 void
-intr_routine_divide_zero (const isr_param* param) 
+intr_routine_divide_zero(const isr_param* param)
 {
+    console_flush();
     __print_panic_msg("Divide by zero!", param);
     spin();
 }
 
 void
-intr_routine_general_protection (const isr_param* param) 
+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", (&debug_resv)[1]);
+    console_flush();
     __print_panic_msg("General Protection", param);
     spin();
 }
 
 void
-intr_routine_sys_panic (const isr_param* param) 
+intr_routine_sys_panic(const isr_param* param)
 {
+    console_flush();
     __print_panic_msg((char*)(param->registers.edi), param);
     spin();
 }
 
 void
-intr_routine_fallback (const isr_param* param) 
+intr_routine_fallback(const isr_param* param)
 {
+    console_flush();
     __print_panic_msg("Unknown Interrupt", param);
     spin();
 }
 
 /**
  * @brief ISR for Spurious interrupt
- * 
+ *
  * @param isr_param passed by CPU
  */
 void
-intr_routine_apic_spi (const isr_param* param)
+intr_routine_apic_spi(const isr_param* param)
 {
     // FUTURE: do nothing for now
 }
 
-void 
-intr_routine_apic_error (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_init() 
+intr_routine_sched(const isr_param* param)
 {
-    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(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);
+    schedule();
+}
+
+void
+intr_routine_init()
+{
+    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