Changeset 8914 in vbox for trunk/src/VBox/VMM

Timestamp:

May 19, 2008 12:05:35 PM (17 years ago)

Author:

vboxsync

Message:

Moved cpu id check around for tlb flushing.

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (5 diffs)

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

@@ -789 +789 @@
     STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatInGC, x);
 
+    if (!pVM->hwaccm.s.svm.fResumeVM)
+    {
+        if (pVM->hwaccm.s.svm.idLastCpu != pCpu->idCpu)
+        {
+            /* Force a TLB flush on VM entry. */
+            pVM->hwaccm.s.svm.fForceTLBFlush = true;
+        }
+        pVM->hwaccm.s.svm.idLastCpu = pCpu->idCpu;
+    }
+
     /* Make sure we flush the TLB when required. */
     if (    pVM->hwaccm.s.svm.fForceTLBFlush
@@ -802 +812 @@
     }
     else
-    {
         pVMCB->ctrl.TLBCtrl.n.u1TLBFlush = pVM->hwaccm.s.svm.fForceTLBFlush;
-    }
 
     AssertMsg(pCpu->uCurrentASID >= 1 && pCpu->uCurrentASID < pVM->hwaccm.s.svm.u32MaxASID, ("cpu%d uCurrentASID = %x\n", pCpu->idCpu, pCpu->uCurrentASID));
@@ -1141 +1149 @@
 #ifdef VBOX_STRICT
             if (rc != VINF_EM_RAW_EMULATE_INSTR)
-                Log(("PGMTrap0eHandler failed with %d\n", rc));
+                LogFlow(("PGMTrap0eHandler failed with %d\n", rc));
 #endif
             /* Need to go back to the recompiler to emulate the instruction. */
@@ -1207 +1215 @@
                 break;
             }
-            Log(("Trap %x at %VGv\n", vector, pCtx->eip));
+            Log(("Trap %x at %VGv esi=%x\n", vector, pCtx->eip, pCtx->esi));
             SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
 
@@ -1651 +1659 @@
 
     LogFlow(("SVMR0Enter cpu%d last=%d asid=%d\n", pCpu->idCpu, pVM->hwaccm.s.svm.idLastCpu, pCpu->uCurrentASID));
-    if (pVM->hwaccm.s.svm.idLastCpu != pCpu->idCpu)
-    {
-        /* Force a TLB flush on VM entry. */
-        pVM->hwaccm.s.svm.fForceTLBFlush = true;
-    }
-    pVM->hwaccm.s.svm.idLastCpu = pCpu->idCpu;
-
     pVM->hwaccm.s.svm.fResumeVM = false;