Changeset 220

Timestamp:

Jul 17, 2017, 2:14:21 PM (7 years ago)

Author:

max@…

Message:

use the asm entry point to save the context

Location:

trunk/hal/x86_64

Files:

• core/hal_kentry.S (modified) (2 diffs)
• drivers/ioc_ata.c (modified) (3 diffs)

trunk/hal/x86_64/core/hal_kentry.S

@@ -36 +36 @@
         .globl  hal_exception_entry
         .globl  hal_timer_intr
+        .globl  ioc_ata_isr
         .globl  hal_com1_intr
         .globl  hal_keyboard_intr
         .type   hal_exception_entry, @function
         .type   hal_timer_intr, @function
+        .type   ioc_ata_isr, @function
         .type   hal_com1_intr, @function
         .type   hal_keyboard_intr, @function
@@ -135 +137 @@
         movq    %rsp,%rdi
         call    hal_timer_intr
+
+        movq    lapic_va(%rip),%rax
+        movl    $0,LAPIC_EOI(%rax)
+
+        INTR_RESTORE_REGS
+        addq    $16,%rsp
+        iretq
+
+ASM_ENTRY(x86_ioapic_ata0)
+        pushq   $0
+        pushq   $T_ASTFLT
+        INTR_SAVE_REGS
+
+        movq    %rsp,%rdi
+        call    ioc_ata_isr
 
         movq    lapic_va(%rip),%rax

trunk/hal/x86_64/drivers/ioc_ata.c

@@ -23 +23 @@
 #include <dev_ioc.h>
 #include <hal_drivers.h>
+#include <hal_kentry.h>
 #include <thread.h>
 #include <spinlock.h>
@@ -175 +176 @@
 
 static void ioc_ata_cmd(xptr_t th_xp);
-static void ioc_ata_isr(chdev_t *chdev);
+extern void x86_ioapic_ata0();
 
 void ioc_ata_init(chdev_t *chdev)
 {
         chdev->cmd = &ioc_ata_cmd;
-        chdev->isr = &ioc_ata_isr;
+        chdev->isr = &x86_ioapic_ata0;
         ata_init();
 }
@@ -217 +218 @@
 }
 
-static void ioc_ata_isr(chdev_t *chdev)
-{
+void ioc_ata_isr(hal_cpu_context_t *ctx)
+{
+        x86_printf("rip = %Z\n", ctx->tf_rip);
+
         x86_panic((char *)__func__);
 }