xnu-4903.270.47.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 715422ac8f6cee59274e205168d00d947c500c84..324ac645bc0fa6511077cc260e7e6452c566fb3e 100644 (file)
--- a/osfmk/mach/i386/thread_status.h
+++ b/osfmk/mach/i386/thread_status.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * 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
  * 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 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,
  * 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,


@@ -22,34 +22,34 @@
  * 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.
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
  */

-/* 
+/*

  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.

- * 
+ *

  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.

- * 
+ *

  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.

- * 
+ *

  * Carnegie Mellon requests users of this software to return to
  * Carnegie Mellon requests users of this software to return to

- * 
+ *

  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890

- * 
+ *

  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */


@@ -64,15 +64,19 @@
  *     state as applied to I386 processors.
  */
 
  *     state as applied to I386 processors.
  */
 

-#ifndef        _MACH_I386_THREAD_STATUS_H_
+#ifndef _MACH_I386_THREAD_STATUS_H_

 #define _MACH_I386_THREAD_STATUS_H_
 
 #define _MACH_I386_THREAD_STATUS_H_
 

-#include <mach/i386/_structs.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
  * are externally known... eventually they should be deprecated.
 /*
  * the i386_xxxx form is kept for legacy purposes since these types
  * are externally known... eventually they should be deprecated.


@@ -89,37 +93,44 @@
  * they are externally known which is the only reason we don't just get
  * rid of them
  */
  * they are externally known which is the only reason we don't just get
  * rid of them
  */

-#define i386_THREAD_STATE              1
-#define i386_FLOAT_STATE               2
-#define i386_EXCEPTION_STATE           3
+#define i386_THREAD_STATE               1
+#define i386_FLOAT_STATE                2
+#define i386_EXCEPTION_STATE            3

 
 /*
  * THREAD_STATE_FLAVOR_LIST 0
 
 /*
  * THREAD_STATE_FLAVOR_LIST 0

- *     these are the supported flavors
+ *      these are the supported flavors

  */
  */

-#define x86_THREAD_STATE32             1
-#define x86_FLOAT_STATE32              2
-#define x86_EXCEPTION_STATE32          3
-#define x86_THREAD_STATE64             4
-#define x86_FLOAT_STATE64              5
-#define x86_EXCEPTION_STATE64          6
-#define x86_THREAD_STATE               7
-#define x86_FLOAT_STATE                        8
-#define x86_EXCEPTION_STATE            9
-#define x86_DEBUG_STATE32              10
-#define x86_DEBUG_STATE64              11
-#define x86_DEBUG_STATE                        12
-#define THREAD_STATE_NONE              13
-/* 15 and 16 are used for the internal x86_SAVED_STATE flavours */
-#define x86_AVX_STATE32                        16
-#define x86_AVX_STATE64                        17
-
+#define x86_THREAD_STATE32              1
+#define x86_FLOAT_STATE32               2
+#define x86_EXCEPTION_STATE32           3
+#define x86_THREAD_STATE64              4
+#define x86_FLOAT_STATE64               5
+#define x86_EXCEPTION_STATE64           6
+#define x86_THREAD_STATE                7
+#define x86_FLOAT_STATE                 8
+#define x86_EXCEPTION_STATE             9
+#define x86_DEBUG_STATE32               10
+#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 */
+#define x86_THREAD_FULL_STATE64         23

 
 /*
  * Largest state on this machine:
  * (be sure mach/machine/thread_state.h matches!)
  */
 
 /*
  * Largest state on this machine:
  * (be sure mach/machine/thread_state.h matches!)
  */

-#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
 
 /*
  * VALID_THREAD_STATE_FLAVOR is a platform specific macro that when passed


@@ -127,6 +138,29 @@
  * platform. The macro must be manually updated to include all of the valid
  * exception flavors as defined above.
  */
  * 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)       \
+        ((x == x86_THREAD_STATE32)      || \
+         (x == x86_FLOAT_STATE32)       || \
+         (x == x86_EXCEPTION_STATE32)   || \
+         (x == x86_DEBUG_STATE32)       || \
+         (x == x86_THREAD_STATE64)      || \
+         (x == x86_THREAD_FULL_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)      || \
 #define VALID_THREAD_STATE_FLAVOR(x)       \
         ((x == x86_THREAD_STATE32)     || \
          (x == x86_FLOAT_STATE32)      || \


@@ -142,32 +176,34 @@
          (x == x86_DEBUG_STATE)        || \
          (x == x86_AVX_STATE32)        || \
          (x == x86_AVX_STATE64)        || \
          (x == x86_DEBUG_STATE)        || \
          (x == x86_AVX_STATE32)        || \
          (x == x86_AVX_STATE64)        || \

+         (x == x86_AVX_STATE)          || \

          (x == THREAD_STATE_NONE))
          (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;
 
 /*
  * Default segment register values.
  */
 };
 typedef struct x86_state_hdr x86_state_hdr_t;
 
 /*
  * Default segment register values.
  */

-    
-#define USER_CODE_SELECTOR     0x0017
-#define USER_DATA_SELECTOR     0x001f
-#define KERN_CODE_SELECTOR     0x0008
-#define KERN_DATA_SELECTOR     0x0010
+
+#define USER_CODE_SELECTOR      0x0017
+#define USER_DATA_SELECTOR      0x001f
+#define KERN_CODE_SELECTOR      0x0008
+#define KERN_DATA_SELECTOR      0x0010

 
 /*
  * to be deprecated in the future
  */
 typedef _STRUCT_X86_THREAD_STATE32 i386_thread_state_t;
 
 /*
  * 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) \
+#define i386_THREAD_STATE_COUNT ((mach_msg_type_number_t) \

     ( sizeof (i386_thread_state_t) / sizeof (int) ))
 
 typedef _STRUCT_X86_THREAD_STATE32 x86_thread_state32_t;
     ( sizeof (i386_thread_state_t) / sizeof (int) ))
 
 typedef _STRUCT_X86_THREAD_STATE32 x86_thread_state32_t;

-#define x86_THREAD_STATE32_COUNT       ((mach_msg_type_number_t) \
+#define x86_THREAD_STATE32_COUNT        ((mach_msg_type_number_t) \

     ( sizeof (x86_thread_state32_t) / sizeof (int) ))
 
 /*
     ( sizeof (x86_thread_state32_t) / sizeof (int) ))
 
 /*


@@ -175,25 +211,31 @@ typedef _STRUCT_X86_THREAD_STATE32 x86_thread_state32_t;
  */
 typedef _STRUCT_X86_FLOAT_STATE32 i386_float_state_t;
 #define i386_FLOAT_STATE_COUNT ((mach_msg_type_number_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)))
+               (sizeof(i386_float_state_t)/sizeof(unsigned int)))

 
 typedef _STRUCT_X86_FLOAT_STATE32 x86_float_state32_t;
 #define x86_FLOAT_STATE32_COUNT ((mach_msg_type_number_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)))
+               (sizeof(x86_float_state32_t)/sizeof(unsigned int)))

 
 typedef _STRUCT_X86_AVX_STATE32 x86_avx_state32_t;
 #define x86_AVX_STATE32_COUNT ((mach_msg_type_number_t) \
 
 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)))
+               (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 */

 
 /*
  * to be deprecated in the future
  */
 typedef _STRUCT_X86_EXCEPTION_STATE32 i386_exception_state_t;
 
 /*
  * to be deprecated in the future
  */
 typedef _STRUCT_X86_EXCEPTION_STATE32 i386_exception_state_t;

-#define i386_EXCEPTION_STATE_COUNT     ((mach_msg_type_number_t) \
+#define i386_EXCEPTION_STATE_COUNT      ((mach_msg_type_number_t) \

     ( sizeof (i386_exception_state_t) / sizeof (int) ))
 
 typedef _STRUCT_X86_EXCEPTION_STATE32 x86_exception_state32_t;
     ( sizeof (i386_exception_state_t) / sizeof (int) ))
 
 typedef _STRUCT_X86_EXCEPTION_STATE32 x86_exception_state32_t;

