Changeset 5612 in vbox for trunk/src/VBox/VMM/PATM

Timestamp:

Nov 2, 2007 11:59:34 AM (17 years ago)

Author:

vboxsync

Message:

Bit more checking to ensure we don't invalidate instructions that are not affected by the write

File:

• trunk/src/VBox/VMM/PATM/PATM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PATM/PATM.cpp

@@ -4727 +4727 @@
 
                         /* Find the closest instruction from below; the above quick check ensured that we are indeed in patched code */
-                        pPatchInstrGC = patmGuestGCPtrToClosestPatchGCPtr(pVM, pPatch, pGuestPtrGC);
-                        Assert(pPatchInstrGC);
+                        pPatchInstrGC = patmGuestGCPtrToPatchGCPtr(pVM, pPatch, pGuestPtrGC);
+                        if (!pPatchInstrGC)
+                        {
+                            RTGCPTR  pClosestInstrGC;
+                            uint32_t size;
+
+                            pPatchInstrGC   = patmGuestGCPtrToClosestPatchGCPtr(pVM, pPatch, pGuestPtrGC);
+                            if (pPatchInstrGC)
+                            {
+                                pClosestInstrGC = patmPatchGCPtr2GuestGCPtr(pVM, pPatch, pPatchInstrGC);
+                                Assert(pClosestInstrGC <= pGuestPtrGC);
+                                size            = patmGetInstrSize(pVM, pPatch, pClosestInstrGC);
+                                /* Check if this is not a write into a gap between two patches */
+                                if (pClosestInstrGC + size - 1 < pGuestPtrGC)
+                                    pPatchInstrGC = 0;
+                            }
+                        }
                         if (pPatchInstrGC)
                         {