Changeset 91283 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Sep 16, 2021 1:58:36 PM (3 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• CPUMR0.cpp (modified) (1 diff)
• CPUMR0A.asm (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp

@@ -186 +186 @@
 {
     LogFlow(("CPUMR0Init: %p\n", pVM));
+    AssertCompile(sizeof(pVM->aCpus[0].cpum.s.Host.abXState) >= sizeof(pVM->aCpus[0].cpum.s.Guest.abXState));
 
     /*

trunk/src/VBox/VMM/VMMR0/CPUMR0A.asm

@@ -144 +144 @@
 %ifdef VBOX_WITH_KERNEL_USING_XMM
         ; If we didn't save the host state, we must save the non-volatile XMM registers.
-        mov     pXState, [pCpumCpu + CPUMCPU.Host.pXStateR0]
+        lea     pXState, [pCpumCpu + CPUMCPU.Host.XState]
         stmxcsr [pXState + X86FXSTATE.MXCSR]
         movdqa  [pXState + X86FXSTATE.xmm6 ], xmm6
@@ -166 +166 @@
 %ifdef VBOX_WITH_KERNEL_USING_XMM
         ; Restore the non-volatile xmm registers. ASSUMING 64-bit host.
-        mov     pXState, [pCpumCpu + CPUMCPU.Host.pXStateR0]
+        lea     pXState, [pCpumCpu + CPUMCPU.Host.XState]
         movdqa  xmm6,  [pXState + X86FXSTATE.xmm6]
         movdqa  xmm7,  [pXState + X86FXSTATE.xmm7]
@@ -242 +242 @@
         ; them while saving the guest state (we've gotta do this anyway).
         ;
-        mov     pXState, [pCpumCpu + CPUMCPU.Host.pXStateR0]
+        lea     pXState, [pCpumCpu + CPUMCPU.Host.XState]
         stmxcsr [pXState + X86FXSTATE.MXCSR]
         movdqa  [pXState + X86FXSTATE.xmm6], xmm6