xnu-1456.1.26.tar.gz

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

diff --git a/osfmk/i386/gdt.c b/osfmk/i386/gdt.c
index 500c344950c2ea17831921f825755de557e6d53f..c3502e06be2f392ae91a86f075e907d2c32b8aed 100644 (file)
--- a/osfmk/i386/gdt.c
+++ b/osfmk/i386/gdt.c
@@ -1,23 +1,29 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 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_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

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


@@ -54,67 +60,51 @@
 /*
  * Global descriptor table.
  */
 /*
  * Global descriptor table.
  */

-#include <mach/machine.h>
-#include <mach/i386/vm_param.h>
-#include <kern/thread.h>
-#include <i386/cpu_data.h>
-#include <i386/mp_desc.h>
+#include <i386/seg.h>

 
 

-struct fake_descriptor master_gdt[GDTSZ] __attribute__ ((aligned (4096))) = {
-       [SEL_TO_INDEX(KERNEL_CS)] {     /* kernel code */
+struct real_descriptor master_gdt[GDTSZ] __attribute__ ((section("__INITGDT,__data")))= {
+       [SEL_TO_INDEX(KERNEL32_CS)] MAKE_REAL_DESCRIPTOR(       /* kernel 32-bit code */ 

                0,
                0xfffff,
                SZ_32|SZ_G,
                0,
                0xfffff,
                SZ_32|SZ_G,

-               ACC_P|ACC_PL_K|ACC_CODE_R,
-       },
-       [SEL_TO_INDEX(KERNEL_DS)] {     /* kernel data */
+               ACC_P|ACC_PL_K|ACC_CODE_R
+       ),
+       [SEL_TO_INDEX(KERNEL_DS)] MAKE_REAL_DESCRIPTOR( /* kernel data */

                0,
                0xfffff,
                SZ_32|SZ_G,
                ACC_P|ACC_PL_K|ACC_DATA_W
                0,
                0xfffff,
                SZ_32|SZ_G,
                ACC_P|ACC_PL_K|ACC_DATA_W

-       },
-       [SEL_TO_INDEX(KERNEL_LDT)] {    /* local descriptor table */
-               (uint32_t) &master_ldt,
-               LDTSZ_MIN*sizeof(struct fake_descriptor)-1,
-               0,
-               ACC_P|ACC_PL_K|ACC_LDT
-       },                              /* The slot KERNEL_LDT_2 is reserved. */
-       [SEL_TO_INDEX(KERNEL_TSS)] {    /* TSS for this processor */
-               (uint32_t) &master_ktss,
-               sizeof(struct i386_tss)-1,
-               0,
-               ACC_P|ACC_PL_K|ACC_TSS
-       },                              /* The slot KERNEL_TSS_2 is reserved. */
-       [SEL_TO_INDEX(CPU_DATA_GS)] {   /* per-CPU current thread address */
-               (uint32_t) &cpu_data_master,
-               sizeof(cpu_data_t)-1,
-               SZ_32,
-               ACC_P|ACC_PL_K|ACC_DATA_W
-       },
-       [SEL_TO_INDEX(USER_LDT)] {      /* user local descriptor table */
-               (uint32_t) &master_ldt,
-               LDTSZ_MIN*sizeof(struct fake_descriptor)-1,
-               0,
-               ACC_P|ACC_PL_K|ACC_LDT
-       },
-       [SEL_TO_INDEX(KERNEL64_CS)] {   /* kernel 64-bit code */ 
+       ),
+       [SEL_TO_INDEX(KERNEL64_CS)] MAKE_REAL_DESCRIPTOR(       /* kernel 64-bit code */ 

                0,
                0xfffff,
                SZ_64|SZ_G,
                ACC_P|ACC_PL_K|ACC_CODE_R
                0,
                0xfffff,
                SZ_64|SZ_G,
                ACC_P|ACC_PL_K|ACC_CODE_R

-       },
-       [SEL_TO_INDEX(KERNEL64_SS)] {   /* kernel 64-bit syscall stack */ 
+       ),
+       [SEL_TO_INDEX(KERNEL64_SS)] MAKE_REAL_DESCRIPTOR(       /* kernel 64-bit syscall stack */ 

                0,
                0xfffff,
                SZ_32|SZ_G,
                ACC_P|ACC_PL_K|ACC_DATA_W
                0,
                0xfffff,
                SZ_32|SZ_G,
                ACC_P|ACC_PL_K|ACC_DATA_W

-       },
-#if    MACH_KDB
-       [SEL_TO_INDEX(DEBUG_TSS)] {     /* TSS for this processor */
-               (uint32_t)&master_dbtss,
-               sizeof(struct i386_tss)-1,
+       ),
+#ifdef __x86_64__
+       [SEL_TO_INDEX(USER_CS)] MAKE_REAL_DESCRIPTOR(   /* 32-bit user code segment */

                0,
                0,

-               ACC_P|ACC_PL_K|ACC_TSS
-       },
-#endif /* MACH_KDB */
+               0xfffff,
+               SZ_32|SZ_G,
+               ACC_P|ACC_PL_U|ACC_CODE_R
+       ),
+       [SEL_TO_INDEX(USER_DS)] MAKE_REAL_DESCRIPTOR(   /* 32-bit 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

 };
 };