-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;
-};
-
-#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 gdt_desc_p(sel) \
- ((struct real_descriptor *)¤t_gdt()[sel_idx(sel)])
-#define ldt_desc_p(sel) \
- ((struct real_descriptor *)¤t_ldt()[sel_idx(sel)])
-
-extern void mp_desc_init(cpu_data_t *cdp, boolean_t is_boot_cpu);
-
-static inline boolean_t
-valid_user_data_selector(uint16_t selector)
-{
- sel_t sel = selector_to_sel(selector);
-
- if (selector == 0)
- return (TRUE);
-
- if (sel.ti == SEL_LDT)
- return (TRUE);
- else if (sel.index < GDTSZ) {
- if ((gdt_desc_p(selector)->access & ACC_PL_U) == ACC_PL_U)
- return (TRUE);
- }
-
- return (FALSE);
-}
-
-static inline boolean_t
-valid_user_code_selector(uint16_t selector)
-{
- sel_t sel = selector_to_sel(selector);
-
- if (selector == 0)
- return (FALSE);
-
- if (sel.ti == SEL_LDT) {
- if (sel.rpl == USER_PRIV)
- return (TRUE);
- }
- else if (sel.index < GDTSZ && sel.rpl == USER_PRIV) {
- if ((gdt_desc_p(selector)->access & ACC_PL_U) == ACC_PL_U)
- return (TRUE);
- }
-
- return (FALSE);
-}
-
-static inline boolean_t
-valid_user_stack_selector(uint16_t selector)
-{
- sel_t sel = selector_to_sel(selector);
-
- if (selector == 0)
- return (FALSE);
-
- if (sel.ti == SEL_LDT) {
- if (sel.rpl == USER_PRIV)
- return (TRUE);
- }
- else if (sel.index < GDTSZ && sel.rpl == USER_PRIV) {
- if ((gdt_desc_p(selector)->access & ACC_PL_U) == ACC_PL_U)
- return (TRUE);
- }
-
- return (FALSE);
-}
+#define FSTK_SZ (PAGE_SIZE/2)
+typedef struct cpu_desc_table64 {
+ 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 *fstkp;
+} cpu_desc_table64_t;
+
+typedef struct {
+ uint8_t fstk[FSTK_SZ] __attribute__ ((aligned(16)));
+} cpu_fault_stack_t;
+
+#define current_gdt() (current_cpu_datap()->cpu_desc_index.cdi_gdtb.ptr)
+#define current_idt() (current_cpu_datap()->cpu_desc_index.cdi_idtb.ptr)
+#define current_ldt() (current_cpu_datap()->cpu_desc_index.cdi_ldtb)
+#define current_ktss() (current_cpu_datap()->cpu_desc_index.cdi_ktssb)
+#define current_sstk() (current_cpu_datap()->cpu_desc_index.cdi_sstkb)
+
+#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) \
+ (¤t_ldt()[sel_idx(sel)])
+
+extern void cpu_syscall_init(cpu_data_t *cdp);
+
+extern void cpu_desc_init(cpu_data_t *cdp);
+extern void cpu_desc_load(cpu_data_t *cdp);
+
+extern boolean_t
+valid_user_data_selector(uint16_t selector);
+
+extern boolean_t
+valid_user_code_selector(uint16_t selector);
+
+extern boolean_t
+valid_user_stack_selector(uint16_t selector);