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

Timestamp:

Apr 4, 2013 8:24:29 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: HM bits, remove unused flags.

File:

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

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

@@ -2591 +2591 @@
      * Guest FPU.
      */
-    if (   (pVCpu->hm.s.fContextUseFlags & HM_CHANGED_GUEST_CR0)
-        || (pVCpu->hm.s.fContextUseFlags & HM_CHANGED_GUEST_FPU))
+    if (pVCpu->hm.s.fContextUseFlags & HM_CHANGED_GUEST_CR0)
     {
         uint64_t u64GuestCR0 = pCtx->cr0;
@@ -2734 +2733 @@
         AssertRCReturn(rc, rc);
 
-        pVCpu->hm.s.fContextUseFlags &= ~(HM_CHANGED_GUEST_CR0 | HM_CHANGED_GUEST_FPU);
+        pVCpu->hm.s.fContextUseFlags &= ~HM_CHANGED_GUEST_CR0;
     }
 
     /*
      * Guest CR2.
-     * It's always loaded late in the assembler code. Nothing to do here.
+     * It's always loaded in the assembler code. Nothing to do here.
      */
-    pVCpu->hm.s.fContextUseFlags &= ~HM_CHANGED_GUEST_CR2;
 
     /*
@@ -6221 +6219 @@
     LogFlowFunc(("pVM=%p pVCpu=%p\n", pVM, pVCpu));
 
-    /* For longjmp reentrants we need not load the guest state all over again. */
+    /* For longjmp reentrants we need not load the guest state again. */
     if (!pVCpu->hm.s.fContextUseFlags)
         return VINF_SUCCESS;
-
+    
     /* Determine real-on-v86 mode. */
     pVCpu->hm.s.vmx.RealMode.fRealOnV86Active = false;
@@ -6232 +6230 @@
         pVCpu->hm.s.vmx.RealMode.fRealOnV86Active = true;
     }
+
+    Log(("LoadGuest flags=%#RX32\n", pVCpu->hm.s.fContextUseFlags));
 
     int rc = hmR0VmxLoadGuestEntryCtls(pVM, pVCpu, pCtx);
@@ -7522 +7522 @@
                 case 2: /* CR2 */
                     Log(("CR2 write rc=%d\n", rc));
-                    pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR2;
                     break;
                 case 3: /* CR3 */
@@ -8183 +8182 @@
         Assert(CPUMIsGuestFPUStateActive(pVCpu));
 
-        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_FPU;
+        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0;
         STAM_COUNTER_INC(&pVCpu->hm.s.StatExitShadowNM);
         return VINF_SUCCESS;
@@ -8477 +8476 @@
         {
             pMixedCtx->cr2 = pVmxTransient->uExitQualification;
-            pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR2;
             rc = hmR0VmxInjectEventVmcs(pVM, pVCpu, pMixedCtx,
                                         VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntrInfo),
@@ -8561 +8559 @@
             TRPMResetTrap(pVCpu);
             pMixedCtx->cr2 = pVmxTransient->uExitQualification;
-            pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR2;
             rc = hmR0VmxInjectEventVmcs(pVM, pVCpu, pMixedCtx,
                                         VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntrInfo),