[Qemu-devel] [PATCH 39/49] x86: split FPReg union

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 target-i386/cpu.h |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index bea9ac3..f06c7cf 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -555,6 +555,15 @@ typedef union {
 #endif
 #define MMX_Q(n) q

+typedef union {
+#ifdef USE_X86LDOUBLE
+    CPU86_LDouble d __attribute__((aligned(16)));
+#else
+    CPU86_LDouble d;
+#endif
+    MMXReg mmx;
+} FPReg;
+
 #ifdef TARGET_X86_64
 #define CPU_NB_REGS 16
 #else
@@ -598,14 +607,7 @@ typedef struct CPUX86State {
     uint16_t fpregs_format_vmstate;
     uint16_t fpuc;
     uint8_t fptags[8];   /* 0 = valid, 1 = empty */
-    union {
-#ifdef USE_X86LDOUBLE
-        CPU86_LDouble d __attribute__((aligned(16)));
-#else
-        CPU86_LDouble d;
-#endif
-        MMXReg mmx;
-    } fpregs[8];
+    FPReg fpregs[8];

     /* emulator internal variables */
     float_status fp_status;
-- 
1.6.2.5