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

Timestamp:

Sep 16, 2021 1:32:18 PM (3 years ago)

Author:

vboxsync

Message:

VMM/CPUM,++: Moved the guest's extended state (XState) from the hyper heap and into CPUMCTX. bugref:10093

File:

• trunk/src/VBox/VMM/include/CPUMInternal.mac (modified) (3 diffs)

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

@@ -213 +213 @@
     .Guest.msrKERNELGSBASE    resb    8
     .Guest.uMsrPadding0       resb    8
+
+    alignb 8
+    .Guest.fExtrn             resq    1
+
+    alignb 32
+    .Guest.aPaePdpes          resq    4
+
     alignb 8
     .Guest.aXcr               resq    2
     .Guest.fXStateMask        resq    1
-    .Guest.pXStateR0      RTR0PTR_RES 1
-    alignb 8
-    .Guest.pXStateR3      RTR3PTR_RES 1
+    .Guest.fUsedFpuGuest      resb    1
     alignb 8
     .Guest.aoffXState         resw    64
-    .Guest.fUsedFpuGuest      resb    1
-    alignb 8
-    .Guest.fExtrn             resq    1
-    .Guest.aPaePdpes          resq    4
-    alignb 8
+    alignb 256
+    .Guest.abXState           resb    0x4000-0x300
+    .Guest.XState             EQU     .Guest.abXState
+
+    alignb 4096
     .Guest.hwvirt.svm.uMsrHSavePa            resq         1
     .Guest.hwvirt.svm.GCPhysVmcb             resq         1
@@ -606 +611 @@
         ;
  %ifdef IN_RING0
-        mov     pXState, [pCpumCpu + CPUMCPU.Guest.pXStateR0]
+        lea     pXState, [pCpumCpu + CPUMCPU.Guest.XState]
  %else
   %error "Unsupported context!"
@@ -675 +680 @@
         ;
  %ifdef IN_RING0
-        mov     pXState, [pCpumCpu + CPUMCPU.Guest.pXStateR0]
+        lea     pXState, [pCpumCpu + CPUMCPU.Guest.XState]
  %else
   %error "Unsupported context!"