xnu-1699.26.8.tar.gz

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

diff --git a/osfmk/i386/gdt.c b/osfmk/i386/gdt.c
index 44f6a3c2f631b0442d9aa18909ffaab897a1cad9..7677f24887ce90f691fd77dead3eb7df259ac742 100644 (file)
--- a/osfmk/i386/gdt.c
+++ b/osfmk/i386/gdt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -60,71 +60,51 @@
 /*
  * Global descriptor table.
  */
-#include <mach/machine.h>
-#include <mach/i386/vm_param.h>
-#include <kern/thread.h>
-#include <i386/cpu_data.h>
-#include <i386/mp_desc.h>
+#include <i386/seg.h>
 
-#ifdef MACH_BSD
-extern int     trap_unix_syscall(void), trap_mach25_syscall(void),
-               trap_machdep_syscall(void), syscall(void);
+struct real_descriptor master_gdt[GDTSZ] __attribute__ ((section("__INITGDT,__data")))= {
+       [SEL_TO_INDEX(KERNEL32_CS)] = MAKE_REAL_DESCRIPTOR(     /* kernel 32-bit code */ 
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_K|ACC_CODE_R
+       ),
+       [SEL_TO_INDEX(KERNEL_DS)] = MAKE_REAL_DESCRIPTOR(       /* kernel data */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_K|ACC_DATA_W
+       ),
+       [SEL_TO_INDEX(KERNEL64_CS)] = MAKE_REAL_DESCRIPTOR(     /* kernel 64-bit code */ 
+               0,
+               0xfffff,
+               SZ_64|SZ_G,
+               ACC_P|ACC_PL_K|ACC_CODE_R
+       ),
+       [SEL_TO_INDEX(KERNEL64_SS)] = MAKE_REAL_DESCRIPTOR(     /* kernel 64-bit syscall stack */ 
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_K|ACC_DATA_W
+       ),
+#ifdef __x86_64__
+       [SEL_TO_INDEX(USER_CS)] = MAKE_REAL_DESCRIPTOR( /* 32-bit user code segment */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_U|ACC_CODE_R
+       ),
+       [SEL_TO_INDEX(USER_DS)] = MAKE_REAL_DESCRIPTOR( /* 32-bit user data segment */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_U|ACC_DATA_W
+       ),
+       [SEL_TO_INDEX(USER64_CS)] = MAKE_REAL_DESCRIPTOR(       /* user 64-bit code segment */
+               0,
+               0xfffff,
+               SZ_64|SZ_G,
+               ACC_P|ACC_PL_U|ACC_CODE_R
+       ),
 #endif
-
-struct fake_descriptor gdt[GDTSZ] = {
-/* 0x000 */    { 0, 0, 0, 0 },         /* always NULL */
-/* 0x008 */    { 0,
-                 0xfffff,
-                 SZ_32|SZ_G,
-                 ACC_P|ACC_PL_K|ACC_CODE_R
-               },                      /* kernel code */
-/* 0x010 */    { 0,
-                 0xfffff,
-                 SZ_32|SZ_G,
-                 ACC_P|ACC_PL_K|ACC_DATA_W
-               },                      /* kernel data */
-/* 0x018 */    { (unsigned int)ldt,
-                 LDTSZ*sizeof(struct fake_descriptor)-1,
-                 0,
-                 ACC_P|ACC_PL_K|ACC_LDT
-               },                      /* local descriptor table */
-/* 0x020 */    { (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 */    { (unsigned int)&cpu_data_master,
-                 sizeof(cpu_data_t)-1,
-                 SZ_32,
-                 ACC_P|ACC_PL_K|ACC_DATA_W
-               },                      /* per-CPU current thread address */
-#if    MACH_KDB
-/* 0x050 */    { (unsigned int)&dbtss,
-                 sizeof(struct i386_tss)-1,
-                 0,
-                 ACC_P|ACC_PL_K|ACC_TSS
-               }                       /* TSS for this processor */
-#endif /* MACH_KDB */
 };