Changeset 60911 in vbox for trunk

Timestamp:

May 9, 2016 9:21:47 PM (9 years ago)

Author:

vboxsync

Message:

IEMR3ProcessForceFlag: Must set fAccess to IEM_ACCESS_INVALID...

File:

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

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -12055 +12055 @@
      * Commit the pending bounce buffers (usually just one).
      */
-# ifdef VBOX_STRICT
     unsigned cBufs = 0;
-# endif
     unsigned iMemMap = RT_ELEMENTS(pIemCpu->aMemMappings);
     while (iMemMap-- > 0)
+    {
         if (pIemCpu->aMemMappings[iMemMap].fAccess & (IEM_ACCESS_PENDING_R3_WRITE_1ST | IEM_ACCESS_PENDING_R3_WRITE_2ND))
         {
@@ -12095 +12094 @@
                      VBOXSTRICTRC_VAL(rcStrictCommit2), VBOXSTRICTRC_VAL(rcStrict)));
             }
-# ifdef VBOX_STRICT
             cBufs++;
-# endif
         }
-
-    AssertMsg(cBufs > 0, ("%#x %#x %#x\n", pIemCpu->aMemMappings[0].fAccess, pIemCpu->aMemMappings[1].fAccess,
-                          pIemCpu->aMemMappings[2].fAccess));
+        else
+            AssertMsg(pIemCpu->aMemMappings[iMemMap].fAccess == IEM_ACCESS_INVALID,
+                      ("iMemMap=%u: %#x\n", iMemMap, pIemCpu->aMemMappings[iMemMap].fAccess));
+        pIemCpu->aMemMappings[iMemMap].fAccess = IEM_ACCESS_INVALID;
+    }
+
+    AssertMsg(cBufs > 0 && cBufs == pIemCpu->cActiveMappings,
+              ("cBufs=%u cActiveMappings=%u - %#x %#x %#x\n", cBufs, pIemCpu->cActiveMappings,
+               pIemCpu->aMemMappings[0].fAccess, pIemCpu->aMemMappings[1].fAccess, pIemCpu->aMemMappings[2].fAccess));
+    pIemCpu->cActiveMappings = 0;
     return rcStrict;
 }