Merge branch 'signal-dev'

[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 8660df6bbd0889c8683aec07b30226521db6f1f1..8cc3ff558d3c338c7bf6a05ae4d46ae971774e89 100644 (file)
--- a/lunaix-os/kernel/asm/x86/intr_routines.c
+++ b/lunaix-os/kernel/asm/x86/intr_routines.c
@@ -1,61 +1,56 @@
 #include <arch/x86/interrupts.h>
 #include <arch/x86/interrupts.h>

-#include <lunaix/tty/tty.h>
+#include <lunaix/process.h>

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

+#include <lunaix/tty/tty.h>

 
 #include <klibc/stdio.h>
 
 #include <hal/apic.h>
 
 
 #include <klibc/stdio.h>
 
 #include <hal/apic.h>
 

+LOG_MODULE("INTR")
+
+extern void
+intr_routine_page_fault(const isr_param* param);

 
 

-static void 
-__print_panic_msg(const char* msg, const isr_param* param) 
+extern uint32_t debug_resv;
+
+void
+__print_panic_msg(const char* msg, const isr_param* param)

 {
     kprint_panic("  INT %u: (%x) [%p: %p] %s",
 {
     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
 }
 
 void

-intr_routine_divide_zero (const isr_param* param) 
+intr_routine_divide_zero(const isr_param* param)

 {
     __print_panic_msg("Divide by zero!", param);
     spin();
 }
 
 void
 {
     __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 "Addr: %p\n", (&debug_resv)[0]);
+    kprintf(KERROR "Expected: %p\n", __current->intr_ctx.eip);

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

-intr_routine_page_fault (const isr_param* param) 
-{
-    void* pg_fault_ptr = cpu_rcr2();
-    if (!pg_fault_ptr) {
-        __print_panic_msg("Null pointer reference", param);
-    } else {
-        char buf[32];
-        sprintf(buf, "Page fault on %p", pg_fault_ptr);
-        __print_panic_msg(buf, param);
-    }
-    spin();
-}
-
-void
-intr_routine_sys_panic (const isr_param* param) 
+intr_routine_sys_panic(const isr_param* param)

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

-intr_routine_fallback (const isr_param* param) 
+intr_routine_fallback(const isr_param* param)

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


@@ -63,17 +58,17 @@ intr_routine_fallback (const isr_param* param)
 
 /**
  * @brief ISR for Spurious interrupt
 
 /**
  * @brief ISR for Spurious interrupt

- * 
+ *

  * @param isr_param passed by CPU
  */
 void
  * @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
 }
 
 {
     // 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);
     char buf[32];
 {
     uint32_t error_reg = apic_read_reg(APIC_ESR);
     char buf[32];


@@ -83,14 +78,15 @@ intr_routine_apic_error (const isr_param* param)
 }
 
 void
 }
 
 void

-intr_routine_init() 
+intr_routine_init()

 {
 {

-    intr_subscribe(FAULT_DIVISION_ERROR,     intr_routine_divide_zero);
+    intr_subscribe(FAULT_DIVISION_ERROR, intr_routine_divide_zero);

     intr_subscribe(FAULT_GENERAL_PROTECTION, intr_routine_general_protection);
     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_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
 }
\ No newline at end of file