xnu-4570.41.2.tar.gz

[apple/xnu.git] / osfmk / mach / i386 / thread_status.h

diff --git a/osfmk/mach/i386/thread_status.h b/osfmk/mach/i386/thread_status.h
index be97409c2c7a29b26297ff43c0441626bc92267e..fea611b4d4c45800e40d59c578862a84fd6e0d3c 100644 (file)
--- a/osfmk/mach/i386/thread_status.h
+++ b/osfmk/mach/i386/thread_status.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -67,12 +67,15 @@
 #ifndef        _MACH_I386_THREAD_STATUS_H_
 #define _MACH_I386_THREAD_STATUS_H_
 
 #ifndef        _MACH_I386_THREAD_STATUS_H_
 #define _MACH_I386_THREAD_STATUS_H_
 

+#include <mach/machine/_structs.h>

 #include <mach/message.h>
 #include <mach/i386/fp_reg.h>
 #include <mach/i386/thread_state.h>
 #include <i386/eflags.h>
 
 #include <mach/message.h>
 #include <mach/i386/fp_reg.h>
 #include <mach/i386/thread_state.h>
 #include <i386/eflags.h>
 

-
+#ifdef KERNEL_PRIVATE
+#include <i386/proc_reg.h>
+#endif

 
 /*
  * the i386_xxxx form is kept for legacy purposes since these types
 
 /*
  * the i386_xxxx form is kept for legacy purposes since these types


@@ -85,8 +88,6 @@
  *     via a self-describing mechanism
  */
 
  *     via a self-describing mechanism
  */
 

-
-

 /*
  * these are the legacy names which should be deprecated in the future
  * they are externally known which is the only reason we don't just get
 /*
  * these are the legacy names which should be deprecated in the future
  * they are externally known which is the only reason we don't just get


@@ -96,7 +97,6 @@
 #define i386_FLOAT_STATE               2
 #define i386_EXCEPTION_STATE           3
 
 #define i386_FLOAT_STATE               2
 #define i386_EXCEPTION_STATE           3
 

-

 /*
  * THREAD_STATE_FLAVOR_LIST 0
  *     these are the supported flavors
 /*
  * THREAD_STATE_FLAVOR_LIST 0
  *     these are the supported flavors


@@ -114,7 +114,16 @@
 #define x86_DEBUG_STATE64              11
 #define x86_DEBUG_STATE                        12
 #define THREAD_STATE_NONE              13
 #define x86_DEBUG_STATE64              11
 #define x86_DEBUG_STATE                        12
 #define THREAD_STATE_NONE              13

-
+/* 14 and 15 are used for the internal x86_SAVED_STATE flavours */
+/* Arrange for flavors to take sequential values, 32-bit, 64-bit, non-specific */
+#define x86_AVX_STATE32                        16
+#define x86_AVX_STATE64                        (x86_AVX_STATE32 + 1)
+#define x86_AVX_STATE                  (x86_AVX_STATE32 + 2)
+#if !defined(RC_HIDE_XNU_J137)
+#define x86_AVX512_STATE32             19
+#define x86_AVX512_STATE64             (x86_AVX512_STATE32 + 1)
+#define x86_AVX512_STATE               (x86_AVX512_STATE32 + 2)
+#endif /* not RC_HIDE_XNU_J137 */

 
 
 /*
 
 
 /*


@@ -123,124 +132,59 @@
  */
 #define THREAD_MACHINE_STATE_MAX       THREAD_STATE_MAX
 
  */
 #define THREAD_MACHINE_STATE_MAX       THREAD_STATE_MAX
 

-

 /*
  * VALID_THREAD_STATE_FLAVOR is a platform specific macro that when passed
  * an exception flavor will return if that is a defined flavor for that
  * platform. The macro must be manually updated to include all of the valid
  * exception flavors as defined above.
  */
 /*
  * VALID_THREAD_STATE_FLAVOR is a platform specific macro that when passed
  * an exception flavor will return if that is a defined flavor for that
  * platform. The macro must be manually updated to include all of the valid
  * exception flavors as defined above.
  */

+#if !defined(RC_HIDE_XNU_J137)

 #define VALID_THREAD_STATE_FLAVOR(x)       \
 #define VALID_THREAD_STATE_FLAVOR(x)       \

-       ((x == x86_THREAD_STATE32)      || \
-        (x == x86_FLOAT_STATE32)       || \
-        (x == x86_EXCEPTION_STATE32)   || \
-        (x == x86_DEBUG_STATE32)       || \
-        (x == x86_THREAD_STATE64)      || \
-        (x == x86_FLOAT_STATE64)       || \
-        (x == x86_EXCEPTION_STATE64)   || \
-        (x == x86_DEBUG_STATE64)       || \
-        (x == x86_THREAD_STATE)        || \
-        (x == x86_FLOAT_STATE)         || \
-        (x == x86_EXCEPTION_STATE)     || \
-        (x == x86_DEBUG_STATE)         || \
-        (x == THREAD_STATE_NONE))
-
-
+        ((x == x86_THREAD_STATE32)     || \
+         (x == x86_FLOAT_STATE32)      || \
+         (x == x86_EXCEPTION_STATE32)  || \
+         (x == x86_DEBUG_STATE32)      || \
+         (x == x86_THREAD_STATE64)     || \
+         (x == x86_FLOAT_STATE64)      || \
+         (x == x86_EXCEPTION_STATE64)  || \
+         (x == x86_DEBUG_STATE64)      || \
+         (x == x86_THREAD_STATE)       || \
+         (x == x86_FLOAT_STATE)        || \
+         (x == x86_EXCEPTION_STATE)    || \
+         (x == x86_DEBUG_STATE)        || \
+         (x == x86_AVX_STATE32)        || \
+         (x == x86_AVX_STATE64)        || \
+         (x == x86_AVX_STATE)          || \
+         (x == x86_AVX512_STATE32)     || \
+         (x == x86_AVX512_STATE64)     || \
+         (x == x86_AVX512_STATE)       || \
+         (x == THREAD_STATE_NONE))
+#else
+#define VALID_THREAD_STATE_FLAVOR(x)       \
+        ((x == x86_THREAD_STATE32)     || \
+         (x == x86_FLOAT_STATE32)      || \
+         (x == x86_EXCEPTION_STATE32)  || \
+         (x == x86_DEBUG_STATE32)      || \
+         (x == x86_THREAD_STATE64)     || \
+         (x == x86_FLOAT_STATE64)      || \
+         (x == x86_EXCEPTION_STATE64)  || \
+         (x == x86_DEBUG_STATE64)      || \
+         (x == x86_THREAD_STATE)       || \
+         (x == x86_FLOAT_STATE)        || \
+         (x == x86_EXCEPTION_STATE)    || \
+         (x == x86_DEBUG_STATE)        || \
+         (x == x86_AVX_STATE32)        || \
+         (x == x86_AVX_STATE64)        || \
+         (x == x86_AVX_STATE)          || \
+         (x == THREAD_STATE_NONE))
+#endif /* not RC_HIDE_XNU_J137 */

 
 struct x86_state_hdr {
 
 struct x86_state_hdr {

-    int        flavor;
-    int                count;
+       uint32_t        flavor;
+       uint32_t        count;

 };
 typedef struct x86_state_hdr x86_state_hdr_t;
 
 };
 typedef struct x86_state_hdr x86_state_hdr_t;
 

-
-/*
- * Main thread state consists of
- * general registers, segment registers,
- * eip and eflags.
- */
-
-struct i386_thread_state {
-    unsigned int       eax;
-    unsigned int       ebx;
-    unsigned int       ecx;
-    unsigned int       edx;
-    unsigned int       edi;
-    unsigned int       esi;
-    unsigned int       ebp;
-    unsigned int       esp;
-    unsigned int       ss;
-    unsigned int       eflags;
-    unsigned int       eip;
-    unsigned int       cs;
-    unsigned int       ds;
-    unsigned int       es;
-    unsigned int       fs;
-    unsigned int       gs;
-} ;
-
-/*
- * to be depecrated in the future
- */
-typedef struct i386_thread_state i386_thread_state_t;
-#define i386_THREAD_STATE_COUNT        ((mach_msg_type_number_t) \
-    ( sizeof (i386_thread_state_t) / sizeof (int) ))
-
-
-typedef struct i386_thread_state x86_thread_state32_t;
-#define x86_THREAD_STATE32_COUNT ((mach_msg_type_number_t) \
-    ( sizeof (x86_thread_state32_t) / sizeof (int) ))
-
-
-
-
-struct x86_thread_state64 {
-    uint64_t           rax;
-    uint64_t           rbx;
-    uint64_t           rcx;
-    uint64_t           rdx;
-    uint64_t           rdi;
-    uint64_t           rsi;
-    uint64_t           rbp;
-    uint64_t           rsp;
-    uint64_t           r8;
-    uint64_t           r9;
-    uint64_t           r10;
-    uint64_t           r11;
-    uint64_t           r12;
-    uint64_t           r13;
-    uint64_t           r14;
-    uint64_t           r15;
-    uint64_t           rip;
-    uint64_t           rflags;
-    uint64_t           cs;
-    uint64_t           fs;
-    uint64_t           gs;
-} ;
-
-
-typedef struct x86_thread_state64 x86_thread_state64_t;
-#define x86_THREAD_STATE64_COUNT       ((mach_msg_type_number_t) \
-    ( sizeof (x86_thread_state64_t) / sizeof (int) ))
-
-
-
-
-struct x86_thread_state {
-    x86_state_hdr_t            tsh;
-    union {
-        x86_thread_state32_t   ts32;
-        x86_thread_state64_t   ts64;
-    } uts;
-} ;
-
-
-typedef struct x86_thread_state x86_thread_state_t;
-#define x86_THREAD_STATE_COUNT ((mach_msg_type_number_t) \
-    ( sizeof (x86_thread_state_t) / sizeof (int) ))
-
-
-

 /*
  * Default segment register values.
  */
 /*
  * Default segment register values.
  */


@@ -250,263 +194,113 @@ typedef struct x86_thread_state x86_thread_state_t;
 #define KERN_CODE_SELECTOR     0x0008
 #define KERN_DATA_SELECTOR     0x0010
 
 #define KERN_CODE_SELECTOR     0x0008
 #define KERN_DATA_SELECTOR     0x0010
 

