Basic PS/2 keyboard driver, and ...

[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 5f3d333c10d6cf0f50f6ad3c175702e6d34fdc9f..f05c3b80fa4e134df079101abfe785b6b5a96c71 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupt.S
+++ b/lunaix-os/kernel/asm/x86/interrupt.S
@@ -1,3 +1,6 @@
+#define __ASM__
+#include <arch/x86/interrupts.h>
+

 .macro isr_template vector, no_error_code=1
     .global _asm_isr\vector
     .type _asm_isr\vector, @function
 .macro isr_template vector, no_error_code=1
     .global _asm_isr\vector
     .type _asm_isr\vector, @function


@@ -10,19 +13,46 @@
 .endm
 
 .section .text
 .endm
 
 .section .text

-    isr_template 0
-    isr_template 13, no_error_code=0
+    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 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:
 
     interrupt_wrapper:

+        pushl %esp
+        pushl %esi
+        pushl %ebp
+        pushl %edi
+        pushl %edx
+        pushl %ecx
+        pushl %ebx
+        pushl %eax

 
         movl %esp, %eax
         andl $0xfffffff0, %esp
         subl $16, %esp
         movl %eax, (%esp)
 
 
         movl %esp, %eax
         andl $0xfffffff0, %esp
         subl $16, %esp
         movl %eax, (%esp)
 

-        call interrupt_handler
-        pop %eax
-        movl %eax, %esp
+        call intr_handler
+        popl %esp
+
+        popl %eax
+        popl %ebx
+        popl %ecx
+        popl %edx
+        popl %edi
+        popl %ebp
+        popl %esi
+        popl %esp
+

         addl $8, %esp
 
         iret
\ No newline at end of file
         addl $8, %esp
 
         iret
\ No newline at end of file