-#define x86_EXCEPTION_STATE32_COUNT    ((mach_msg_type_number_t) \
+#define x86_EXCEPTION_STATE32_COUNT     ((mach_msg_type_number_t) \

     ( sizeof (x86_exception_state32_t) / sizeof (int) ))
 
 #define I386_EXCEPTION_STATE_COUNT i386_EXCEPTION_STATE_COUNT
     ( sizeof (x86_exception_state32_t) / sizeof (int) ))
 
 #define I386_EXCEPTION_STATE_COUNT i386_EXCEPTION_STATE_COUNT


@@ -205,25 +247,35 @@ typedef _STRUCT_X86_DEBUG_STATE32 x86_debug_state32_t;
 #define X86_DEBUG_STATE32_COUNT x86_DEBUG_STATE32_COUNT
 
 typedef _STRUCT_X86_THREAD_STATE64 x86_thread_state64_t;
 #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) \
+#define x86_THREAD_STATE64_COUNT        ((mach_msg_type_number_t) \

     ( sizeof (x86_thread_state64_t) / sizeof (int) ))
 
     ( sizeof (x86_thread_state64_t) / sizeof (int) ))
 

+typedef _STRUCT_X86_THREAD_FULL_STATE64 x86_thread_full_state64_t;
+#define x86_THREAD_FULL_STATE64_COUNT   ((mach_msg_type_number_t) \
+    ( sizeof (x86_thread_full_state64_t) / sizeof (int) ))
+

 typedef _STRUCT_X86_FLOAT_STATE64 x86_float_state64_t;
 #define x86_FLOAT_STATE64_COUNT ((mach_msg_type_number_t) \
 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)))
+               (sizeof(x86_float_state64_t)/sizeof(unsigned int)))

 
 typedef _STRUCT_X86_AVX_STATE64 x86_avx_state64_t;
 #define x86_AVX_STATE64_COUNT ((mach_msg_type_number_t) \
 
 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)))
+               (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 */

 
 typedef _STRUCT_X86_EXCEPTION_STATE64 x86_exception_state64_t;
 
 typedef _STRUCT_X86_EXCEPTION_STATE64 x86_exception_state64_t;

-#define x86_EXCEPTION_STATE64_COUNT    ((mach_msg_type_number_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;
     ( 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;

-#define x86_DEBUG_STATE64_COUNT        ((mach_msg_type_number_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
     ( sizeof (x86_debug_state64_t) / sizeof (int) ))
 
 #define X86_DEBUG_STATE64_COUNT x86_DEBUG_STATE64_COUNT


@@ -232,112 +284,92 @@ typedef _STRUCT_X86_DEBUG_STATE64 x86_debug_state64_t;
  * Combined thread, float and exception states
  */
 struct x86_thread_state {
  * Combined thread, float and exception states
  */
 struct x86_thread_state {

-       x86_state_hdr_t                 tsh;
+       x86_state_hdr_t                 tsh;

        union {
        union {

-           x86_thread_state32_t        ts32;
-           x86_thread_state64_t        ts64;
+               x86_thread_state32_t        ts32;
+               x86_thread_state64_t        ts64;

        } uts;
 };
 
 struct x86_float_state {
        } uts;
 };
 
 struct x86_float_state {

-       x86_state_hdr_t                 fsh;
+       x86_state_hdr_t                 fsh;

        union {
        union {

-               x86_float_state32_t     fs32;
-               x86_float_state64_t     fs64;
+               x86_float_state32_t     fs32;
+               x86_float_state64_t     fs64;

        } ufs;
 };
 
 struct x86_exception_state {
        } ufs;
 };
 
 struct x86_exception_state {

-       x86_state_hdr_t                 esh;
+       x86_state_hdr_t                 esh;

        union {
        union {

-               x86_exception_state32_t es32;
-               x86_exception_state64_t es64;
+               x86_exception_state32_t es32;
+               x86_exception_state64_t es64;

        } ues;
 };
 
 struct x86_debug_state {
        } ues;
 };
 
 struct x86_debug_state {

-       x86_state_hdr_t                 dsh;
+       x86_state_hdr_t                 dsh;

        union {
        union {

-               x86_debug_state32_t     ds32;
-               x86_debug_state64_t     ds64;
+               x86_debug_state32_t     ds32;
+               x86_debug_state64_t     ds64;

        } 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;
 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) ))
+#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) \
 
 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)))
