Changeset 55048 in vbox for trunk/include/VBox

Timestamp:

Mar 31, 2015 6:49:19 PM (10 years ago)

Author:

vboxsync

Message:

VMM,REM: Allocate the FPU/SSE/AVX/FUTURE state stuff. We need to use pointers to substates anyway and this will make CPUMCPU much smaller.

Location:

trunk/include/VBox/vmm

Files:

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

trunk/include/VBox/vmm/cpum.mac

@@ -136 +136 @@
 
 struc CPUMCTX
-    .XState             resb    XSTATE_SIZE
     .eax                resq    1
     .ecx                resq    1
@@ -235 +234 @@
     .msrKERNELGSBASE    resb    8
     .msrApicBase        resb    8
-    .au32SizePadding    resb    24
+    alignb 8
+    .pXStateR0      RTR0PTR_RES 1
+    .pXStateR3      RTR3PTR_RES 1
+    .pXStateRC      RTRCPTR_RES 1
+    alignb 64
 endstruc
 

trunk/include/VBox/vmm/cpumctx.h

@@ -247 +247 @@
 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.
      * @{ */
@@ -404 +399 @@
     /** @} */
 
+    /** Pointer to the FPU/SSE/AVX/XXXX state ring-0 mapping. */
+    R0PTRTYPE(PX86XSAVEAREA)    pXStateR0;
+    /** Pointer to the FPU/SSE/AVX/XXXX state ring-3 mapping. */
+    R3PTRTYPE(PX86XSAVEAREA)    pXStateR3;
+    /** Pointer to the FPU/SSE/AVX/XXXX state raw-mode mapping. */
+    RCPTRTYPE(PX86XSAVEAREA)    pXStateRC;
+
     /** Size padding. */
-    uint32_t        au32SizePadding[6];
+    uint32_t        au32SizePadding[HC_ARCH_BITS == 32 ? 3 : 1];
 } CPUMCTX;
 #pragma pack()

trunk/include/VBox/vmm/ssm.h

@@ -378 +378 @@
 /** Saved using SSMR3PutMem, don't be too strict. */
 #define SSMSTRUCT_FLAGS_SAVED_AS_MEM        RT_BIT_32(3)
+/** No introductory structure marker.  Use when splitting up structures.  */
+#define SSMSTRUCT_FLAGS_NO_LEAD_MARKER      RT_BIT_32(4)
+/** No trailing structure marker.  Use when splitting up structures.  */
+#define SSMSTRUCT_FLAGS_NO_TAIL_MARKER      RT_BIT_32(5)
+
 /** Band-aid for old SSMR3PutMem/SSMR3GetMem of structurs with host pointers.
  * @remarks This type is normally only used up to the first changes to the
@@ -390 +395 @@
                                               | SSMSTRUCT_FLAGS_NO_MARKERS  | SSMSTRUCT_FLAGS_SAVED_AS_MEM)
 /** Mask of the valid bits. */
-#define SSMSTRUCT_FLAGS_VALID_MASK          UINT32_C(0x0000000f)
+#define SSMSTRUCT_FLAGS_VALID_MASK          UINT32_C(0x0000003f)
 /** @} */
 

trunk/include/VBox/vmm/vm.h

@@ -246 +246 @@
         struct CPUMCPU      s;
 #endif
-        uint8_t             padding[28672];      /* multiple of 4096 */
+        uint8_t             padding[4096];      /* multiple of 4096 */
     } cpum;
 

trunk/include/VBox/vmm/vm.mac

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