X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/21362eb3e66fd2c787aee132bce100a44d71a99c..d9a64523371fa019c4575bb400cbbc3a50ac9903:/osfmk/i386/ktss.c

diff --git a/osfmk/i386/ktss.c b/osfmk/i386/ktss.c
index df65efe02..9d49d2571 100644
--- a/osfmk/i386/ktss.c
+++ b/osfmk/i386/ktss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -61,77 +61,22 @@
  *
  * 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 */