xnu-792.22.5.tar.gz

[apple/xnu.git] / osfmk / i386 / mp_desc.h

diff --git a/osfmk/i386/mp_desc.h b/osfmk/i386/mp_desc.h
index 3a89fad0707e034dd75d3bb420241444533ed991..8f591cfcc35dadca681060f99c15a9dbedb1df2a 100644 (file)
--- a/osfmk/i386/mp_desc.h
+++ b/osfmk/i386/mp_desc.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -77,26 +83,47 @@ __BEGIN_DECLS
  * Note that dbtss could be conditionalized on MACH_KDB, but
  * doing so increases misconfiguration risk.
  */
  * Note that dbtss could be conditionalized on MACH_KDB, but
  * doing so increases misconfiguration risk.
  */

-struct mp_desc_table {
-       struct fake_descriptor  idt[IDTSZ];     /* IDT */
-       struct fake_descriptor  gdt[GDTSZ];     /* GDT */
-       struct fake_descriptor  ldt[LDTSZ];     /* LDT */
-       struct i386_tss         ktss;
-       struct i386_tss         dbtss;
-};
+typedef struct cpu_desc_table {
+       struct fake_descriptor  idt[IDTSZ] __attribute__ ((aligned (16)));
+       struct fake_descriptor  gdt[GDTSZ] __attribute__ ((aligned (16)));
+       struct i386_tss         ktss       __attribute__ ((aligned (16)));
+       struct i386_tss         dbtss      __attribute__ ((aligned (16)));
+       struct sysenter_stack   sstk;
+} cpu_desc_table_t;
+
+typedef struct cpu_desc_table64 {
+       struct fake_descriptor64 idt[IDTSZ]      __attribute__ ((aligned (16)));
+       struct fake_descriptor  gdt[GDTSZ]       __attribute__ ((aligned (16)));
+       struct x86_64_tss       ktss             __attribute__ ((aligned (16)));
+       struct sysenter_stack   sstk             __attribute__ ((aligned (16)));
+       uint8_t                 dfstk[PAGE_SIZE] __attribute__ ((aligned (16)));
+} cpu_desc_table64_t;

 
 #define        current_gdt()   (current_cpu_datap()->cpu_desc_index.cdi_gdt)
 #define        current_idt()   (current_cpu_datap()->cpu_desc_index.cdi_idt)
 #define        current_ldt()   (current_cpu_datap()->cpu_desc_index.cdi_ldt)
 #define        current_ktss()  (current_cpu_datap()->cpu_desc_index.cdi_ktss)
 #define        current_dbtss() (current_cpu_datap()->cpu_desc_index.cdi_dbtss)
 
 #define        current_gdt()   (current_cpu_datap()->cpu_desc_index.cdi_gdt)
 #define        current_idt()   (current_cpu_datap()->cpu_desc_index.cdi_idt)
 #define        current_ldt()   (current_cpu_datap()->cpu_desc_index.cdi_ldt)
 #define        current_ktss()  (current_cpu_datap()->cpu_desc_index.cdi_ktss)
 #define        current_dbtss() (current_cpu_datap()->cpu_desc_index.cdi_dbtss)

+#define        current_sstk()  (current_cpu_datap()->cpu_desc_index.cdi_sstk)
+
+#define        current_ktss64() ((struct x86_64_tss *) current_ktss())
+#define        current_sstk64() ((addr64_t *) current_sstk())

 
 #define        gdt_desc_p(sel) \
        ((struct real_descriptor *)&current_gdt()[sel_idx(sel)])
 #define        ldt_desc_p(sel) \
        ((struct real_descriptor *)&current_ldt()[sel_idx(sel)])
 
 
 #define        gdt_desc_p(sel) \
        ((struct real_descriptor *)&current_gdt()[sel_idx(sel)])
 #define        ldt_desc_p(sel) \
        ((struct real_descriptor *)&current_ldt()[sel_idx(sel)])
 

-extern void    mp_desc_init(cpu_data_t *cdp, boolean_t is_boot_cpu);
+extern void    cpu_desc_init(
+                       cpu_data_t      *cdp,
+                       boolean_t       is_boot_cpu);
+extern void    cpu_desc_init64(
+                       cpu_data_t      *cdp,
+                       boolean_t       is_boot_cpu);
+extern void    cpu_desc_load64(
+                       cpu_data_t      *cdp);
+extern void    fast_syscall_init(void);
+extern void    fast_syscall_init64(void);

 
 static inline boolean_t
 valid_user_data_selector(uint16_t selector)
 
 static inline boolean_t
 valid_user_data_selector(uint16_t selector)