xnu-792.25.20.tar.gz

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

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index 824610f9b06dc45b750c20421b32853c641b6879..2ad1ec04bcbb49179bd9fb2fc3a20a4d032f8aab 100644 (file)
--- a/osfmk/i386/ldt.c
+++ b/osfmk/i386/ldt.c
@@ -55,31 +55,46 @@
  * same LDT.
  */
 #include <i386/seg.h>
  * same LDT.
  */
 #include <i386/seg.h>

+#include <i386/pmap.h>

 #include <mach/i386/vm_types.h>
 #include <mach/i386/vm_param.h>
 
 #include <mach/i386/vm_types.h>
 #include <mach/i386/vm_param.h>
 

-extern int     syscall(void);
-extern int     mach_rpc(void);

 
 

-struct fake_descriptor ldt[LDTSZ] = {
-/*007*/        { (unsigned int)&syscall,
-         KERNEL_CS,
-         0,                            /* no parameters */
-         ACC_P|ACC_PL_U|ACC_CALL_GATE
-       },                              /* call gate for system calls */
-/*00F*/        { (unsigned int)&mach_rpc,
-          KERNEL_CS,
-          0,                            /* no parameters */
-          ACC_P|ACC_PL_U|ACC_CALL_GATE
-        },                             /* call gate for mach rpc */
-/*017*/        { 0,
-         (VM_MAX_ADDRESS-VM_MIN_ADDRESS-1)>>12,
-         SZ_32|SZ_G,
-         ACC_P|ACC_PL_U|ACC_CODE_R
-       },                              /* user code segment */
-/*01F*/        { 0,
-         (VM_MAX_ADDRESS-VM_MIN_ADDRESS-1)>>12,
-         SZ_32|SZ_G,
-         ACC_P|ACC_PL_U|ACC_DATA_W
-       },                              /* user data segment */
+struct fake_descriptor master_ldt[LDTSZ] __attribute__ ((aligned (4096))) = {
+       [SEL_TO_INDEX(SYSENTER_CS)] {   /* kernel code (sysenter) */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_K|ACC_CODE_R
+       },
+       [SEL_TO_INDEX(SYSENTER_DS)] {   /* kernel data (sysenter) */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_K|ACC_DATA_W
+       },
+       [SEL_TO_INDEX(USER_CS)] {       /* user code segment */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_U|ACC_CODE_R
+       },
+       [SEL_TO_INDEX(USER_DS)] {       /* user data segment */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_U|ACC_DATA_W
+       },
+       [SEL_TO_INDEX(USER64_CS)] {     /* user 64-bit code segment */
+               0,
+               0xfffff,
+               SZ_64|SZ_G,
+               ACC_P|ACC_PL_U|ACC_CODE_R
+       },
+       [SEL_TO_INDEX(USER_CTHREAD)] {  /* user cthread segment */
+               0,
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_U|ACC_DATA_W
+       },

 };
 };