X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..bd504ef0e0b883cdd7917b73b3574eb9ce669905:/osfmk/mach/i386/fp_reg.h

diff --git a/osfmk/mach/i386/fp_reg.h b/osfmk/mach/i386/fp_reg.h
index 87632e944..92d504f3f 100644
--- a/osfmk/mach/i386/fp_reg.h
+++ b/osfmk/mach/i386/fp_reg.h
@@ -59,51 +59,65 @@
 #ifndef	_I386_FP_SAVE_H_
 #define	_I386_FP_SAVE_H_
 
-/*
- *	Floating point registers and status, as saved
- *	and restored by FP save/restore instructions.
- */
-struct i386_fp_save	{
-	unsigned short	fp_control;	/* control */
-	unsigned short	fp_unused_1;
-	unsigned short	fp_status;	/* status */
-	unsigned short	fp_unused_2;
-	unsigned short	fp_tag;		/* register tags */
-	unsigned short	fp_unused_3;
-	unsigned int	fp_eip;		/* eip at failed instruction */
-	unsigned short	fp_cs;		/* cs at failed instruction */
-	unsigned short	fp_opcode;	/* opcode of failed instruction */
-	unsigned int	fp_dp;		/* data address */
-	unsigned short	fp_ds;		/* data segment */
-	unsigned short	fp_unused_4;
-};
+#ifdef  MACH_KERNEL_PRIVATE
+
+
+struct 	x86_fx_thread_state {
+	unsigned short  fx_control;     /* control */
+	unsigned short  fx_status;      /* status */
+	unsigned char  	fx_tag;         /* register tags */
+	unsigned char	fx_bbz1;	/* better be zero when calling fxrtstor */
+	unsigned short  fx_opcode;
+	unsigned int    fx_eip;         /* eip  instruction */
+	unsigned short  fx_cs;          /* cs instruction */
+	unsigned short  fx_bbz2;	/* better be zero when calling fxrtstor */ 
+	unsigned int    fx_dp;          /* data address */
+	unsigned short  fx_ds;          /* data segment */
+	unsigned short  fx_bbz3;	/* better be zero when calling fxrtstor */
+	unsigned int  	fx_MXCSR;
+	unsigned int  	fx_MXCSR_MASK;
+	unsigned short  fx_reg_word[8][8];      /* STx/MMx registers */
+	unsigned short  fx_XMM_reg[8][16];	/* XMM0-XMM15 on 64 bit processors */
+                                                /* XMM0-XMM7  on 32 bit processors... unused storage reserved */
+
+	unsigned char 	fx_reserved[16*5];	/* reserved by intel for future
+						 * expansion */
+	unsigned int	fp_valid;
+	unsigned int	fp_save_layout;
+	unsigned char	fx_pad[8];
+}__attribute__ ((packed));
 
-struct i386_fp_regs {
-	unsigned short	fp_reg_word[5][8];
-					/* space for 8 80-bit FP registers */
-};
+struct x86_avx_thread_state {
+	unsigned short  fx_control;     /* control */
+	unsigned short  fx_status;      /* status */
+	unsigned char  	fx_tag;         /* register tags */
+	unsigned char	fx_bbz1;	/* reserved zero */
+	unsigned short  fx_opcode;
+	unsigned int    fx_eip;         /* eip  instruction */
+	unsigned short  fx_cs;          /* cs instruction */
+	unsigned short  fx_bbz2;	/* reserved zero */
+	unsigned int    fx_dp;          /* data address */
+	unsigned short  fx_ds;          /* data segment */
+	unsigned short  fx_bbz3;	/* reserved zero */
+	unsigned int  	fx_MXCSR;
+	unsigned int  	fx_MXCSR_MASK;
+	unsigned short  fx_reg_word[8][8];      /* STx/MMx registers */
+	unsigned short  fx_XMM_reg[8][16];	/* XMM0-XMM15 on 64 bit processors */
+                                                /* XMM0-XMM7  on 32 bit processors... unused storage reserved */
+	unsigned char 	fx_reserved[16*5];	/* reserved */
+	unsigned int	fp_valid;
+	unsigned int	fp_save_layout;
+	unsigned char	fx_pad[8];
 
-/* note when allocating this data structure, it must be 16 byte aligned. */
-struct i386_fx_save {
-        unsigned short  fx_control;     /* control */
-        unsigned short  fx_status;      /* status */
-        unsigned char  	fx_tag;         /* register tags */
-        unsigned char	fx_bbz1;	/* better be zero when calling fxrtstor */
-        unsigned short  fx_opcode;
-        unsigned int    fx_eip;         /* eip  instruction */
-        unsigned short  fx_cs;          /* cs instruction */
-        unsigned short  fx_bbz2;	/* better be zero when calling fxrtstor */ 
-        unsigned int    fx_dp;          /* data address */
-        unsigned short  fx_ds;          /* data segment */
-        unsigned short  fx_bbz3;	/* better be zero when calling fxrtstor */
-        unsigned int  	fx_MXCSR;
-        unsigned int  	fx_MXCSR_MASK;
-        unsigned short  fx_reg_word[8][8];      /* STx/MMx registers */
-        unsigned short  fx_XMM_reg[8][8];       /* XMM0-XMM7 */
-        unsigned char 	fx_reserved[16*14];     /* reserved by intel for future expansion */
-};
+	struct	xsave_header {			/* Offset 512, xsave header */
+		uint64_t xsbv;
+		char	xhrsvd[56];
+	}_xh;
 
+	unsigned int	x_YMMH_reg[4][16];	/* Offset 576, high YMMs*/
+}__attribute__ ((packed));
 
+#endif /* MACH_KERNEL_PRIVATE */
 /*
  * Control register
  */