Changeset 48476 in vbox

Timestamp:

Sep 13, 2013 2:39:50 PM (12 years ago)

Author:

vboxsync

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

88937

Message:

VMM/HMVMXR0: Fix assertions and stale comments.

File:

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

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

@@ -141 +141 @@
  *
  * We need to intercept all exceptions manually (except #PF). #NM is also
- * handled separately, see hmR0VmxLoadGuestControlRegs(). #PF need not be
- * intercepted even in real-mode if we have Nested Paging support.
+ * handled separately, see hmR0VmxLoadSharedCR0(). #PF need not be intercepted
+ * even in real-mode if we have Nested Paging support.
  */
 #define HMVMX_REAL_MODE_XCPT_MASK    (  RT_BIT(X86_XCPT_DE)             | RT_BIT(X86_XCPT_DB)    | RT_BIT(X86_XCPT_NMI)   \
@@ -1925 +1925 @@
     /* All fields are zero-initialized during allocation; but don't remove the commented block below. */
 #if 0
-    /* All CR3 accesses cause VM-exits. Later we optimize CR3 accesses (see hmR0VmxLoadGuestControlRegs())*/
+    /* All CR3 accesses cause VM-exits. Later we optimize CR3 accesses (see hmR0VmxLoadGuestCR3AndCR4())*/
     rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_CR3_TARGET_COUNT, 0);           AssertRCReturn(rc, rc);
     rc = VMXWriteVmcs64(VMX_VMCS64_CTRL_TSC_OFFSET_FULL, 0);            AssertRCReturn(rc, rc);
@@ -10324 +10324 @@
     HMVMX_VALIDATE_EXIT_XCPT_HANDLER_PARAMS();
 
-#ifndef HMVMX_ALWAYS_TRAP_ALL_XCPTS
-    Assert(!CPUMIsGuestFPUStateActive(pVCpu));
-#endif
-
     /* We require CR0 and EFER. EFER is always up-to-date. */
     int rc = hmR0VmxSaveGuestCR0(pVCpu, pMixedCtx);
@@ -10334 +10330 @@
     /* We're playing with the host CPU state here, have to disable preemption. */
     HM_DISABLE_PREEMPT_IF_NEEDED();
+
+#ifndef HMVMX_ALWAYS_TRAP_ALL_XCPTS
+    if (!pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
+        Assert(!CPUMIsGuestFPUStateActive(pVCpu));
+#endif
 
     /* Lazy FPU loading; load the guest-FPU state transparently and continue execution of the guest. */