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

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/VMMRZ/CPUMRZA.asm (modified) (3 diffs)

trunk/src/VBox/VMM/VMMRZ/CPUMRZA.asm

@@ -173 +173 @@
 
         ; Load the guest XMM register values we already saved in HMR0VMXStartVMWrapXMM.
-        mov     pXState, [pCpumCpu + CPUMCPU.Guest.pXStateR0]
+        lea     pXState, [pCpumCpu + CPUMCPU.Guest.XState]
         movdqa  xmm0,  [pXState + X86FXSTATE.xmm0]
         movdqa  xmm1,  [pXState + X86FXSTATE.xmm1]
@@ -256 +256 @@
         mov     xCX, dword [ebp + 8]
  %endif
- %ifdef IN_RING0
-        mov     xCX, [xCX + CPUMCPU.Guest.pXStateR0]
- %elifdef IN_RC
-        mov     xCX, [xCX + CPUMCPU.Guest.pXStateRC]
- %else
-  %error "Invalid context!"
- %endif
+        lea     xCX, [xCX + CPUMCPU.Guest.XState]
 
  %ifdef IN_RC
@@ -336 +330 @@
         mov     xCX, dword [ebp + 8]
 %endif
-%ifdef IN_RING0
-        mov     xCX, [xCX + CPUMCPU.Guest.pXStateR0]
-%elifdef IN_RC
-        mov     xCX, [xCX + CPUMCPU.Guest.pXStateRC]
-%else
- %error "Invalid context!"
-%endif
+        lea     xCX, [xCX + CPUMCPU.Guest.XState]
 
 %ifdef IN_RC