xnu-2050.18.24.tar.gz

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

diff --git a/osfmk/i386/ktss.c b/osfmk/i386/ktss.c
index df65efe02caa52fe24b0c25374811121212f247f..a0275828c9e6375d819817118d2a23b51583de05 100644 (file)
--- 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-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -61,14 +61,14 @@
  *
  * 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 = {
+#ifdef __i386__
+struct i386_tss        master_ktss
+       __attribute__ ((section ("__DESC, master_ktss")))
+       __attribute__ ((aligned (4096))) = {
        0,                              /* back link */
        0,                              /* esp0 */
        KERNEL_DS,                      /* ss0 */
@@ -99,34 +99,93 @@ struct i386_tss     ktss = {
                                           beyond end of TSS segment,
                                           so no bitmap */
 };
+#endif
 
-#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 ("__DESC, master_sstk")))
+       __attribute__ ((aligned (16)))  = { {0}, 0 };
+
+#ifdef X86_64
+struct x86_64_tss master_ktss64 __attribute__ ((aligned (4096))) = {
+       .io_bit_map_offset = 0x0FFF,
+};
+#endif /* X86_64 */
 
-struct i386_tss        dbtss = {
+#ifdef __i386__
+/*
+ * Task structure for double-fault handler:
+ */
+struct i386_tss        master_dftss
+       __attribute__ ((section ("__DESC, master_dftss")))
+       __attribute__ ((aligned (4096))) = {
        0,                              /* back link */
-       0,                              /* esp0 */
+       (int) &df_task_stack_end - 4,   /* esp0 */
        KERNEL_DS,                      /* ss0 */
        0,                              /* esp1 */
        0,                              /* ss1 */
        0,                              /* esp2 */
        0,                              /* ss2 */
-       0,                              /* cr3 */
-       0,                              /* eip */
+       (int) IdlePDPT,                         /* cr3 */
+       (int) &df_task_start,           /* eip */
        0,                              /* eflags */
        0,                              /* eax */
        0,                              /* ecx */
        0,                              /* edx */
        0,                              /* ebx */
-       0,                              /* esp */
+       (int) &df_task_stack_end - 4,   /* esp */
+       0,                              /* ebp */
+       0,                              /* esi */
+       0,                              /* edi */
+       KERNEL_DS,                      /* es */
+       KERNEL32_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 */
+       (int) IdlePDPT,                         /* 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 */
+       KERNEL32_CS,                    /* cs */
        KERNEL_DS,                      /* ss */
        KERNEL_DS,                      /* ds */
        KERNEL_DS,                      /* fs */
-       KERNEL_DS,                      /* gs */
+       CPU_DATA_GS,                    /* gs */
        KERNEL_LDT,                     /* ldt */
        0,                              /* trace_trap */
        0x0FFF                          /* IO bitmap offset -
@@ -134,4 +193,4 @@ struct i386_tss     dbtss = {
                                           so no bitmap */
 };
 
-#endif /* MACH_KDB */
+#endif /* __i386__ */