Changeset 55106 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Apr 6, 2015 7:58:37 PM (10 years ago)

Author:

vboxsync

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

99401

Message:

VMM: host+guest xsave/xrstor state handling - not enabled.

Location:

trunk/src/VBox/VMM/include

Files:

• CPUMInternal.h (modified) (3 diffs)
• CPUMInternal.mac (modified) (5 diffs)

trunk/src/VBox/VMM/include/CPUMInternal.h

@@ -410 +410 @@
 
     /* padding to get 64byte aligned size */
-    uint8_t         auPadding[16+20];
+    uint8_t         auPadding[20];
 
 #elif HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
@@ -456 +456 @@
     /* padding to get 32byte aligned size */
 # ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
+    uint8_t         auPadding[52];
+# else
     uint8_t         auPadding[4];
-# else
-    uint8_t         auPadding[8+12];
 # endif
 
@@ -471 +471 @@
     /** Pointer to the FPU/SSE/AVX/XXXX state ring-3 mapping. */
     R3PTRTYPE(PX86XSAVEAREA)    pXStateR3;
+    /** The XCR0 register. */
+    uint64_t                    xcr0;
+    /** The mask to pass to XSAVE/XRSTOR in EDX:EAX.  If zero we use
+     *  FXSAVE/FXRSTOR (since bit 0 will always be set, we only need to test it). */
+    uint64_t                    fXStateMask;
 } CPUMHOSTCTX;
 AssertCompileSizeAlignment(CPUMHOSTCTX, 64);

trunk/src/VBox/VMM/include/CPUMInternal.mac

@@ -217 +217 @@
     .Guest.msrKERNELGSBASE    resb    8
     .Guest.msrApicBase        resb    8
-    .Guest.pXStateR0          RTR0PTR_RES 1
-    .Guest.pXStateR3          RTR3PTR_RES 1
-    .Guest.pXStateRC          RTRCPTR_RES 1
+    .Guest.xcr0               resq    1
+    .Guest.fXStateMask        resq    1
+    .Guest.pXStateR0      RTR0PTR_RES 1
+    .Guest.pXStateR3      RTR3PTR_RES 1
+    .Guest.pXStateRC      RTRCPTR_RES 1
+    .Guest.aoffXState         resw    64
 
     alignb 64
@@ -324 +327 @@
     .Host.SysEnter.esp   resq    1
     .Host.efer           resq    1
-    .Host.auPadding      resb    (16+20)
+    .Host.auPadding      resb    (20)
 
 %else ; 64-bit
@@ -357 +360 @@
     .Host.efer           resq    1
  %if fVBOX_WITH_HYBRID_32BIT_KERNEL
+    .Host.auPadding      resb    54
+ %else
     .Host.auPadding      resb    4
- %else
-    .Host.auPadding      resb   (8+12)
  %endif
 %endif ; 64-bit
@@ -366 +369 @@
     .Host.pXStateR0 RTR0PTR_RES  1
     .Host.pXStateR3 RTR3PTR_RES  1
+    alignb 8
+    .Host.xcr0           resq    1
+    .Host.fXStateMask    resq    1
 
     ;
@@ -470 +476 @@
     .Hyper.msrKERNELGSBASE    resb    8
     .Hyper.msrApicBase        resb    8
-    .Hyper.pXStateR0          RTR0PTR_RES 1
-    .Hyper.pXStateR3          RTR3PTR_RES 1
-    .Hyper.pXStateRC          RTRCPTR_RES 1
+    .Hyper.xcr0               resq    1
+    .Hyper.fXStateMask        resq    1
+    .Hyper.pXStateR0      RTR0PTR_RES 1
+    .Hyper.pXStateR3      RTR3PTR_RES 1
+    .Hyper.pXStateRC      RTRCPTR_RES 1
+    .Hyper.aoffXState         resw    64
     alignb 64