x86: split FPReg union

Signed-off-by: Juan Quintela <[email protected]>
Signed-off-by: Anthony Liguori <[email protected]>

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 1bf027ebfcef8e1413e24d2320e494575186632c..6d6ceb32ee9907fa0136b03683a4e398e460cea6 100644 (file)
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -556,6 +556,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
@@ -599,14 +608,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;