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

Timestamp:

Apr 26, 2013 3:22:07 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HM: Simplified real/protected mode transition tracking logic.

File:

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

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

@@ -1910 +1910 @@
     }
 
-    for (VMCPUID i = 0; i < pVM->cCpus; i++)
-    {
-        PVMCPU pVCpu = &pVM->aCpus[i];
-
-        /* Current guest paging mode. */
-        pVCpu->hm.s.vmx.enmLastSeenGuestMode = PGMMODE_REAL;
-    }
-
     return VINF_SUCCESS;
 }
@@ -3395 +3387 @@
         {
             Assert(pVM->hm.s.vmx.pRealModeTSS);
-            PGMMODE enmGuestMode = PGMGetGuestMode(pVCpu);
-            if (pVCpu->hm.s.vmx.enmLastSeenGuestMode != enmGuestMode)
+            if (   pVCpu->hm.s.vmx.fWasInRealMode 
+                && PGMGetGuestMode(pVCpu) >= PGMMODE_PROTECTED)
             {
-                AssertCompile(PGMMODE_REAL < PGMMODE_PROTECTED);
-                if (   pVCpu->hm.s.vmx.enmLastSeenGuestMode == PGMMODE_REAL
-                    && enmGuestMode >= PGMMODE_PROTECTED)
-                {
-                    /* Signal that recompiler must flush its code-cache as the guest -may- rewrite code it will later execute
-                       in real-mode (e.g. OpenBSD 4.0) */
-                    REMFlushTBs(pVM);
-                    Log(("Load: Switch to protected mode detected!\n"));
-                }
-                pVCpu->hm.s.vmx.enmLastSeenGuestMode = enmGuestMode;
+                /* Signal that recompiler must flush its code-cache as the guest -may- rewrite code it will later execute
+                   in real-mode (e.g. OpenBSD 4.0) */
+                REMFlushTBs(pVM);
+                Log(("Load: Switch to protected mode detected!\n"));
+                pVCpu->hm.s.vmx.fWasInRealMode = false;
             }
         }