-typedef struct fp_control {
-    unsigned short             invalid :1,
-                               denorm  :1,
-                               zdiv    :1,
-                               ovrfl   :1,
-                               undfl   :1,
-                               precis  :1,
-                                       :2,
-                               pc      :2,
-#define FP_PREC_24B            0
-#define        FP_PREC_53B             2
-#define FP_PREC_64B            3
-                               rc      :2,
-#define FP_RND_NEAR            0
-#define FP_RND_DOWN            1
-#define FP_RND_UP              2
-#define FP_CHOP                        3
-                               /*inf*/ :1,
-                                       :3;
-} fp_control_t;

 /*
 /*

- * Status word.
- */
-
-typedef struct fp_status {
-    unsigned short             invalid :1,
-                               denorm  :1,
-                               zdiv    :1,
-                               ovrfl   :1,
-                               undfl   :1,
-                               precis  :1,
-                               stkflt  :1,
-                               errsumm :1,
-                               c0      :1,
-                               c1      :1,
-                               c2      :1,
-                               tos     :3,
-                               c3      :1,
-                               busy    :1;
-} fp_status_t;
-                               
-/* defn of 80bit x87 FPU or MMX register  */
-struct mmst_reg {
-       char    mmst_reg[10];
-       char    mmst_rsrv[6];
-};
-
-
-/* defn of 128 bit XMM regs */
-struct xmm_reg {
-       char            xmm_reg[16];
-};
-
-/* 
- * Floating point state.
+ * to be deprecated in the future

  */
  */

+typedef _STRUCT_X86_THREAD_STATE32 i386_thread_state_t;
+#define i386_THREAD_STATE_COUNT        ((mach_msg_type_number_t) \
+    ( sizeof (i386_thread_state_t) / sizeof (int) ))

 
 

-#define FP_STATE_BYTES         512     /* number of chars worth of data from fpu_fcw */
-
-/* For legacy reasons we need to leave the hw_state as char bytes */
-struct i386_float_state {
-       int                     fpu_reserved[2];
-       fp_control_t            fpu_fcw;                        /* x87 FPU control word */
-       fp_status_t             fpu_fsw;                        /* x87 FPU status word */
-       uint8_t                 fpu_ftw;                        /* x87 FPU tag word */
-       uint8_t                 fpu_rsrv1;                      /* reserved */ 
-       uint16_t                fpu_fop;                        /* x87 FPU Opcode */
-       uint32_t                fpu_ip;                         /* x87 FPU Instruction Pointer offset */
-       uint16_t                fpu_cs;                         /* x87 FPU Instruction Pointer Selector */
-       uint16_t                fpu_rsrv2;                      /* reserved */
-       uint32_t                fpu_dp;                         /* x87 FPU Instruction Operand(Data) Pointer offset */
-       uint16_t                fpu_ds;                         /* x87 FPU Instruction Operand(Data) Pointer Selector */
-       uint16_t                fpu_rsrv3;                      /* reserved */
-       uint32_t                fpu_mxcsr;                      /* MXCSR Register state */
-       uint32_t                fpu_mxcsrmask;          /* MXCSR mask */
-       struct mmst_reg fpu_stmm0;              /* ST0/MM0   */
-       struct mmst_reg fpu_stmm1;              /* ST1/MM1  */
-       struct mmst_reg fpu_stmm2;              /* ST2/MM2  */
-       struct mmst_reg fpu_stmm3;              /* ST3/MM3  */
-       struct mmst_reg fpu_stmm4;              /* ST4/MM4  */
-       struct mmst_reg fpu_stmm5;              /* ST5/MM5  */
-       struct mmst_reg fpu_stmm6;              /* ST6/MM6  */
-       struct mmst_reg fpu_stmm7;              /* ST7/MM7  */
-       struct xmm_reg  fpu_xmm0;               /* XMM 0  */
-       struct xmm_reg  fpu_xmm1;               /* XMM 1  */
-       struct xmm_reg  fpu_xmm2;               /* XMM 2  */
-       struct xmm_reg  fpu_xmm3;               /* XMM 3  */
-       struct xmm_reg  fpu_xmm4;               /* XMM 4  */
-       struct xmm_reg  fpu_xmm5;               /* XMM 5  */
-       struct xmm_reg  fpu_xmm6;               /* XMM 6  */
-       struct xmm_reg  fpu_xmm7;               /* XMM 7  */
-       char                    fpu_rsrv4[14*16];       /* reserved */
-       int                     fpu_reserved1;
-};
-
+typedef _STRUCT_X86_THREAD_STATE32 x86_thread_state32_t;
+#define x86_THREAD_STATE32_COUNT       ((mach_msg_type_number_t) \
+    ( sizeof (x86_thread_state32_t) / sizeof (int) ))

 
 /*
 
 /*

- * to be depecrated in the future
+ * to be deprecated in the future

  */
  */

-typedef struct i386_float_state i386_float_state_t;
+typedef _STRUCT_X86_FLOAT_STATE32 i386_float_state_t;

 #define i386_FLOAT_STATE_COUNT ((mach_msg_type_number_t) \
                (sizeof(i386_float_state_t)/sizeof(unsigned int)))
 #define i386_FLOAT_STATE_COUNT ((mach_msg_type_number_t) \
                (sizeof(i386_float_state_t)/sizeof(unsigned int)))

