X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..cf7d32b81c573a0536dc4da4157f9c26f8d0bed3:/osfmk/i386/ldt.c

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index 50429cb92..428bf9226 100644
--- a/osfmk/i386/ldt.c
+++ b/osfmk/i386/ldt.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -58,31 +61,46 @@
  * 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,
-	  (VM_MAX_ADDRESS-VM_MIN_ADDRESS-1)>>12,
+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
-	},				/* user code segment */
-/*01F*/	{ 0,
-	  (VM_MAX_ADDRESS-VM_MIN_ADDRESS-1)>>12,
+	},
+	[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
-	},				/* user data segment */
+	},
 };