Changeset 86 for trunk/hal/x86_64/core/hal_kentry.S

Timestamp:

Jun 28, 2017, 3:24:02 PM (6 years ago)

Author:

max@…

Message:

enable the timer (not yet calibrated)

File:

• trunk/hal/x86_64/core/hal_kentry.S (modified) (3 diffs)

trunk/hal/x86_64/core/hal_kentry.S

@@ -23 +23 @@
 #include <hal_boot.h>
 #include <hal_kentry.h>
+#include <hal_apic.h>
 
 #define TRAPENTRY(a)    \
-        pushq $(a);     \
-        jmp alltraps;
+        pushq   $(a);   \
+        jmp     alltraps;
 
 #define ZTRAPENTRY(a) \
-        pushq $0; \
+        pushq   $0; \
         TRAPENTRY(a)
 
         .text
         .globl  hal_trap_entry
+        .globl  hal_timer_intr
         .type   hal_trap_entry, @function
+        .type   hal_timer_intr, @function
 
         /*
@@ -118 +121 @@
          * LAPIC interrupts.
          */
-ASM_ENTRY(x86_spurious)
+ASM_ENTRY(x86_lapic_spurious)
         ZTRAPENTRY(T_ASTFLT)
-ASM_ENTRY(x86_timer)
-        ZTRAPENTRY(T_ASTFLT)
+
+ASM_ENTRY(x86_lapic_timer)
+        pushq   $0
+        pushq   $T_ASTFLT
+        INTR_SAVE_REGS
+
+        movq    %rsp,%rdi
+        call    hal_timer_intr
+
+        movq    lapic_va(%rip),%rax
+        movl    $0,LAPIC_EOI(%rax)
+
+        INTR_RESTORE_REGS
+        addq    $16,%rsp
+        iretq
 
 /*
@@ -164 +180 @@
 
 x86_intrs:
-        .quad   x86_spurious
-        .quad   x86_timer
+        .quad   x86_lapic_spurious
+        .quad   x86_lapic_timer