-        
-typedef struct i386_float_state x86_float_state32_t;
+
+typedef _STRUCT_X86_FLOAT_STATE32 x86_float_state32_t;

 #define x86_FLOAT_STATE32_COUNT ((mach_msg_type_number_t) \
                (sizeof(x86_float_state32_t)/sizeof(unsigned int)))
 #define x86_FLOAT_STATE32_COUNT ((mach_msg_type_number_t) \
                (sizeof(x86_float_state32_t)/sizeof(unsigned int)))

-        
-
-struct x86_float_state64 {
-       int                     fpu_reserved[2];
-       fp_control_t            fpu_fcw;                        /* x87 FPU control word */
-       fp_status_t             fpu_fsw;                        /* x87 FPU status word */
-       uint8_t                 fpu_ftw;                        /* x87 FPU tag word */
-       uint8_t                 fpu_rsrv1;                      /* reserved */ 
-       uint16_t                fpu_fop;                        /* x87 FPU Opcode */
-       uint32_t                fpu_ip;                         /* x87 FPU Instruction Pointer offset */
-       uint16_t                fpu_cs;                         /* x87 FPU Instruction Pointer Selector */
-       uint16_t                fpu_rsrv2;                      /* reserved */
-       uint32_t                fpu_dp;                         /* x87 FPU Instruction Operand(Data) Pointer offset */
-       uint16_t                fpu_ds;                         /* x87 FPU Instruction Operand(Data) Pointer Selector */
-       uint16_t                fpu_rsrv3;                      /* reserved */
-       uint32_t                fpu_mxcsr;                      /* MXCSR Register state */
-       uint32_t                fpu_mxcsrmask;          /* MXCSR mask */
-       struct mmst_reg fpu_stmm0;              /* ST0/MM0   */
-       struct mmst_reg fpu_stmm1;              /* ST1/MM1  */
-       struct mmst_reg fpu_stmm2;              /* ST2/MM2  */
-       struct mmst_reg fpu_stmm3;              /* ST3/MM3  */
-       struct mmst_reg fpu_stmm4;              /* ST4/MM4  */
-       struct mmst_reg fpu_stmm5;              /* ST5/MM5  */
-       struct mmst_reg fpu_stmm6;              /* ST6/MM6  */
-       struct mmst_reg fpu_stmm7;              /* ST7/MM7  */
-       struct xmm_reg  fpu_xmm0;               /* XMM 0  */
-       struct xmm_reg  fpu_xmm1;               /* XMM 1  */
-       struct xmm_reg  fpu_xmm2;               /* XMM 2  */
-       struct xmm_reg  fpu_xmm3;               /* XMM 3  */
-       struct xmm_reg  fpu_xmm4;               /* XMM 4  */
-       struct xmm_reg  fpu_xmm5;               /* XMM 5  */
-       struct xmm_reg  fpu_xmm6;               /* XMM 6  */
-       struct xmm_reg  fpu_xmm7;               /* XMM 7  */
-       struct xmm_reg  fpu_xmm8;               /* XMM 8  */
-       struct xmm_reg  fpu_xmm9;               /* XMM 9  */
-       struct xmm_reg  fpu_xmm10;              /* XMM 10  */
-       struct xmm_reg  fpu_xmm11;              /* XMM 11 */
-       struct xmm_reg  fpu_xmm12;              /* XMM 12  */
-       struct xmm_reg  fpu_xmm13;              /* XMM 13  */
-       struct xmm_reg  fpu_xmm14;              /* XMM 14  */
-       struct xmm_reg  fpu_xmm15;              /* XMM 15  */
-       char                    fpu_rsrv4[6*16];        /* reserved */
-       int                     fpu_reserved1;
-};
-
-typedef struct x86_float_state64 x86_float_state64_t;
-#define x86_FLOAT_STATE64_COUNT ((mach_msg_type_number_t) \
-               (sizeof(x86_float_state64_t)/sizeof(unsigned int)))
-               
-        
-
-
-struct x86_float_state {
-    x86_state_hdr_t            fsh;
-    union {
-        x86_float_state32_t    fs32;
-        x86_float_state64_t    fs64;
-    } ufs;
-} ;
-
-
-typedef struct x86_float_state x86_float_state_t;
-#define x86_FLOAT_STATE_COUNT  ((mach_msg_type_number_t) \
-    ( sizeof (x86_float_state_t) / sizeof (int) ))

 
 

+typedef _STRUCT_X86_AVX_STATE32 x86_avx_state32_t;
+#define x86_AVX_STATE32_COUNT ((mach_msg_type_number_t) \
+               (sizeof(x86_avx_state32_t)/sizeof(unsigned int)))

 
 

+#if !defined(RC_HIDE_XNU_J137)
+typedef _STRUCT_X86_AVX512_STATE32 x86_avx512_state32_t;
+#define x86_AVX512_STATE32_COUNT ((mach_msg_type_number_t) \
+               (sizeof(x86_avx512_state32_t)/sizeof(unsigned int)))
+#endif /* not RC_HIDE_XNU_J137 */

 
 /*
 
 /*

- * Extra state that may be
- * useful to exception handlers.
+ * to be deprecated in the future

  */
  */

