Merge branch 'master' into sata-ahci-dev

[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 7c4067343b054223cd75a7aa19b1bfe3149b9c55..738214242db8573957dae50312ec285a66c14e80 100644 (file)
--- a/lunaix-os/kernel/asm/x86/interrupt.S
+++ b/lunaix-os/kernel/asm/x86/interrupt.S
@@ -42,7 +42,9 @@
     isr_template APIC_TIMER_IV
     isr_template APIC_SPIV_IV
     isr_template RTC_TIMER_IV
     isr_template APIC_TIMER_IV
     isr_template APIC_SPIV_IV
     isr_template RTC_TIMER_IV

+    

     isr_template PC_KBD_IV
     isr_template PC_KBD_IV

+    isr_template AHCI_HBA_IV

 
     interrupt_wrapper:
         /*
 
     interrupt_wrapper:
         /*


@@ -117,6 +119,12 @@
     soft_iret:
         movl %eax, %esp
 
     soft_iret:
         movl %eax, %esp
 

+#ifdef __ASM_INTR_DIAGNOSIS
+        movl %eax, (debug_resv + 8)
+        movl 56(%esp), %eax
+        movl %eax, (debug_resv + 4)
+#endif
+

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