xnu-7195.50.7.100.1.tar.gz

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

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index 2ad1ec04bcbb49179bd9fb2fc3a20a4d032f8aab..53bfe023eb558cb8bd1bfa8cd9c8e7c93e05c838 100644 (file)
--- a/osfmk/i386/ldt.c
+++ b/osfmk/i386/ldt.c
@@ -1,49 +1,55 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @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. 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/* 
+/*

  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.

- * 
+ *

  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.

- * 
+ *

  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.

- * 
+ *

  * Carnegie Mellon requests users of this software to return to
  * Carnegie Mellon requests users of this software to return to

- * 
+ *

  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890

- * 
+ *

  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */


@@ -51,50 +57,20 @@
  */
 
 /*
  */
 
 /*

- * "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>
  * same LDT.
  */
 #include <i386/seg.h>

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

 
 

-struct fake_descriptor master_ldt[LDTSZ] __attribute__ ((aligned (4096))) = {
-       [SEL_TO_INDEX(SYSENTER_CS)] {   /* kernel code (sysenter) */
+struct real_descriptor  master_ldt[LDTSZ] __attribute__ ((aligned(4096)))
+__attribute__ ((section("__HIB, __desc")))
+        = {
+       [SEL_TO_INDEX(USER_CTHREAD)] = MAKE_REAL_DESCRIPTOR(    /* user cthread segment */

                0,
                0xfffff,
                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
-       },
-};
+               SZ_32 | SZ_G,
+               ACC_P | ACC_PL_U | ACC_DATA_W
+               ),
+       };
+
+unsigned mldtsz = sizeof(master_ldt);