-
-struct i386_exception_state {
-    unsigned int       trapno;
-    unsigned int       err;
-    unsigned int       faultvaddr;
-};
-
-/*
- * to be depecrated in the future
- */
-typedef struct i386_exception_state i386_exception_state_t;
+typedef _STRUCT_X86_EXCEPTION_STATE32 i386_exception_state_t;

 #define i386_EXCEPTION_STATE_COUNT     ((mach_msg_type_number_t) \
     ( sizeof (i386_exception_state_t) / sizeof (int) ))
 
 #define i386_EXCEPTION_STATE_COUNT     ((mach_msg_type_number_t) \
     ( sizeof (i386_exception_state_t) / sizeof (int) ))
 

-#define I386_EXCEPTION_STATE_COUNT i386_EXCEPTION_STATE_COUNT
-
-typedef struct i386_exception_state x86_exception_state32_t;
+typedef _STRUCT_X86_EXCEPTION_STATE32 x86_exception_state32_t;

 #define x86_EXCEPTION_STATE32_COUNT    ((mach_msg_type_number_t) \
     ( sizeof (x86_exception_state32_t) / sizeof (int) ))
 
 #define x86_EXCEPTION_STATE32_COUNT    ((mach_msg_type_number_t) \
     ( sizeof (x86_exception_state32_t) / sizeof (int) ))
 

-struct x86_debug_state32 {
-       unsigned int dr0;
-       unsigned int dr1;
-       unsigned int dr2;
-       unsigned int dr3;
-       unsigned int dr4;
-       unsigned int dr5;
-       unsigned int dr6;
-       unsigned int dr7;
-};
+#define I386_EXCEPTION_STATE_COUNT i386_EXCEPTION_STATE_COUNT

 
 

-typedef struct x86_debug_state32 x86_debug_state32_t;
+typedef _STRUCT_X86_DEBUG_STATE32 x86_debug_state32_t;

 #define x86_DEBUG_STATE32_COUNT       ((mach_msg_type_number_t) \
        ( sizeof (x86_debug_state32_t) / sizeof (int) ))
 #define x86_DEBUG_STATE32_COUNT       ((mach_msg_type_number_t) \
        ( sizeof (x86_debug_state32_t) / sizeof (int) ))

+

 #define X86_DEBUG_STATE32_COUNT x86_DEBUG_STATE32_COUNT
 
 #define X86_DEBUG_STATE32_COUNT x86_DEBUG_STATE32_COUNT
 

+typedef _STRUCT_X86_THREAD_STATE64 x86_thread_state64_t;
+#define x86_THREAD_STATE64_COUNT       ((mach_msg_type_number_t) \
+    ( sizeof (x86_thread_state64_t) / sizeof (int) ))

 
 

-struct x86_exception_state64 {
-    unsigned int       trapno;
-    unsigned int       err;
-    uint64_t           faultvaddr;
-};
+typedef _STRUCT_X86_FLOAT_STATE64 x86_float_state64_t;
+#define x86_FLOAT_STATE64_COUNT ((mach_msg_type_number_t) \
+               (sizeof(x86_float_state64_t)/sizeof(unsigned int)))

 
 

-typedef struct x86_exception_state64 x86_exception_state64_t;
-#define x86_EXCEPTION_STATE64_COUNT    ((mach_msg_type_number_t) \
-    ( sizeof (x86_exception_state64_t) / sizeof (int) ))
+typedef _STRUCT_X86_AVX_STATE64 x86_avx_state64_t;
+#define x86_AVX_STATE64_COUNT ((mach_msg_type_number_t) \
+               (sizeof(x86_avx_state64_t)/sizeof(unsigned int)))

 
 

+#if !defined(RC_HIDE_XNU_J137)
+typedef _STRUCT_X86_AVX512_STATE64 x86_avx512_state64_t;
+#define x86_AVX512_STATE64_COUNT ((mach_msg_type_number_t) \
+               (sizeof(x86_avx512_state64_t)/sizeof(unsigned int)))
+#endif /* not RC_HIDE_XNU_J137 */

 
 

-struct x86_debug_state64 {
-       uint64_t dr0;
-       uint64_t dr1;
-       uint64_t dr2;
-       uint64_t dr3;
-       uint64_t dr4;
-       uint64_t dr5;
-       uint64_t dr6;
-       uint64_t dr7;
-};
+typedef _STRUCT_X86_EXCEPTION_STATE64 x86_exception_state64_t;
+#define x86_EXCEPTION_STATE64_COUNT    ((mach_msg_type_number_t) \
+    ( sizeof (x86_exception_state64_t) / sizeof (int) ))

 
 

+#define X86_EXCEPTION_STATE64_COUNT x86_EXCEPTION_STATE64_COUNT

 
 

-typedef struct x86_debug_state64 x86_debug_state64_t;
+typedef _STRUCT_X86_DEBUG_STATE64 x86_debug_state64_t;

 #define x86_DEBUG_STATE64_COUNT        ((mach_msg_type_number_t) \
     ( sizeof (x86_debug_state64_t) / sizeof (int) ))
 
 #define X86_DEBUG_STATE64_COUNT x86_DEBUG_STATE64_COUNT
 
 #define x86_DEBUG_STATE64_COUNT        ((mach_msg_type_number_t) \
     ( sizeof (x86_debug_state64_t) / sizeof (int) ))
 
 #define X86_DEBUG_STATE64_COUNT x86_DEBUG_STATE64_COUNT
 

+/*
+ * Combined thread, float and exception states
+ */
+struct x86_thread_state {
+       x86_state_hdr_t                 tsh;
+       union {
+           x86_thread_state32_t        ts32;
+           x86_thread_state64_t        ts64;
+       } uts;
+};

 
 

+struct x86_float_state {
+       x86_state_hdr_t                 fsh;
+       union {
+               x86_float_state32_t     fs32;
+               x86_float_state64_t     fs64;
+       } ufs;
+};

 
 struct x86_exception_state {
 
 struct x86_exception_state {

-    x86_state_hdr_t            esh;
-    union {
-        x86_exception_state32_t        es32;
-        x86_exception_state64_t        es64;
-    } ues;
-} ;
-
-
-typedef struct x86_exception_state x86_exception_state_t;
-#define x86_EXCEPTION_STATE_COUNT      ((mach_msg_type_number_t) \
-    ( sizeof (x86_exception_state_t) / sizeof (int) ))
+       x86_state_hdr_t                 esh;
+       union {
+               x86_exception_state32_t es32;
+               x86_exception_state64_t es64;
+       } ues;
+};

 
 struct x86_debug_state {
        x86_state_hdr_t                 dsh;
 
 struct x86_debug_state {
        x86_state_hdr_t                 dsh;


@@ -516,12 +310,50 @@ struct x86_debug_state {
        } uds;
 };
 
        } uds;
 };
 

+struct x86_avx_state {
+       x86_state_hdr_t                 ash;
+       union {
+               x86_avx_state32_t       as32;
+               x86_avx_state64_t       as64;
+       } ufs;
+};
+
+#if !defined(RC_HIDE_XNU_J137)
+struct x86_avx512_state {
+       x86_state_hdr_t                 ash;
+       union {
+               x86_avx512_state32_t    as32;
+               x86_avx512_state64_t    as64;
+       } ufs;
+};
+#endif /* not RC_HIDE_XNU_J137 */

 
 

+typedef struct x86_thread_state x86_thread_state_t;
+#define x86_THREAD_STATE_COUNT ((mach_msg_type_number_t) \
+               ( sizeof (x86_thread_state_t) / sizeof (int) ))
+
+typedef struct x86_float_state x86_float_state_t;
+#define x86_FLOAT_STATE_COUNT ((mach_msg_type_number_t) \
+               (sizeof(x86_float_state_t)/sizeof(unsigned int)))
+
+typedef struct x86_exception_state x86_exception_state_t;
+#define x86_EXCEPTION_STATE_COUNT ((mach_msg_type_number_t) \
+               (sizeof(x86_exception_state_t)/sizeof(unsigned int)))

 
 typedef struct x86_debug_state x86_debug_state_t;
 #define x86_DEBUG_STATE_COUNT ((mach_msg_type_number_t) \
                (sizeof(x86_debug_state_t)/sizeof(unsigned int)))
 
 
 typedef struct x86_debug_state x86_debug_state_t;
 #define x86_DEBUG_STATE_COUNT ((mach_msg_type_number_t) \
                (sizeof(x86_debug_state_t)/sizeof(unsigned int)))
 

+typedef struct x86_avx_state x86_avx_state_t;
+#define x86_AVX_STATE_COUNT ((mach_msg_type_number_t) \
+               (sizeof(x86_avx_state_t)/sizeof(unsigned int)))
+
+#if !defined(RC_HIDE_XNU_J137)
+typedef struct x86_avx512_state x86_avx512_state_t;
+#define x86_AVX512_STATE_COUNT ((mach_msg_type_number_t) \
+               (sizeof(x86_avx512_state_t)/sizeof(unsigned int)))
+#endif /* not RC_HIDE_XNU_J137 */
+

 /*
  * Machine-independent way for servers and Mach's exception mechanism to
  * choose the most efficient state flavor for exception RPC's:
 /*
  * Machine-independent way for servers and Mach's exception mechanism to
  * choose the most efficient state flavor for exception RPC's:


@@ -529,124 +361,54 @@ typedef struct x86_debug_state x86_debug_state_t;
 #define MACHINE_THREAD_STATE           x86_THREAD_STATE
 #define MACHINE_THREAD_STATE_COUNT     x86_THREAD_STATE_COUNT
 
 #define MACHINE_THREAD_STATE           x86_THREAD_STATE
 #define MACHINE_THREAD_STATE_COUNT     x86_THREAD_STATE_COUNT
 

-

 #ifdef XNU_KERNEL_PRIVATE
 
 #define x86_SAVED_STATE32              THREAD_STATE_NONE + 1
 #define x86_SAVED_STATE64              THREAD_STATE_NONE + 2
 
 #ifdef XNU_KERNEL_PRIVATE
 
 #define x86_SAVED_STATE32              THREAD_STATE_NONE + 1
 #define x86_SAVED_STATE64              THREAD_STATE_NONE + 2
 

-#define OLD_i386_THREAD_STATE          -1
-
-
-/*
- * when reloading the segment registers on
- * a return out of the kernel, we may take
- * a GeneralProtection or SegmentNotPresent
- * fault if one or more of the segment
- * registers in the saved state was improperly
- * specified via an x86_THREAD_STATE32 call
- * the frame we push on top of the existing
- * save area looks like this... we need to
- * carry this as part of the save area
- * in case we get hit so that we have a big
- * enough stack
- */
-struct x86_seg_load_fault32 {
-       unsigned int    trapno;
-       unsigned int    err;
-       unsigned int    eip;
-       unsigned int    cs;
-       unsigned int    efl;
-};
-
-
-/*
- * Subset of saved state stored by processor on kernel-to-kernel
- * trap.  (Used by ddb to examine state guaranteed to be present
- * on all traps into debugger.)
- */
-struct x86_saved_state32_from_kernel {
-       unsigned int    gs;
-       unsigned int    fs;
-       unsigned int    es;
-       unsigned int    ds;
-       unsigned int    edi;
-       unsigned int    esi;
-       unsigned int    ebp;
-       unsigned int    cr2;    /* kernel esp stored by pusha - we save cr2 here later */
-       unsigned int    ebx;
-       unsigned int    edx;
-       unsigned int    ecx;
-       unsigned int    eax;
-       unsigned int    trapno;
-       unsigned int    err;
-       unsigned int    eip;
-       unsigned int    cs;
-       unsigned int    efl;
-};
-

 /*
  * The format in which thread state is saved by Mach on this machine.  This
  * state flavor is most efficient for exception RPC's to kernel-loaded
  * servers, because copying can be avoided:
  */
 /*
  * The format in which thread state is saved by Mach on this machine.  This
  * state flavor is most efficient for exception RPC's to kernel-loaded
  * servers, because copying can be avoided:
  */

- 

 struct x86_saved_state32 {
 struct x86_saved_state32 {

-       unsigned int    gs;
-       unsigned int    fs;
-       unsigned int    es;
-       unsigned int    ds;
-       unsigned int    edi;
-       unsigned int    esi;
-       unsigned int    ebp;
-       unsigned int    cr2;    /* kernel esp stored by pusha - we save cr2 here later */
-       unsigned int    ebx;
-       unsigned int    edx;
-       unsigned int    ecx;
-       unsigned int    eax;
-       unsigned int    trapno;
-       unsigned int    err;
-       unsigned int    eip;
-       unsigned int    cs;
-       unsigned int    efl;
-       unsigned int    uesp;
-       unsigned int    ss;
+       uint32_t        gs;
+       uint32_t        fs;
+       uint32_t        es;
+       uint32_t        ds;
+       uint32_t        edi;
+       uint32_t        esi;
+       uint32_t        ebp;
+       uint32_t        cr2;    /* kernel esp stored by pusha - we save cr2 here later */
+       uint32_t        ebx;
+       uint32_t        edx;
+       uint32_t        ecx;
+       uint32_t        eax;
+       uint16_t        trapno;
+       uint16_t        cpu;
+       uint32_t        err;
+       uint32_t        eip;
+       uint32_t        cs;
+       uint32_t        efl;
+       uint32_t        uesp;
+       uint32_t        ss;

 };
 typedef struct x86_saved_state32 x86_saved_state32_t;
 
 #define x86_SAVED_STATE32_COUNT        ((mach_msg_type_number_t) \
        (sizeof (x86_saved_state32_t)/sizeof(unsigned int)))
 
 };
 typedef struct x86_saved_state32 x86_saved_state32_t;
 
 #define x86_SAVED_STATE32_COUNT        ((mach_msg_type_number_t) \
        (sizeof (x86_saved_state32_t)/sizeof(unsigned int)))
 

