xnu-792.25.20.tar.gz

[apple/xnu.git] / osfmk / i386 / gdt.c

diff --git a/osfmk/i386/gdt.c b/osfmk/i386/gdt.c
index 8d9f57b57a2a8ac6ae810be986b51a2f5648bcb7..500c344950c2ea17831921f825755de557e6d53f 100644 (file)
--- a/osfmk/i386/gdt.c
+++ b/osfmk/i386/gdt.c
@@ -54,71 +54,67 @@
 /*
  * Global descriptor table.
  */
-#include <i386/thread.h>
-#include <i386/seg.h>
+#include <mach/machine.h>
 #include <mach/i386/vm_param.h>
 #include <kern/thread.h>
-#include <mach_kdb.h>
+#include <i386/cpu_data.h>
+#include <i386/mp_desc.h>
 
-#ifdef MACH_BSD
-extern int     trap_unix_syscall(void), trap_mach25_syscall(void),
-               trap_machdep_syscall(void), syscall(void);
-#endif
-
-struct fake_descriptor gdt[GDTSZ] = {
-/* 0x000 */    { 0, 0, 0, 0 },         /* always NULL */
-/* 0x008 */    { LINEAR_KERNEL_ADDRESS + VM_MIN_ADDRESS,
-                 (VM_MAX_KERNEL_ADDRESS-1-VM_MIN_KERNEL_ADDRESS)>>12,
-                 SZ_32|SZ_G,
-                 ACC_P|ACC_PL_K|ACC_CODE_R
-               },                      /* kernel code */
-/* 0x010 */    { LINEAR_KERNEL_ADDRESS + VM_MIN_ADDRESS,
-                 (VM_MAX_KERNEL_ADDRESS-1-VM_MIN_KERNEL_ADDRESS)>>12,
-                 SZ_32|SZ_G,
-                 ACC_P|ACC_PL_K|ACC_DATA_W
-               },                      /* kernel data */
-/* 0x018 */    { LINEAR_KERNEL_ADDRESS + (unsigned int)ldt,
-                 LDTSZ*sizeof(struct fake_descriptor)-1,
-                 0,
-                 ACC_P|ACC_PL_K|ACC_LDT
-               },                      /* local descriptor table */
-/* 0x020 */    { LINEAR_KERNEL_ADDRESS + (unsigned int)&ktss,
-                 sizeof(struct i386_tss)-1,
-                 0,
-                 ACC_P|ACC_PL_K|ACC_TSS
-               },                      /* TSS for this processor */
-#ifdef MACH_BSD
-/* 0x28 */     { (unsigned int) &trap_unix_syscall,
-                  KERNEL_CS,
-                  0,                           /* no parameters */
-                  ACC_P|ACC_PL_U|ACC_CALL_GATE
-               },
-/* 0x30 */     { (unsigned int) &trap_mach25_syscall,
-                  KERNEL_CS,
-                  0,                           /* no parameters */
-                  ACC_P|ACC_PL_U|ACC_CALL_GATE
-               },
-/* 0x38 */     { (unsigned int) &trap_machdep_syscall,
-                  KERNEL_CS,
-                  0,                           /* no parameters */
-                  ACC_P|ACC_PL_U|ACC_CALL_GATE
-               },
-#else
-/* 0x028 */    { 0, 0, 0, 0 },         /* per-thread LDT */
-/* 0x030 */    { 0, 0, 0, 0 },         /* per-thread TSS for IO bitmap */
-/* 0x038 */    { 0, 0, 0, 0 },
-#endif
-/* 0x040 */    { 0, 0, 0, 0 },
-/* 0x048 */    { LINEAR_KERNEL_ADDRESS + (unsigned int)&cpu_data[0],
-                 sizeof(cpu_data)-1,
-                 SZ_32,
-                 ACC_P|ACC_PL_K|ACC_DATA_W
-               },                      /* per-CPU current thread address */
+struct fake_descriptor master_gdt[GDTSZ] __attribute__ ((aligned (4096))) = {
+       [SEL_TO_INDEX(KERNEL_CS)] {     /* kernel code */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_K|ACC_CODE_R,
+       },
+       [SEL_TO_INDEX(KERNEL_DS)] {     /* kernel data */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_K|ACC_DATA_W
+       },
+       [SEL_TO_INDEX(KERNEL_LDT)] {    /* local descriptor table */
+               (uint32_t) &master_ldt,
+               LDTSZ_MIN*sizeof(struct fake_descriptor)-1,
+               0,
+               ACC_P|ACC_PL_K|ACC_LDT
+       },                              /* The slot KERNEL_LDT_2 is reserved. */
+       [SEL_TO_INDEX(KERNEL_TSS)] {    /* TSS for this processor */
+               (uint32_t) &master_ktss,
+               sizeof(struct i386_tss)-1,
+               0,
+               ACC_P|ACC_PL_K|ACC_TSS
+       },                              /* The slot KERNEL_TSS_2 is reserved. */
+       [SEL_TO_INDEX(CPU_DATA_GS)] {   /* per-CPU current thread address */
+               (uint32_t) &cpu_data_master,
+               sizeof(cpu_data_t)-1,
+               SZ_32,
+               ACC_P|ACC_PL_K|ACC_DATA_W
+       },
+       [SEL_TO_INDEX(USER_LDT)] {      /* user local descriptor table */
+               (uint32_t) &master_ldt,
+               LDTSZ_MIN*sizeof(struct fake_descriptor)-1,
+               0,
+               ACC_P|ACC_PL_K|ACC_LDT
+       },
+       [SEL_TO_INDEX(KERNEL64_CS)] {   /* kernel 64-bit code */ 
+               0,
+               0xfffff,
+               SZ_64|SZ_G,
+               ACC_P|ACC_PL_K|ACC_CODE_R
+       },
+       [SEL_TO_INDEX(KERNEL64_SS)] {   /* kernel 64-bit syscall stack */ 
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_K|ACC_DATA_W
+       },
 #if    MACH_KDB
-/* 0x050 */    { LINEAR_KERNEL_ADDRESS + (unsigned int)&dbtss,
-                 sizeof(struct i386_tss)-1,
-                 0,
-                 ACC_P|ACC_PL_K|ACC_TSS
-               }                       /* TSS for this processor */
+       [SEL_TO_INDEX(DEBUG_TSS)] {     /* TSS for this processor */
+               (uint32_t)&master_dbtss,
+               sizeof(struct i386_tss)-1,
+               0,
+               ACC_P|ACC_PL_K|ACC_TSS
+       },
 #endif /* MACH_KDB */
 };