xnu-1228.tar.gz

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

diff --git a/osfmk/mach/i386/fp_reg.h b/osfmk/mach/i386/fp_reg.h
index 87632e94477fd8bdb7bed775efe93c8ab00bf90b..47a26a99d2190a36e43a980cc759f476c9067974 100644 (file)
--- a/osfmk/mach/i386/fp_reg.h
+++ b/osfmk/mach/i386/fp_reg.h
@@ -59,32 +59,9 @@
 #ifndef        _I386_FP_SAVE_H_
 #define        _I386_FP_SAVE_H_
 
 #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;
-};
-
-struct i386_fp_regs {
-       unsigned short  fp_reg_word[5][8];
-                                       /* space for 8 80-bit FP registers */
-};

 
 /* note when allocating this data structure, it must be 16 byte aligned. */
 
 /* note when allocating this data structure, it must be 16 byte aligned. */

-struct i386_fx_save {
+struct x86_fx_save {

         unsigned short  fx_control;     /* control */
         unsigned short  fx_status;      /* status */
         unsigned char          fx_tag;         /* register tags */
         unsigned short  fx_control;     /* control */
         unsigned short  fx_status;      /* status */
         unsigned char          fx_tag;         /* register tags */


@@ -99,8 +76,9 @@ struct i386_fx_save {
         unsigned int   fx_MXCSR;
         unsigned int   fx_MXCSR_MASK;
         unsigned short  fx_reg_word[8][8];      /* STx/MMx registers */
         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 */
+        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*6];      /* reserved by intel for future expansion */

 };
 
 
 };