+               (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) \
 
 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)))
+               (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) \
 
 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)))
+               (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:
  */

-#define MACHINE_THREAD_STATE           x86_THREAD_STATE
-#define MACHINE_THREAD_STATE_COUNT     x86_THREAD_STATE_COUNT
-
-/*
- * 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 {
-       uint16_t        trapno;
-       uint16_t        cpu;
-       uint32_t        err;
-       uint32_t        eip;
-       uint32_t        cs;
-       uint32_t        efl;
-};
+#define MACHINE_THREAD_STATE            x86_THREAD_STATE
+#define MACHINE_THREAD_STATE_COUNT      x86_THREAD_STATE_COUNT

 
 #ifdef XNU_KERNEL_PRIVATE
 
 
 #ifdef XNU_KERNEL_PRIVATE
 

-#define x86_SAVED_STATE32              THREAD_STATE_NONE + 1
-#define x86_SAVED_STATE64              THREAD_STATE_NONE + 2
-
-/*
- * 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 {
-       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;
-};
+#define x86_SAVED_STATE32               THREAD_STATE_NONE + 1
+#define x86_SAVED_STATE64               THREAD_STATE_NONE + 2

 
 /*
  * The format in which thread state is saved by Mach on this machine.  This
 
 /*
  * The format in which thread state is saved by Mach on this machine.  This


@@ -345,200 +377,132 @@ struct x86_saved_state32_from_kernel {
  * servers, because copying can be avoided:
  */
 struct x86_saved_state32 {
  * servers, because copying can be avoided:
  */
 struct x86_saved_state32 {

-       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;
+       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;
 
 };
 typedef struct x86_saved_state32 x86_saved_state32_t;
 

-#define x86_SAVED_STATE32_COUNT        ((mach_msg_type_number_t) \
+#define x86_SAVED_STATE32_COUNT ((mach_msg_type_number_t) \

        (sizeof (x86_saved_state32_t)/sizeof(unsigned int)))
 
 #pragma pack(4)
        (sizeof (x86_saved_state32_t)/sizeof(unsigned int)))
 
 #pragma pack(4)

-struct x86_saved_state32_tagged {
-       uint32_t                        tag;
-       struct x86_saved_state32        state;
-};
-typedef struct x86_saved_state32_tagged x86_saved_state32_tagged_t;
-/* Note: sizeof(x86_saved_state32_tagged_t) is a multiple of 16 bytes */
-
-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;

 
 /*
  * 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 {

-       uint16_t        trapno;
-       uint16_t        cpu;
-       uint32_t        _pad;
-       uint64_t        trapfn;
-       uint64_t        err;
-       uint64_t        rip;
-       uint64_t        cs;
-       uint64_t        rflags;
-       uint64_t        rsp;
-       uint64_t        ss;
+       uint16_t        trapno;
+       uint16_t        cpu;
+       uint32_t        _pad;
+       uint64_t        trapfn;
+       uint64_t        err;
+       uint64_t        rip;
+       uint64_t        cs;
+       uint64_t        rflags;
+       uint64_t        rsp;
+       uint64_t        ss;

 };
 typedef struct x86_64_intr_stack_frame x86_64_intr_stack_frame_t;
 };
 typedef struct x86_64_intr_stack_frame x86_64_intr_stack_frame_t;

-/* Note: sizeof(x86_64_intr_stack_frame_t) must be a multiple of 16 bytes */
-
-/*
- * 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;
-       struct x86_64_intr_stack_frame  isf64;
-};
-typedef struct x86_saved_state_compat32 x86_saved_state_compat32_t;
-
-struct x86_sframe_compat32 {
-       uint32_t                        pad_for_16byte_alignment[2];
-       uint64_t                        _register_save_slot;
-        struct x86_64_intr_stack_frame  slf;
-        struct x86_saved_state_compat32 ssf;
-};
-typedef struct x86_sframe_compat32 x86_sframe_compat32_t;
-/* Note: sizeof(x86_sframe_compat32_t) must be a multiple of 16 bytes */
+_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
  */
 struct x86_saved_state64 {
  * is no need for an x86_saved_state64_from_kernel variant
  */
 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        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       cr2;
-        uint64_t       r15;
-        uint64_t       r14;
-        uint64_t       r13;
-        uint64_t       r12;
-        uint64_t       r11;
-       uint64_t        rbp;
-       uint64_t        rbx;
-       uint64_t        rcx;
-       uint64_t        rax;
-
-       uint32_t        gs;
-       uint32_t        fs;
-
-       uint32_t        _pad_for_tagged_alignment[3];
-
-       struct  x86_64_intr_stack_frame isf;
+       uint64_t        rdi;            /* arg0 for system call */
+       uint64_t        rsi;
+       uint64_t        rdx;
+       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        r14;
+       uint64_t        r13;
+       uint64_t        r12;
+       uint64_t        r11;
+       uint64_t        rbp;
+       uint64_t        rbx;
+       uint64_t        rcx;
+       uint64_t        rax;
+
+       uint32_t        gs;
+       uint32_t        fs;
+
+       uint32_t        ds;
+       uint32_t        es;
+
+       struct  x86_64_intr_stack_frame isf;

 };
 typedef struct x86_saved_state64 x86_saved_state64_t;
 };
 typedef struct x86_saved_state64 x86_saved_state64_t;

