xnu-792.21.3.tar.gz

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

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index 13ed8cd32d94a1c48edcbead01174dfaaef94646..e2d0ee1c213e740284e2cfc6ede339ce2bb9bc67 100644 (file)
--- a/osfmk/i386/ldt.c
+++ b/osfmk/i386/ldt.c
@@ -65,42 +65,46 @@
 #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,
+         0xfffff,
+         SZ_32|SZ_G,
+         ACC_P|ACC_PL_U|ACC_CODE_R
+       },                              /* user code segment */
+/*01F*/        { 0,
+         0xfffff,
+         SZ_32|SZ_G,
+         ACC_P|ACC_PL_U|ACC_DATA_W
+       },                              /* user data segment */
+/*027*/        { 0,
+         0xfffff,
+         SZ_32|SZ_G,
+         ACC_P|ACC_PL_U|ACC_DATA_W
+       },                              /* user cthread segment */
+// Storage space for user ldt entries we will make room for 10 entries initially
+// as we will probably never need many more than that
+/*02F*/        { 0, 0, 0, 0},
+/*037*/        { 0, 0, 0, 0},
+/*03F*/        { 0, 0, 0, 0},
+/*047*/        { 0, 0, 0, 0},
+/*04F*/        { 0, 0, 0, 0},
+/*057*/        { 0, 0, 0, 0},
+/*05F*/        { 0, 0, 0, 0},
+/*067*/        { 0, 0, 0, 0},
+/*06F*/        { 0, 0, 0, 0},
+/*077*/        { 0, 0, 0, 0},
 
-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
-       },
 };