X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..db6096698656d32db7df630594bd9617ee54f828:/osfmk/i386/ldt.c?ds=sidebyside

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index e2d0ee1c2..ff1facd34 100644
--- a/osfmk/i386/ldt.c
+++ b/osfmk/i386/ldt.c
@@ -57,54 +57,49 @@
  */
 
 /*
- * "Local" descriptor table.  At the moment, all tasks use the
+ * "Local" descriptor table. At the moment, all tasks use the
  * same LDT.
  */
 #include <i386/seg.h>
-#include <i386/pmap.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,
-	  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 real_descriptor	master_ldt[LDTSZ] __attribute__ ((aligned (4096))) = {
+#ifdef __i386__
+	[SEL_TO_INDEX(SYSENTER_CS)] = MAKE_REAL_DESCRIPTOR(	/* kernel code (sysenter) */
+		0,
+		0xfffff,
+		SZ_32|SZ_G,
+		ACC_P|ACC_PL_K|ACC_CODE_R
+	),
+	[SEL_TO_INDEX(SYSENTER_DS)] = MAKE_REAL_DESCRIPTOR(	/* kernel data (sysenter) */
+		0,
+		0xfffff,
+		SZ_32|SZ_G,
+		ACC_P|ACC_PL_K|ACC_DATA_W
+	),
+	[SEL_TO_INDEX(USER_CS)] = MAKE_REAL_DESCRIPTOR(	/* 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(	/* 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
+	[SEL_TO_INDEX(USER_CTHREAD)] = MAKE_REAL_DESCRIPTOR(	/* user cthread segment */
+		0,
+		0xfffff,
+		SZ_32|SZ_G,
+		ACC_P|ACC_PL_U|ACC_DATA_W
+	),
 };