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

Timestamp:

Sep 13, 2013 3:46:29 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Debug macro switch HMVMX_ALWAYS_SWAP_FPU_STATE.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)

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

@@ -42 +42 @@
 #define HMVMX_ALWAYS_TRAP_ALL_XCPTS
 #define HMVMX_ALWAYS_TRAP_PF
+#define HMVMX_ALWAYS_SWAP_FPU_STATE
 #endif
 
@@ -7534 +7535 @@
     Assert(!(pVCpu->hm.s.fContextUseFlags & HM_CHANGED_HOST_CONTEXT));
 
+#ifdef HMVMX_ALWAYS_SWAP_FPU_STATE
+    if (!CPUMIsGuestFPUStateActive(pVCpu))
+        CPUMR0LoadGuestFPU(pVM, pVCpu, pMixedCtx);
+    pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0;
+#endif
+
     /*
      * Load the state shared between host and guest (FPU, debug).
@@ -7627 +7634 @@
     Assert(!(ASMGetFlags() & X86_EFL_IF));
     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
+
+#ifdef HMVMX_ALWAYS_SWAP_FPU_STATE
+    if (CPUMIsGuestFPUStateActive(pVCpu))
+    {
+        hmR0VmxSaveGuestCR0(pVCpu, pMixedCtx);
+        CPUMR0SaveGuestFPU(pVM, pVCpu, pMixedCtx);
+        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0;
+    }
+#endif
 
     pVCpu->hm.s.vmx.fRestoreHostFlags |= VMX_RESTORE_HOST_REQUIRED;   /* Host state messed up by VT-x, we must restore. */