Changeset 55004 in vbox

Timestamp:

Mar 30, 2015 11:14:04 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99275

Message:

backed out r99268 as it causes serious regressions on Windows hosts

Location:

trunk

Files:

trunk/include/VBox/vmm/cpum.mac

-              r54999
+              r55004
 struc CPUMCTX
+    .XState             resb    XSTATE_SIZE
     .eax                resq    1
     .ecx                resq    1
 …
     .msrApicBase        resb    8
     .au32SizePadding    resb    24
-    .XState             resb    XSTATE_SIZE
 endstruc

-              r54999
+              r55004
 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.
      * @{ */
 …
     /** 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()

-              r54999
+              r55004
     ; (Identical to the .Hyper chunk below.)
+    ;
+    alignb 64
+    .Guest.XState             resb    XSTATE_SIZE
     .Guest.eax                resq    1
     .Guest.ecx                resq    1
 …
     .Guest.msrKERNELGSBASE    resb    8
     .Guest.msrApicBase        resb    8
+    alignb 64
+    .Guest.XState             resb    XSTATE_SIZE
     alignb 64
 …
+    ;
     alignb 64
+    .Hyper.XState             resb    XSTATE_SIZE
     .Hyper.eax                resq    1
     .Hyper.ecx                resq    1
 …
     .Hyper.msrApicBase        resb    8
     alignb 64
-    .Hyper.XState             resb    XSTATE_SIZE
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC

Note: See TracChangeset for help on using the changeset viewer.