-struct x86_saved_state32_tagged {
-       uint32_t                        tag;
-       struct x86_saved_state32        state;
-};
-typedef struct x86_saved_state32_tagged x86_saved_state32_tagged_t;
-
-struct x86_sframe32 {
-        /*
-        * in case we throw a fault reloading
-        * segment registers on a return out of
-        * the kernel... the 'slf' state is only kept
-        * long enough to rejigger (i.e. restore
-        * the save area to its original state)
-        * the save area and throw the appropriate
-        * kernel trap pointing to the 'ssf' state
-        */
-        struct x86_seg_load_fault32    slf;
-        struct x86_saved_state32_tagged ssf;
-};
-typedef struct x86_sframe32 x86_sframe32_t;
-
-
+#pragma pack(4)

 
 /*
  * This is the state pushed onto the 64-bit interrupt stack
  * on any exception/trap/interrupt.
  */
 struct x86_64_intr_stack_frame {
 
 /*
  * This is the state pushed onto the 64-bit interrupt stack
  * on any exception/trap/interrupt.
  */
 struct x86_64_intr_stack_frame {

-       uint32_t        trapno;
-       uint32_t        trapfn;
+       uint16_t        trapno;
+       uint16_t        cpu;
+       uint32_t        _pad;
+       uint64_t        trapfn;

        uint64_t        err;
        uint64_t        rip;
        uint64_t        cs;
        uint64_t        err;
        uint64_t        rip;
        uint64_t        cs;


@@ -655,60 +417,22 @@ struct x86_64_intr_stack_frame {
        uint64_t        ss;
 };
 typedef struct x86_64_intr_stack_frame x86_64_intr_stack_frame_t;
        uint64_t        ss;
 };
 typedef struct x86_64_intr_stack_frame x86_64_intr_stack_frame_t;

-
-/*
- * This defines the state saved before entry into compatibility mode.
- * The machine state is pushed automatically and the compat state is
- * synthethized in the exception handling code.
- */
-struct x86_saved_state_compat32 {
-       struct x86_saved_state32_tagged iss32;
-       uint32_t                        pad_for_16byte_alignment[2];
-       struct  x86_64_intr_stack_frame isf64;
-};
-typedef struct x86_saved_state_compat32 x86_saved_state_compat32_t;
-
-
-struct x86_sframe_compat32 {
-        struct x86_64_intr_stack_frame  slf;
-       uint32_t                        pad_for_16byte_alignment[2];
-        struct x86_saved_state_compat32 ssf;
-       uint32_t                        empty[4];
-};
-typedef struct x86_sframe_compat32 x86_sframe_compat32_t;
-
-
+_Static_assert((sizeof(x86_64_intr_stack_frame_t) % 16) == 0,
+       "interrupt stack frame size must be a multiple of 16 bytes");

 
 /*
  * thread state format for task running in 64bit long mode
  * in long mode, the same hardware frame is always pushed regardless
 
 /*
  * thread state format for task running in 64bit long mode
  * in long mode, the same hardware frame is always pushed regardless

- * of whether there was a change in privlege level... therefore, there
+ * of whether there was a change in privilege level... therefore, there

  * is no need for an x86_saved_state64_from_kernel variant
  */
  * is no need for an x86_saved_state64_from_kernel variant
  */

-

 struct x86_saved_state64 {
 struct x86_saved_state64 {

-        /*
-        * saved state organized to reflect the
-        * system call ABI register convention
-        * so that we can just pass a pointer
-        * to the saved state when calling through
-        * to the actual system call functions
-        * the ABI limits us to 6 args passed in 
-        * registers... I've add v_arg6 - v_arg8
-        * to accomodate our most 'greedy' system
-        * calls (both BSD and MACH)... the individual
-        * system call handlers will fill these in
-        * via copyin if needed...
-        */
-        uint64_t       rdi;            /* arg0 for system call */
+       uint64_t        rdi;            /* arg0 for system call */

        uint64_t        rsi;
        uint64_t        rdx;
        uint64_t        rsi;
        uint64_t        rdx;

-        uint64_t       r10;
-        uint64_t       r8;
-        uint64_t       r9;             /* arg5 for system call */
-        uint64_t       v_arg6;
-        uint64_t       v_arg7;
-        uint64_t       v_arg8;
+       uint64_t        r10;            /* R10 := RCX prior to syscall trap */
+       uint64_t        r8;
+       uint64_t        r9;             /* arg5 for system call */

 
         uint64_t       cr2;
         uint64_t       r15;
 
         uint64_t       cr2;
         uint64_t       r15;


@@ -723,31 +447,23 @@ struct x86_saved_state64 {
 
        uint32_t        gs;
        uint32_t        fs;
 
        uint32_t        gs;
        uint32_t        fs;

+
+       uint64_t        _pad;
+

        struct  x86_64_intr_stack_frame isf;
 };
 typedef struct x86_saved_state64 x86_saved_state64_t;
 #define x86_SAVED_STATE64_COUNT        ((mach_msg_type_number_t) \
        (sizeof (struct x86_saved_state64)/sizeof(unsigned int)))
 
        struct  x86_64_intr_stack_frame isf;
 };
 typedef struct x86_saved_state64 x86_saved_state64_t;
 #define x86_SAVED_STATE64_COUNT        ((mach_msg_type_number_t) \
        (sizeof (struct x86_saved_state64)/sizeof(unsigned int)))
 

-struct x86_saved_state64_tagged {
-       uint32_t                tag;
-       x86_saved_state64_t     state;
-};
-typedef struct x86_saved_state64_tagged x86_saved_state64_tagged_t;
-
-struct x86_sframe64 {
-        struct x86_64_intr_stack_frame slf;
-       uint32_t                        pad_for_16byte_alignment[3];
-        struct x86_saved_state64_tagged        ssf;
-};
-typedef struct x86_sframe64 x86_sframe64_t;
-

 extern uint32_t get_eflags_exportmask(void);
 extern uint32_t get_eflags_exportmask(void);

+

 /*
  * Unified, tagged saved state:
  */
 typedef struct {
        uint32_t                        flavor;
 /*
  * Unified, tagged saved state:
  */
 typedef struct {
        uint32_t                        flavor;

+       uint32_t                        _pad_for_16byte_alignment[3];

        union {
                x86_saved_state32_t     ss_32;
                x86_saved_state64_t     ss_64;
        union {
                x86_saved_state32_t     ss_32;
                x86_saved_state64_t     ss_64;


@@ -755,6 +471,7 @@ typedef struct {
 } x86_saved_state_t;
 #define        ss_32   uss.ss_32
 #define        ss_64   uss.ss_64
 } x86_saved_state_t;
 #define        ss_32   uss.ss_32
 #define        ss_64   uss.ss_64

+#pragma pack()

 
 static inline boolean_t
 is_saved_state64(x86_saved_state_t *iss)
 
 static inline boolean_t
 is_saved_state64(x86_saved_state_t *iss)