Changeset 308 for trunk/hal

Timestamp:

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

Author:

max@…

Message:

Add a basic syscall entry.

Location:

trunk/hal/x86_64/core

Files:

• hal_exception.c (modified) (1 diff)
• hal_init.c (modified) (6 diffs)
• hal_kentry.S (modified) (1 diff)
• hal_kentry.h (modified) (1 diff)
• hal_segmentation.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_exception.c

@@ -74 +74 @@
         x86_printf("%s\n", (char *)buf);
         x86_printf("-> rip = %Z\n", ctx->tf_rip);
-        x86_printf("-> rsp = %Z\n", ctx->tf_rsp);
+        x86_printf("-> rdi = %Z\n", ctx->tf_rdi);
+        x86_printf("-> rbp = %Z\n", ctx->tf_rbp);
         x86_printf("-> tls = %Z (gid=%Z)\n", (uint64_t)curcpu(),
             (uint64_t)hal_get_gid());

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);

trunk/hal/x86_64/core/hal_kentry.S

@@ -44 +44 @@
         .type   hal_com1_intr, @function
         .type   hal_keyboard_intr, @function
+
+        /*
+         * Syscall.
+         */
+ASM_ENTRY(x86_syscall)
+        /* for now, panic */
+        ZTRAPENTRY(T_RESERVED)
+
+ASM_ENTRY(x86_syscall32)
+        /* for now, panic */
+        ZTRAPENTRY(T_RESERVED)
 
         /*

trunk/hal/x86_64/core/hal_kentry.h

@@ -47 +47 @@
 #define CPUVAR(off)     %gs:CPU_INFO_ ## off
 
+/*
+ * Processor Status Longword.
+ */
+#define PSL_C           0x00000001      /* carry flag */
+#define PSL_PF          0x00000004      /* parity flag */
+#define PSL_AF          0x00000010      /* auxiliary carry flag */
+#define PSL_Z           0x00000040      /* zero flag */
+#define PSL_N           0x00000080      /* sign flag */
+#define PSL_T           0x00000100      /* trap flag */
+#define PSL_I           0x00000200      /* interrupt enable flag */
+#define PSL_D           0x00000400      /* direction flag */
+#define PSL_V           0x00000800      /* overflow flag */
+#define PSL_IOPL        0x00003000      /* i/o privilege level */
+#define PSL_NT          0x00004000      /* nested task */
+#define PSL_RF          0x00010000      /* resume flag */
+#define PSL_VM          0x00020000      /* virtual 8086 mode */
+#define PSL_AC          0x00040000      /* alignment check flag */
+#define PSL_VIF         0x00080000      /* virtual interrupt enable flag */
+#define PSL_VIP         0x00100000      /* virtual interrupt pending flag */
+#define PSL_ID          0x00200000      /* identification flag */
+
+#define PSL_MBO         0x00000002      /* must be one bits */
+#define PSL_MBZ         0xffc08028      /* must be zero bits */
+
+#define PSL_USERSET     (PSL_MBO | PSL_I)
+
+/*
+ * Trap frame
+ */
+
 #define TF_REGSIZE      (19 * 8)
-
-#define PSL_I           0x00000200
-#define PSL_MBO         0x00000002
-#define PSL_USERSET     (PSL_MBO | PSL_I)
 
 #define INTR_SAVE_REGS  \

trunk/hal/x86_64/core/hal_segmentation.h

@@ -27 +27 @@
 #define GDT_KCODE_SEL   1       /* Kernel code descriptor */
 #define GDT_KDATA_SEL   2       /* Kernel data descriptor */
-#define GDT_UCODE_SEL   3       /* User code descriptor */
-#define GDT_UDATA_SEL   4       /* User data descriptor */
+#define GDT_UCODE32_SEL 3       /* User code descriptor - 32bit */
+#define GDT_UCODE_SEL   4       /* User code descriptor */
+#define GDT_UDATA_SEL   5       /* User data descriptor */
 #define NGDT_MEM        6       /* aligned */