xnu-4570.71.2.tar.gz

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

diff --git a/osfmk/i386/genassym.c b/osfmk/i386/genassym.c
index 1a0c71cefb2a165a45e231d6b424a1cde8509cce..f6812c6f0cca2877d62f230d53d351193a34ccb9 100644 (file)
--- a/osfmk/i386/genassym.c
+++ b/osfmk/i386/genassym.c
@@ -54,6 +54,8 @@
  * the rights to redistribute these changes.
  */
 
+#include <stddef.h>
+
 #include <mach_ldebug.h>
 
 /*
@@ -84,9 +86,6 @@
 #include <machine/commpage.h>
 #include <pexpert/i386/boot.h>
 
-#undef offsetof
-#include <stddef.h>
-
 #if    CONFIG_DTRACE
 #define NEED_DTRACE_DEFS
 #include <../bsd/sys/lockstat.h>
@@ -193,19 +192,19 @@ main(
        DECLARE("MAP_PMAP",     offsetof(struct _vm_map, pmap));
 
 #define IEL_SIZE               (sizeof(struct i386_exception_link *))
-       DECLARE("IKS_SIZE",     sizeof(struct x86_kernel_state));
+       DECLARE("IKS_SIZE",     sizeof(struct thread_kernel_state));
 
        /*
         * KSS_* are offsets from the top of the kernel stack (cpu_kernel_stack)
         */
-       DECLARE("KSS_RBX",      offsetof(struct x86_kernel_state, k_rbx));
-       DECLARE("KSS_RSP",      offsetof(struct x86_kernel_state, k_rsp));
-       DECLARE("KSS_RBP",      offsetof(struct x86_kernel_state, k_rbp));
-       DECLARE("KSS_R12",      offsetof(struct x86_kernel_state, k_r12));
-       DECLARE("KSS_R13",      offsetof(struct x86_kernel_state, k_r13));
-       DECLARE("KSS_R14",      offsetof(struct x86_kernel_state, k_r14));
-       DECLARE("KSS_R15",      offsetof(struct x86_kernel_state, k_r15));
-       DECLARE("KSS_RIP",      offsetof(struct x86_kernel_state, k_rip));      
+       DECLARE("KSS_RBX",      offsetof(struct thread_kernel_state, machine.k_rbx));
+       DECLARE("KSS_RSP",      offsetof(struct thread_kernel_state, machine.k_rsp));
+       DECLARE("KSS_RBP",      offsetof(struct thread_kernel_state, machine.k_rbp));
+       DECLARE("KSS_R12",      offsetof(struct thread_kernel_state, machine.k_r12));
+       DECLARE("KSS_R13",      offsetof(struct thread_kernel_state, machine.k_r13));
+       DECLARE("KSS_R14",      offsetof(struct thread_kernel_state, machine.k_r14));
+       DECLARE("KSS_R15",      offsetof(struct thread_kernel_state, machine.k_r15));
+       DECLARE("KSS_RIP",      offsetof(struct thread_kernel_state, machine.k_rip));
        
        DECLARE("DS_DR0",       offsetof(struct x86_debug_state32, dr0));
        DECLARE("DS_DR1",       offsetof(struct x86_debug_state32, dr1));
@@ -312,11 +311,11 @@ main(
        DECLARE("KERNEL_PML4_INDEX", KERNEL_PML4_INDEX);
        DECLARE("IDTSZ",        IDTSZ);
        DECLARE("GDTSZ",        GDTSZ);
-       DECLARE("LDTSZ",        LDTSZ);
 
        DECLARE("KERNEL_DS",    KERNEL_DS);
        DECLARE("USER_CS",      USER_CS);
        DECLARE("USER_DS",      USER_DS);
+       DECLARE("USER_CTHREAD", USER_CTHREAD);
        DECLARE("KERNEL32_CS",  KERNEL32_CS);
        DECLARE("KERNEL64_CS",  KERNEL64_CS);
        DECLARE("USER64_CS",    USER64_CS);
@@ -337,10 +336,8 @@ main(
                offsetof(cpu_data_t, cpu_kernel_stack));
         DECLARE("CPU_INT_STACK_TOP",
                offsetof(cpu_data_t, cpu_int_stack_top));
-#if    MACH_RT
         DECLARE("CPU_PREEMPTION_LEVEL",
                offsetof(cpu_data_t, cpu_preemption_level));
-#endif /* MACH_RT */
         DECLARE("CPU_HIBERNATE",
                offsetof(cpu_data_t, cpu_hibernate));
         DECLARE("CPU_INTERRUPT_LEVEL",
@@ -353,14 +350,6 @@ main(
                offsetof(cpu_data_t,cpu_running));
        DECLARE("CPU_PENDING_AST",
                offsetof(cpu_data_t,cpu_pending_ast));
-       DECLARE("CPU_DESC_TABLEP",
-               offsetof(cpu_data_t,cpu_desc_tablep));
-       DECLARE("CPU_DESC_INDEX",
-               offsetof(cpu_data_t,cpu_desc_index));
-       DECLARE("CDI_GDT",
-               offsetof(cpu_desc_index_t,cdi_gdt));
-       DECLARE("CDI_IDT",
-               offsetof(cpu_desc_index_t,cdi_idt));
        DECLARE("CPU_PROCESSOR",
                offsetof(cpu_data_t,cpu_processor));
         DECLARE("CPU_INT_STATE",
@@ -374,6 +363,14 @@ main(
                offsetof(cpu_data_t, cpu_active_cr3));
         DECLARE("CPU_KERNEL_CR3",
                offsetof(cpu_data_t, cpu_kernel_cr3));
+       DECLARE("CPU_UCR3",
+               offsetof(cpu_data_t, cpu_ucr3));
+#if    DEBUG
+       DECLARE("CPU_ENTRY_CR3",
+               offsetof(cpu_data_t, cpu_entry_cr3));
+       DECLARE("CPU_EXIT_CR3",
+               offsetof(cpu_data_t, cpu_exit_cr3));
+#endif
        DECLARE("CPU_TLB_INVALID",
                offsetof(cpu_data_t, cpu_tlb_invalid));
        DECLARE("CPU_PAGEZERO_MAPPED",
@@ -421,6 +418,11 @@ main(
            offsetof(cpu_data_t, cpu_tlb_invalid_local));
        DECLARE("CPU_TLB_INVALID_GLOBAL",
                offsetof(cpu_data_t, cpu_tlb_invalid_global));
+       DECLARE("CPU_ESTACK",
+               offsetof(cpu_data_t, cd_estack));
+       DECLARE("CPU_DSHADOW",
+               offsetof(cpu_data_t, cd_shadow));
+
        DECLARE("enaExpTrace",  enaExpTrace);
        DECLARE("enaUsrFCall",  enaUsrFCall);
        DECLARE("enaUsrPhyMp",  enaUsrPhyMp);