Changeset 54898 in vbox for trunk/include/VBox

Timestamp:

Mar 22, 2015 11:47:07 PM (10 years ago)

Author:

vboxsync

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

99113

Message:

CPUMCTX,CPUMHOST: Replaced the fpu (X86FXSAVE) member with an XState (X86XSAVEAREA) member.

Location:

trunk/include/VBox/vmm

Files:

• cpum.mac (modified) (1 diff)
• cpumctx.h (modified) (1 diff)
• vm.h (modified) (2 diffs)
• vm.mac (modified) (1 diff)

trunk/include/VBox/vmm/cpum.mac

@@ -133 +133 @@
 
 
+%define XSTATE_SIZE             8192
+
 struc CPUMCTX
-    .fpu                resb    512
+    .XState             resb    XSTATE_SIZE
     .eax                resq    1
     .ecx                resq    1

trunk/include/VBox/vmm/cpumctx.h

@@ -250 +250 @@
      * @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).  */
-    X86FXSTATE      fpu;
+    X86XSAVEAREA        XState;
 
     /** CPUMCTXCORE Part.

trunk/include/VBox/vmm/vm.h

@@ -231 +231 @@
     uint8_t                 abAlignment2[3584];
 
+    /** PGM part. */
+    union
+    {
+#ifdef ___PGMInternal_h
+        struct PGMCPU       s;
+#endif
+        uint8_t             padding[4096];      /* multiple of 4096 */
+    } pgm;
+
     /** CPUM part. */
     union
@@ -237 +246 @@
         struct CPUMCPU      s;
 #endif
-        uint8_t             padding[4096];      /* multiple of 4096 */
+        uint8_t             padding[28672];      /* multiple of 4096 */
     } cpum;
-
-    /** PGM part. */
-    union
-    {
-#ifdef ___PGMInternal_h
-        struct PGMCPU       s;
-#endif
-        uint8_t             padding[4096];      /* multiple of 4096 */
-    } pgm;
 
 } VMCPU;

trunk/include/VBox/vmm/vm.mac

@@ -146 +146 @@
 
     alignb 4096
-    .cpum                   resb 4096
     .pgm                    resb 4096
+    alignb 4096
+    .cpum                   resb 28672
+    alignb 4096
 endstruc