Changeset 23244 in vbox

Timestamp:

Sep 23, 2009 8:11:50 AM (15 years ago)

Author:

vboxsync

Message:

Fixed tpr patch restore

File:

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

trunk/src/VBox/VMM/HWACCM.cpp

@@ -2501 +2501 @@
         AssertRCReturn(rc, rc);
 
-        if (pVM->hwaccm.s.svm.cPatches)
-            pVM->hwaccm.s.svm.fTPRPatchingActive = true;
-
         for (unsigned i = 0; i < pVM->hwaccm.s.svm.cPatches; i++)
         {
@@ -2525 +2522 @@
             rc = SSMR3GetU32(pSSM, (uint32_t *)&pPatch->enmType);
             AssertRCReturn(rc, rc);
+
+            if (pPatch->enmType == HWACCMTPRINSTR_JUMP_REPLACEMENT)
+                pVM->hwaccm.s.svm.fTPRPatchingActive = true;
+
+            Assert(pPatch->enmType == HWACCMTPRINSTR_JUMP_REPLACEMENT || pVM->hwaccm.s.svm.fTPRPatchingActive == false);
 
             rc = SSMR3GetU32(pSSM, &pPatch->uSrcOperand);