Index: /trunk/include/VBox/vmm/cpum.mac
===================================================================
--- /trunk/include/VBox/vmm/cpum.mac	(revision 54998)
+++ /trunk/include/VBox/vmm/cpum.mac	(revision 54999)
@@ -136,5 +136,4 @@
 
 struc CPUMCTX
-    .XState             resb    XSTATE_SIZE
     .eax                resq    1
     .ecx                resq    1
@@ -236,4 +235,5 @@
     .msrApicBase        resb    8
     .au32SizePadding    resb    24
+    .XState             resb    XSTATE_SIZE
 endstruc
 
Index: /trunk/include/VBox/vmm/cpumctx.h
===================================================================
--- /trunk/include/VBox/vmm/cpumctx.h	(revision 54998)
+++ /trunk/include/VBox/vmm/cpumctx.h	(revision 54999)
@@ -247,9 +247,4 @@
 typedef struct CPUMCTX
 {
-    /** FPU state. (16-byte alignment)
-     * @todo This doesn't have to be in X86FXSTATE on CPUs without fxsr - we need a type for the
-     *       actual format or convert it (waste of time).  */
-    X86XSAVEAREA        XState;
-
     /** CPUMCTXCORE Part.
      * @{ */
@@ -406,4 +401,9 @@
     /** Size padding. */
     uint32_t        au32SizePadding[6];
+
+    /** FPU state. (16-byte alignment)
+     * @todo This doesn't have to be in X86FXSTATE on CPUs without fxsr - we need a type for the
+     *       actual format or convert it (waste of time).  */
+    X86XSAVEAREA        XState;
 } CPUMCTX;
 #pragma pack()
Index: /trunk/src/VBox/VMM/include/CPUMInternal.mac
===================================================================
--- /trunk/src/VBox/VMM/include/CPUMInternal.mac	(revision 54998)
+++ /trunk/src/VBox/VMM/include/CPUMInternal.mac	(revision 54999)
@@ -126,6 +126,4 @@
     ; (Identical to the .Hyper chunk below.)
     ;
-    alignb 64
-    .Guest.XState             resb    XSTATE_SIZE
     .Guest.eax                resq    1
     .Guest.ecx                resq    1
@@ -226,5 +224,6 @@
     .Guest.msrKERNELGSBASE    resb    8
     .Guest.msrApicBase        resb    8
-
+    alignb 64
+    .Guest.XState             resb    XSTATE_SIZE
 
     alignb 64
@@ -368,5 +367,4 @@
     ;
     alignb 64
-    .Hyper.XState             resb    XSTATE_SIZE
     .Hyper.eax                resq    1
     .Hyper.ecx                resq    1
@@ -468,4 +466,5 @@
     .Hyper.msrApicBase        resb    8
     alignb 64
+    .Hyper.XState             resb    XSTATE_SIZE
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC