Changeset 80 for trunk/hal

Timestamp:

Jun 27, 2017, 5:24:02 PM (7 years ago)

Author:

max@…

Message:

add the timer vector, for now it double-faults

Location:

trunk/hal/x86_64/core

Files:

• hal_init.c (modified) (2 diffs)
• hal_kentry.S (modified) (3 diffs)
• hal_lapic.h (modified) (1 diff)
• hal_segmentation.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_init.c

@@ -184 +184 @@
         kernel_init(&btinfo);
         x86_printf("[+] kernel_init called\n");
+
+
+        sti();
+        while (1);
 
         int m = 0;
@@ -288 +292 @@
 static void idt_create()
 {
-        extern uint64_t x86_traps[], x86_intrs[];
+        extern uint64_t x86_traps[], x86_intrs[], x86_rsvd;
         struct idt_seg *idt;
         size_t i;
 
         idt = (struct idt_seg *)&idtstore;
+
+        /* First, put a dead entry */
+        for (i = 0; i < NIDT; i++) {
+                idt_set_seg(&idt[i], (void *)&x86_rsvd, 0,
+                    SDT_SYS386IGT, SEL_KPL, GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL));
+        }
 
         /* General exceptions */

trunk/hal/x86_64/core/hal_kentry.S

@@ -111 +111 @@
 ASM_ENTRY(x86_trap1e)
 ASM_ENTRY(x86_trap1f)
+ASM_ENTRY(x86_rsvd)
         /* 20 - 31 reserved for future exp */
         ZTRAPENTRY(T_RESERVED)
@@ -119 +120 @@
 ASM_ENTRY(x86_spurious)
         ZTRAPENTRY(T_ASTFLT)
-
-
+ASM_ENTRY(x86_timer)
+        ZTRAPENTRY(T_ASTFLT)
 
 /*
@@ -164 +165 @@
 x86_intrs:
         .quad   x86_spurious
+        .quad   x86_timer
 

trunk/hal/x86_64/core/hal_lapic.h

@@ -24 +24 @@
 
 #define LAPIC_SPURIOUS_VECTOR   LAPICVEC_MIN
+#define LAPIC_TIMER_VECTOR      (LAPICVEC_MIN + 1)
 
 #define LAPIC_ID                0x020   /* ID. RW */

trunk/hal/x86_64/core/hal_segmentation.h

@@ -194 +194 @@
 #define CPUVEC_MAX      32      /* reserved entries for CPU exceptions */
 #define LAPICVEC_MIN    CPUVEC_MAX
-#define LAPICVEC_MAX    (LAPICVEC_MIN + 1)
+#define LAPICVEC_MAX    (LAPICVEC_MIN + 2)
 
 #define NIDT    256     /* total number of IDT entries */