-#define x86_SAVED_STATE64_COUNT        ((mach_msg_type_number_t) \
+#define x86_SAVED_STATE64_COUNT ((mach_msg_type_number_t) \

        (sizeof (struct x86_saved_state64)/sizeof(unsigned int)))
 
        (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 {
-       uint64_t                        _register_save_slot[2];
-       struct x86_64_intr_stack_frame  slf;
-       x86_saved_state64_tagged_t      ssf;
-};
-typedef struct x86_sframe64 x86_sframe64_t;
-/* Note: sizeof(x86_sframe64_t) is a multiple of 16 bytes */
-

 extern uint32_t get_eflags_exportmask(void);
 
 /*
  * Unified, tagged saved state:
  */
 typedef struct {
 extern uint32_t get_eflags_exportmask(void);
 
 /*
  * Unified, tagged saved state:
  */
 typedef struct {

-       uint32_t                        flavor;
+       uint32_t                        flavor;
+       uint32_t                        _pad_for_16byte_alignment[3];

        union {
        union {

-               x86_saved_state32_t     ss_32;
-               x86_saved_state64_t     ss_64;
+               x86_saved_state32_t     ss_32;
+               x86_saved_state64_t     ss_64;

        } uss;
 } x86_saved_state_t;
        } uss;
 } x86_saved_state_t;

-#define        ss_32   uss.ss_32
-#define        ss_64   uss.ss_64
+#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)
 {
 #pragma pack()
 
 static inline boolean_t
 is_saved_state64(x86_saved_state_t *iss)
 {

-       return (iss->flavor == x86_SAVED_STATE64);
+       return iss->flavor == x86_SAVED_STATE64;

 }
 
 static inline boolean_t
 is_saved_state32(x86_saved_state_t *iss)
 {
 }
 
 static inline boolean_t
 is_saved_state32(x86_saved_state_t *iss)
 {

-       return (iss->flavor == x86_SAVED_STATE32);
+       return iss->flavor == x86_SAVED_STATE32;

 }
 
 static inline x86_saved_state32_t *
 saved_state32(x86_saved_state_t *iss)
 {
 }
 
 static inline x86_saved_state32_t *
 saved_state32(x86_saved_state_t *iss)
 {

-       return &iss->ss_32; 
+       return &iss->ss_32;

 }
 
 static inline x86_saved_state64_t *
 saved_state64(x86_saved_state_t *iss)
 {
 }
 
 static inline x86_saved_state64_t *
 saved_state64(x86_saved_state_t *iss)
 {

-       return &iss->ss_64; 
+       return &iss->ss_64;

 }
 
 #endif /* XNU_KERNEL_PRIVATE */
 
 }
 
 #endif /* XNU_KERNEL_PRIVATE */
 

-#endif /* _MACH_I386_THREAD_STATUS_H_ */
+#endif  /* _MACH_I386_THREAD_STATUS_H_ */