feat: No more kernel page table switching upon interrupt.

[lunaix-os.git] / lunaix-os / kernel / asm / x86 / interrupt.S

diff --git a/lunaix-os/kernel/asm/x86/interrupt.S b/lunaix-os/kernel/asm/x86/interrupt.S
index 9d392734efbbd7e7f640e01c7611984ce193e447..471a8e643f44a204b23c3928f5269cc76cd69ddf 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupt.S
+++ b/lunaix-os/kernel/asm/x86/interrupt.S
@@ -1,5 +1,6 @@
 #define __ASM__
 #include <arch/x86/interrupts.h>
 #define __ASM__
 #include <arch/x86/interrupts.h>

+// #define __ASM_INTR_DIAGNOSIS

 
 .macro isr_template vector, no_error_code=1
     .global _asm_isr\vector
 
 .macro isr_template vector, no_error_code=1
     .global _asm_isr\vector


@@ -12,15 +13,31 @@
         jmp interrupt_wrapper
 .endm
 
         jmp interrupt_wrapper
 .endm
 

+#ifdef __ASM_INTR_DIAGNOSIS
+.section .bss
+    .global debug_resv
+    debug_resv:
+        .skip 16
+#endif
+

 .section .text
     isr_template FAULT_DIVISION_ERROR
     isr_template FAULT_GENERAL_PROTECTION, no_error_code=0
     isr_template FAULT_PAGE_FAULT, no_error_code=0
 
     isr_template LUNAIX_SYS_PANIC
 .section .text
     isr_template FAULT_DIVISION_ERROR
     isr_template FAULT_GENERAL_PROTECTION, no_error_code=0
     isr_template FAULT_PAGE_FAULT, no_error_code=0
 
     isr_template LUNAIX_SYS_PANIC

+    isr_template LUNAIX_SYS_CALL
+
+    isr_template APIC_ERROR_IV
+    isr_template APIC_LINT0_IV
+    isr_template APIC_TIMER_IV
+    isr_template APIC_SPIV_IV
+    isr_template RTC_TIMER_IV
+    isr_template PC_KBD_IV

 
     interrupt_wrapper:
         pushl %esp
 
     interrupt_wrapper:
         pushl %esp

+

         pushl %esi
         pushl %ebp
         pushl %edi
         pushl %esi
         pushl %ebp
         pushl %edi


@@ -34,9 +51,11 @@
         subl $16, %esp
         movl %eax, (%esp)
 
         subl $16, %esp
         movl %eax, (%esp)
 

-        call interrupt_handler
-        popl %eax
-        movl %eax, %esp
+        call intr_handler
+
+    .global soft_iret
+    soft_iret:
+        popl %esp

 
         popl %eax
         popl %ebx
 
         popl %eax
         popl %ebx


@@ -49,4 +68,15 @@
 
         addl $8, %esp
 
 
         addl $8, %esp
 

-        iret
\ No newline at end of file
+#ifdef __ASM_INTR_DIAGNOSIS
+        cmpl $0, (%esp)
+        jz 1f
+        iret
+1:
+        movl $__current, %eax
+        movl  (%esp), %ebx
+        movl $debug_resv, %ecx
+        ud2
+#else
+        iret
+#endif