Changeset 45641 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Apr 19, 2013 12:30:57 PM (12 years ago)

Author:

vboxsync

Message:

VMMR0/HMVMXR0: bits.

File:

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

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

@@ -68 +68 @@
  * Updated-guest-state flags.
  */
-#define HMVMX_UPDATED_GUEST_FPU                   RT_BIT(0)
-#define HMVMX_UPDATED_GUEST_RIP                   RT_BIT(1)
-#define HMVMX_UPDATED_GUEST_RSP                   RT_BIT(2)
-#define HMVMX_UPDATED_GUEST_RFLAGS                RT_BIT(3)
-#define HMVMX_UPDATED_GUEST_CR0                   RT_BIT(4)
-#define HMVMX_UPDATED_GUEST_CR3                   RT_BIT(5)
-#define HMVMX_UPDATED_GUEST_CR4                   RT_BIT(6)
-#define HMVMX_UPDATED_GUEST_GDTR                  RT_BIT(7)
-#define HMVMX_UPDATED_GUEST_IDTR                  RT_BIT(8)
-#define HMVMX_UPDATED_GUEST_LDTR                  RT_BIT(9)
-#define HMVMX_UPDATED_GUEST_TR                    RT_BIT(10)
-#define HMVMX_UPDATED_GUEST_SEGMENT_REGS          RT_BIT(11)
-#define HMVMX_UPDATED_GUEST_DEBUG                 RT_BIT(12)
-#define HMVMX_UPDATED_GUEST_FS_BASE_MSR           RT_BIT(13)
-#define HMVMX_UPDATED_GUEST_GS_BASE_MSR           RT_BIT(14)
-#define HMVMX_UPDATED_GUEST_SYSENTER_CS_MSR       RT_BIT(15)
-#define HMVMX_UPDATED_GUEST_SYSENTER_EIP_MSR      RT_BIT(16)
-#define HMVMX_UPDATED_GUEST_SYSENTER_ESP_MSR      RT_BIT(17)
-#define HMVMX_UPDATED_GUEST_AUTO_LOAD_STORE_MSRS  RT_BIT(18)
-#define HMVMX_UPDATED_GUEST_ACTIVITY_STATE        RT_BIT(19)
-#define HMVMX_UPDATED_GUEST_APIC_STATE            RT_BIT(20)
-#define HMVMX_UPDATED_GUEST_ALL                   (  HMVMX_UPDATED_GUEST_FPU                   \
-                                                   | HMVMX_UPDATED_GUEST_RIP                   \
+#define HMVMX_UPDATED_GUEST_RIP                   RT_BIT(0)
+#define HMVMX_UPDATED_GUEST_RSP                   RT_BIT(1)
+#define HMVMX_UPDATED_GUEST_RFLAGS                RT_BIT(2)
+#define HMVMX_UPDATED_GUEST_CR0                   RT_BIT(3)
+#define HMVMX_UPDATED_GUEST_CR3                   RT_BIT(4)
+#define HMVMX_UPDATED_GUEST_CR4                   RT_BIT(5)
+#define HMVMX_UPDATED_GUEST_GDTR                  RT_BIT(6)
+#define HMVMX_UPDATED_GUEST_IDTR                  RT_BIT(7)
+#define HMVMX_UPDATED_GUEST_LDTR                  RT_BIT(8)
+#define HMVMX_UPDATED_GUEST_TR                    RT_BIT(9)
+#define HMVMX_UPDATED_GUEST_SEGMENT_REGS          RT_BIT(10)
+#define HMVMX_UPDATED_GUEST_DEBUG                 RT_BIT(11)
+#define HMVMX_UPDATED_GUEST_FS_BASE_MSR           RT_BIT(12)
+#define HMVMX_UPDATED_GUEST_GS_BASE_MSR           RT_BIT(13)
+#define HMVMX_UPDATED_GUEST_SYSENTER_CS_MSR       RT_BIT(14)
+#define HMVMX_UPDATED_GUEST_SYSENTER_EIP_MSR      RT_BIT(15)
+#define HMVMX_UPDATED_GUEST_SYSENTER_ESP_MSR      RT_BIT(16)
+#define HMVMX_UPDATED_GUEST_AUTO_LOAD_STORE_MSRS  RT_BIT(17)
+#define HMVMX_UPDATED_GUEST_ACTIVITY_STATE        RT_BIT(18)
+#define HMVMX_UPDATED_GUEST_APIC_STATE            RT_BIT(19)
+#define HMVMX_UPDATED_GUEST_ALL                   (  HMVMX_UPDATED_GUEST_RIP                   \
                                                    | HMVMX_UPDATED_GUEST_RSP                   \
                                                    | HMVMX_UPDATED_GUEST_RFLAGS                \
