Commit 99f8ecdf authored by Roland McGrath's avatar Roland McGrath Committed by Ingo Molnar

x86: x86 i387 unify structs

The i387_fxsave_struct formats really have the same layout
on 32 and 64, with only some slightly different use of a few
fields.  The i387_fsave_struct and i387_soft_struct formats
are never used by 64-bit kernels, but it doesn't hurt to
have the unused types in the union and cuts down on the
amount of #ifdef hair required throughout the i387 code.
Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 863aec86
...@@ -226,64 +226,37 @@ struct orig_ist { ...@@ -226,64 +226,37 @@ struct orig_ist {
unsigned long ist[7]; unsigned long ist[7];
}; };
#ifdef CONFIG_X86_32 #define MXCSR_DEFAULT 0x1f80
struct i387_fsave_struct {
long cwd;
long swd;
long twd;
long fip;
long fcs;
long foo;
long fos;
long st_space[20]; /* 8*10 bytes for each FP-reg = 80 bytes */
long status; /* software status information */
};
struct i387_fxsave_struct {
unsigned short cwd;
unsigned short swd;
unsigned short twd;
unsigned short fop;
long fip;
long fcs;
long foo;
long fos;
long mxcsr;
long mxcsr_mask;
long st_space[32]; /* 8*16 bytes for each FP-reg = 128 bytes */
long xmm_space[32]; /* 8*16 bytes for each XMM-reg = 128 bytes */
long padding[56];
} __attribute__((aligned(16)));
struct i387_soft_struct { struct i387_fsave_struct {
long cwd; u32 cwd;
long swd; u32 swd;
long twd; u32 twd;
long fip; u32 fip;
long fcs; u32 fcs;
long foo; u32 foo;
long fos; u32 fos;
long st_space[20]; /* 8*10 bytes for each FP-reg = 80 bytes */ u32 st_space[20]; /* 8*10 bytes for each FP-reg = 80 bytes */
unsigned char ftop, changed, lookahead, no_update, rm, alimit; u32 status; /* software status information */
struct info *info;
unsigned long entry_eip;
};
union i387_union {
struct i387_fsave_struct fsave;
struct i387_fxsave_struct fxsave;
struct i387_soft_struct soft;
}; };
# include "processor_32.h"
#else
struct i387_fxsave_struct { struct i387_fxsave_struct {
u16 cwd; u16 cwd;
u16 swd; u16 swd;
u16 twd; u16 twd;
u16 fop; u16 fop;
u64 rip; union {
u64 rdp; struct {
u64 rip;
u64 rdp;
};
struct {
u32 fip;
u32 fcs;
u32 foo;
u32 fos;
};
};
u32 mxcsr; u32 mxcsr;
u32 mxcsr_mask; u32 mxcsr_mask;
u32 st_space[32]; /* 8*16 bytes for each FP-reg = 128 bytes */ u32 st_space[32]; /* 8*16 bytes for each FP-reg = 128 bytes */
...@@ -291,10 +264,29 @@ struct i387_fxsave_struct { ...@@ -291,10 +264,29 @@ struct i387_fxsave_struct {
u32 padding[24]; u32 padding[24];
} __attribute__((aligned(16))); } __attribute__((aligned(16)));
struct i387_soft_struct {
u32 cwd;
u32 swd;
u32 twd;
u32 fip;
u32 fcs;
u32 foo;
u32 fos;
u32 st_space[20]; /* 8*10 bytes for each FP-reg = 80 bytes */
u8 ftop, changed, lookahead, no_update, rm, alimit;
struct info *info;
u32 entry_eip;
};
union i387_union { union i387_union {
struct i387_fsave_struct fsave;
struct i387_fxsave_struct fxsave; struct i387_fxsave_struct fxsave;
struct i387_soft_struct soft;
}; };
#ifdef CONFIG_X86_32
# include "processor_32.h"
#else
# include "processor_64.h" # include "processor_64.h"
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment