X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/89b3af67bb32e691275bf6fa803d1834b2284115..5c9f46613a83ebfc29a5b1f099448259e96a98f0:/osfmk/i386/ktss.c

diff --git a/osfmk/i386/ktss.c b/osfmk/i386/ktss.c
index a947de6e6..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,45 +61,10 @@
  *
  * 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 <mach_kdb.h>
+#include <i386/pmap.h>
 
-struct i386_tss	master_ktss
-	__attribute__ ((section ("__DESC, master_ktss")))
-	__attribute__ ((aligned (4096))) = {
-	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 */
-};
 
 /*
  * The transient stack for sysenter.
@@ -108,126 +73,10 @@ struct i386_tss	master_ktss
  * due to a single-step trace trap at system call entry.
  */
 struct sysenter_stack master_sstk
-	__attribute__ ((section ("__DESC, master_sstk")))
+	__attribute__ ((section ("__HIB, __desc")))
 	__attribute__ ((aligned (16)))  = { {0}, 0 };
 
-#ifdef X86_64
-struct x86_64_tss master_ktss64 __attribute__ ((aligned (4096))) = {
+struct x86_64_tss master_ktss64 __attribute__ ((aligned (4096))) __attribute__ ((section ("__HIB, __desc"))) = {
 	.io_bit_map_offset = 0x0FFF,
 };
-#endif	/* X86_64 */
- 
-
-
-/*
- * Task structure for double-fault handler:
- */
-struct i386_tss	master_dftss
-	__attribute__ ((section ("__DESC, master_dftss")))
-	__attribute__ ((aligned (4096))) = {
-	0,				/* back link */
-	(int) &df_task_stack_end - 4,	/* esp0 */
-	KERNEL_DS,			/* ss0 */
-	0,				/* esp1 */
-	0,				/* ss1 */
-	0,				/* esp2 */
-	0,				/* ss2 */
-	0,				/* cr3 */
-	(int) &df_task_start,		/* eip */
-	0,				/* eflags */
-	0,				/* eax */
-	0,				/* ecx */
-	0,				/* edx */
-	0,				/* ebx */
-	(int) &df_task_stack_end - 4,	/* esp */
-	0,				/* ebp */
-	0,				/* esi */
-	0,				/* edi */
-	KERNEL_DS,			/* es */
-	KERNEL_CS,			/* cs */
-	KERNEL_DS,			/* ss */
-	KERNEL_DS,			/* ds */
-	KERNEL_DS,			/* fs */
-	CPU_DATA_GS,			/* gs */
-	KERNEL_LDT,			/* ldt */
-	0,				/* trace_trap */
-	0x0FFF				/* IO bitmap offset -
-					   beyond end of TSS segment,
-					   so no bitmap */
-};
-
-
-/*
- * Task structure for machine_check handler:
- */
-struct i386_tss	master_mctss
-	__attribute__ ((section ("__DESC, master_mctss")))
-	__attribute__ ((aligned (4096))) = {
-	0,				/* back link */
-	(int) &mc_task_stack_end - 4,	/* esp0 */
-	KERNEL_DS,			/* ss0 */
-	0,				/* esp1 */
-	0,				/* ss1 */
-	0,				/* esp2 */
-	0,				/* ss2 */
-	0,				/* cr3 */
-	(int) &mc_task_start,		/* eip */
-	0,				/* eflags */
-	0,				/* eax */
-	0,				/* ecx */
-	0,				/* edx */
-	0,				/* ebx */
-	(int) &mc_task_stack_end - 4,	/* esp */
-	0,				/* ebp */
-	0,				/* esi */
-	0,				/* edi */
-	KERNEL_DS,			/* es */
-	KERNEL_CS,			/* cs */
-	KERNEL_DS,			/* ss */
-	KERNEL_DS,			/* ds */
-	KERNEL_DS,			/* fs */
-	CPU_DATA_GS,			/* gs */
-	KERNEL_LDT,			/* ldt */
-	0,				/* trace_trap */
-	0x0FFF				/* IO bitmap offset -
-					   beyond end of TSS segment,
-					   so no bitmap */
-};
-
-#if	MACH_KDB
-
-struct i386_tss	master_dbtss
-	__attribute__ ((section ("__DESC, master_dbtss")))
-	__attribute__ ((aligned (4096))) = {
-	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 */
-};
 
-#endif	/* MACH_KDB */