xnu-1504.7.4.tar.gz

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

diff --git a/osfmk/i386/ktss.c b/osfmk/i386/ktss.c
index 7f15e92172553ed7292a0320dd0218b0fbda638f..973fc395adf1a0b4b090845e8fc10fa45a6dc78b 100644 (file)
--- a/osfmk/i386/ktss.c
+++ b/osfmk/i386/ktss.c
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_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 
- * 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, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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,
+ * 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_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -63,12 +61,12 @@
  *
  * We don't use the i386 task switch mechanism.  We need a TSS
  * only to hold the kernel stack pointer for the current thread.
- *
  */
 #include <i386/tss.h>
-#include <i386/seg.h>
+#include <i386/pmap.h>
 #include <mach_kdb.h>
 
+#ifdef __i386__
 struct i386_tss        master_ktss
        __attribute__ ((section ("__DESC, master_ktss")))
        __attribute__ ((aligned (4096))) = {
@@ -102,6 +100,7 @@ struct i386_tss     master_ktss
                                           beyond end of TSS segment,
                                           so no bitmap */
 };
+#endif
 
 /*
  * The transient stack for sysenter.
@@ -118,9 +117,8 @@ struct x86_64_tss master_ktss64 __attribute__ ((aligned (4096))) = {
        .io_bit_map_offset = 0x0FFF,
 };
 #endif /* X86_64 */
- 
-
 
+#ifdef __i386__
 /*
  * Task structure for double-fault handler:
  */
@@ -134,7 +132,7 @@ struct i386_tss     master_dftss
        0,                              /* ss1 */
        0,                              /* esp2 */
        0,                              /* ss2 */
-       0,                              /* cr3 */
+       (int) IdlePDPT,                         /* cr3 */
        (int) &df_task_start,           /* eip */
        0,                              /* eflags */
        0,                              /* eax */
@@ -146,7 +144,7 @@ struct i386_tss     master_dftss
        0,                              /* esi */
        0,                              /* edi */
        KERNEL_DS,                      /* es */
-       KERNEL_CS,                      /* cs */
+       KERNEL32_CS,                    /* cs */
        KERNEL_DS,                      /* ss */
        KERNEL_DS,                      /* ds */
        KERNEL_DS,                      /* fs */
@@ -172,7 +170,7 @@ struct i386_tss     master_mctss
        0,                              /* ss1 */
        0,                              /* esp2 */
        0,                              /* ss2 */
-       0,                              /* cr3 */
+       (int) IdlePDPT,                         /* cr3 */
        (int) &mc_task_start,           /* eip */
        0,                              /* eflags */
        0,                              /* eax */
@@ -184,7 +182,7 @@ struct i386_tss     master_mctss
        0,                              /* esi */
        0,                              /* edi */
        KERNEL_DS,                      /* es */
-       KERNEL_CS,                      /* cs */
+       KERNEL32_CS,                    /* cs */
        KERNEL_DS,                      /* ss */
        KERNEL_DS,                      /* ds */
        KERNEL_DS,                      /* fs */
@@ -208,7 +206,7 @@ struct i386_tss     master_dbtss
        0,                              /* ss1 */
        0,                              /* esp2 */
        0,                              /* ss2 */
-       0,                              /* cr3 */
+       (int) IdlePDPT,         /* cr3 */
        0,                              /* eip */
        0,                              /* eflags */
        0,                              /* eax */
@@ -220,7 +218,7 @@ struct i386_tss     master_dbtss
        0,                              /* esi */
        0,                              /* edi */
        KERNEL_DS,                      /* es */
-       KERNEL_CS,                      /* cs */
+       KERNEL32_CS,                    /* cs */
        KERNEL_DS,                      /* ss */
        KERNEL_DS,                      /* ds */
        KERNEL_DS,                      /* fs */
@@ -233,3 +231,4 @@ struct i386_tss     master_dbtss
 };
 
 #endif /* MACH_KDB */
+#endif