@@ -370 +368 @@
  /* 59  VMX_EXIT_VMFUNC                  */  hmR0VmxExitSetPendingXcptUD
 };
-
 #endif /* HMVMX_USE_FUNCTION_TABLE */
 
@@ -4573 +4570 @@
 /**
  * Determines if an exception is a contributory exception. Contributory
- * exceptions are ones which can cause double-faults.
+ * exceptions are ones which can cause double-faults. Page-fault is
+ * intentionally not included here as it's a conditional contributory exception.
  *
  * @returns true if the exception is contributory, false otherwise.
@@ -4596 +4594 @@
 
 /**
- * Determines if an exception is a benign exception. Benign exceptions
- * are ones which cannot cause double-faults.
- *
- * @returns true if the exception is benign, false otherwise.
- * @param   uVector     The exception vector.
- */
-DECLINLINE(bool) hmR0VmxIsBenignXcpt(const uint32_t uVector)
-{
-    if (   uVector == X86_XCPT_PF
-        || uVector == X86_XCPT_DF)
-    {
-        return false;
-    }
-
-    bool fIsBenignXcpt = !hmR0VmxIsContributoryXcpt(uVector);
-#ifdef VBOX_STRICT
-    switch (uVector)
-    {
-        case X86_XCPT_DB:
-        case X86_XCPT_NMI:
-        case X86_XCPT_BP:
-        case X86_XCPT_OF:
-        case X86_XCPT_BR:
-        case X86_XCPT_UD:
-        case X86_XCPT_NM:
-        case X86_XCPT_CO_SEG_OVERRUN:
-        case X86_XCPT_MF:
-        case X86_XCPT_AC:
-        case X86_XCPT_MC:
-        case X86_XCPT_XF:
-            AssertMsg(fIsBenignXcpt, ("%#x\n", uVector));
-            break;
-        default:
-            AssertMsg(!fIsBenignXcpt, ("%#x\n", uVector));
-            break;
-    }
-#endif
-    return fIsBenignXcpt;
-}
-
-
-/**
  * Sets an event as a pending event to be injected into the guest.
  *
@@ -4726 +4682 @@
             enmReflect = VMXREFLECTXCPT_XCPT;
             if (   hmR0VmxIsContributoryXcpt(uIdtVector)
-                     && uExitVector == X86_XCPT_PF)
+                && uExitVector == X86_XCPT_PF)
             {
                 GCPtrFaultAddress = pMixedCtx->cr2;
@@ -4817 +4773 @@
 {
     int rc = VINF_SUCCESS;
-    if (   !(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_CR0)
-        || !(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_FPU))
+    if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_CR0))
     {
         RTGCUINTREG uVal    = 0;
@@ -4827 +4782 @@
         uVal = (uShadow & pVCpu->hm.s.vmx.cr0_mask) | (uVal & ~pVCpu->hm.s.vmx.cr0_mask);
         CPUMSetGuestCR0(pVCpu, uVal);
-        pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_CR0 | HMVMX_UPDATED_GUEST_FPU;
+        pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_CR0;
     }
     return rc;