xnu-6153.11.26.tar.gz

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

diff --git a/osfmk/i386/ldt.c b/osfmk/i386/ldt.c
index e2d0ee1c213e740284e2cfc6ede339ce2bb9bc67..53bfe023eb558cb8bd1bfa8cd9c8e7c93e05c838 100644 (file)
--- a/osfmk/i386/ldt.c
+++ b/osfmk/i386/ldt.c
@@ -1,8 +1,8 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @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
  * 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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,
  * 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,


@@ -22,34 +22,34 @@
  * 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.
  * 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@
  */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @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.
  */


@@ -57,54 +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>
-
-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)))
+__attribute__ ((section("__HIB, __desc")))
+        = {
+       [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
+               ),
+       };

 
 

-};
+unsigned mldtsz = sizeof(master_ldt);