Changeset 308 for trunk/hal/x86_64/core/hal_init.c

Timestamp:

Aug 1, 2017, 10:30:39 AM (7 years ago)

Author:

max@…

Message:

Add a basic syscall entry.

File:

• trunk/hal/x86_64/core/hal_init.c (modified) (6 diffs)

trunk/hal/x86_64/core/hal_init.c

@@ -26 +26 @@
 #include <hal_acpi.h>
 #include <hal_apic.h>
+#include <hal_kentry.h>
 #include <hal_internal.h>
 #include <hal_register.h>
@@ -447 +448 @@
 static void
 gdt_set_memseg(struct gdt_memseg *sd, void *base, size_t limit,
-        int type, int dpl, int gran, int is64)
+        int type, int dpl, int gran, bool_t is64)
 {
         sd->sd_lolimit = (unsigned)limit;
@@ -457 +458 @@
         sd->sd_avl = 0;
         sd->sd_long = is64;
-        sd->sd_def32 = 0;
+        sd->sd_def32 = !is64;
         sd->sd_gran = gran;
         sd->sd_hibase = (unsigned long)base >> 24;
@@ -483 +484 @@
         /* Flat segments */
         gdt_set_memseg(GDT_ADDR_MEM(gdtstore, GDT_KCODE_SEL), 0,
-            0xfffff, SDT_MEMERA, SEL_KPL, 1, 1);
+            0xfffff, SDT_MEMERA, SEL_KPL, 1, true);
         gdt_set_memseg(GDT_ADDR_MEM(gdtstore, GDT_KDATA_SEL), 0,
-            0xfffff, SDT_MEMRWA, SEL_KPL, 1, 1);
+            0xfffff, SDT_MEMRWA, SEL_KPL, 1, true);
+        gdt_set_memseg(GDT_ADDR_MEM(gdtstore, GDT_UCODE32_SEL), 0,
+            0xfffff, SDT_MEMERA, SEL_UPL, 1, false);
         gdt_set_memseg(GDT_ADDR_MEM(gdtstore, GDT_UCODE_SEL), 0,
-            0xfffff, SDT_MEMERA, SEL_UPL, 1, 1);
+            0xfffff, SDT_MEMERA, SEL_UPL, 1, true);
         gdt_set_memseg(GDT_ADDR_MEM(gdtstore, GDT_UDATA_SEL), 0,
-            0xfffff, SDT_MEMRWA, SEL_UPL, 1, 1);
+            0xfffff, SDT_MEMRWA, SEL_UPL, 1, true);
 }
 
@@ -625 +628 @@
 void cpu_tls_init(size_t lid)
 {
+        extern uint64_t x86_syscall;
+        extern uint64_t x86_syscall32;
+
         percpu_archdata_t *data = &cpudata[lid];
         tls_t *cputls = &data->tls;
@@ -635 +641 @@
         cputls->tls_intr = INTRS_DISABLED;
 
+        /* syscall */
+        wrmsr(MSR_STAR,
+            ((uint64_t)GDT_FIXED_SEL(GDT_KCODE_SEL, SEL_KPL) << 32) |
+            ((uint64_t)GDT_FIXED_SEL(GDT_UCODE32_SEL, SEL_UPL) << 48));
+        wrmsr(MSR_LSTAR, (uint64_t)&x86_syscall);
+        wrmsr(MSR_CSTAR, (uint64_t)&x86_syscall32);
+        wrmsr(MSR_SFMASK, PSL_NT|PSL_T|PSL_I|PSL_C|PSL_D);
+
+        /* TLS */
         wrmsr(MSR_FSBASE, 0);
         wrmsr(MSR_GSBASE, (uint64_t)cputls);