X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..ea3f04195ba4a5034c9c8e9b726d4f7ce96f1832:/osfmk/i386/ktss.c?ds=sidebyside

diff --git a/osfmk/i386/ktss.c b/osfmk/i386/ktss.c
index b2236f355..0507cb791 100644
--- a/osfmk/i386/ktss.c
+++ b/osfmk/i386/ktss.c
@@ -1,17 +1,20 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -19,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.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
-/* 
+/*
  * 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.
- * 
+ *
  * 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
- * 
+ *
  *  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.
  */
@@ -58,77 +61,21 @@
  *
  * We don't use the i386 task switch mechanism.  We need a TSS
  * only to hold the kernel stack pointer for the current thread.
- *
- * XXX multiprocessor??
  */
 #include <i386/tss.h>
-#include <i386/seg.h>
-#include <mach_kdb.h>
+#include <i386/pmap.h>
 
-struct i386_tss	ktss = {
-	0,				/* back link */
-	0,				/* esp0 */
-	KERNEL_DS,			/* ss0 */
-	0,				/* esp1 */
-	0,				/* ss1 */
-	0,				/* esp2 */
-	0,				/* ss2 */
-	0,				/* cr3 */
-	0,				/* eip */
-	0,				/* eflags */
-	0,				/* eax */
-	0,				/* ecx */
-	0,				/* edx */
-	0,				/* ebx */
-	0,				/* esp */
-	0,				/* ebp */
-	0,				/* esi */
-	0,				/* edi */
-	0,				/* es */
-	0,				/* cs */
-	0,				/* ss */
-	0,				/* ds */
-	0,				/* fs */
-	0,				/* gs */
-	KERNEL_LDT,			/* ldt */
-	0,				/* trace_trap */
-	0x0FFF				/* IO bitmap offset -
-					   beyond end of TSS segment,
-					   so no bitmap */
-};
 
-#if	MACH_KDB
+/*
+ * The transient stack for sysenter.
+ * At its top is a 32-bit link to the PCB in legacy mode, 64-bit otherwise.
+ * NB: it also must be large enough to contain a interrupt stack frame
+ * due to a single-step trace trap at system call entry.
+ */
+struct sysenter_stack master_sstk
+__attribute__ ((section("__HIB, __desc")))
+__attribute__ ((aligned(16)))  = { {0}, 0 };
 
-struct i386_tss	dbtss = {
-	0,				/* back link */
-	0,				/* esp0 */
-	KERNEL_DS,			/* ss0 */
-	0,				/* esp1 */
-	0,				/* ss1 */
-	0,				/* esp2 */
-	0,				/* ss2 */
-	0,				/* cr3 */
-	0,				/* eip */
-	0,				/* eflags */
-	0,				/* eax */
-	0,				/* ecx */
-	0,				/* edx */
-	0,				/* ebx */
-	0,				/* esp */
-	0,				/* ebp */
-	0,				/* esi */
-	0,				/* edi */
-	KERNEL_DS,			/* es */
-	KERNEL_CS,			/* cs */
-	KERNEL_DS,			/* ss */
-	KERNEL_DS,			/* ds */
-	KERNEL_DS,			/* fs */
-	KERNEL_DS,			/* gs */
-	KERNEL_LDT,			/* ldt */
-	0,				/* trace_trap */
-	0x0FFF				/* IO bitmap offset -
-					   beyond end of TSS segment,
-					   so no bitmap */
+struct x86_64_tss master_ktss64 __attribute__ ((aligned(4096))) __attribute__ ((section("__HIB, __desc"))) = {
+	.io_bit_map_offset = 0x0FFF,
 };
-
-#endif	/* MACH_KDB */