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

Timestamp:

Feb 1, 2010 3:06:46 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57127

Message:

PATM: Correction

File:

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

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

@@ -5953 +5953 @@
             if (!cbLeft)
             {
-                pRec = (PRECPATCHTOGUEST)RTAvlU32GetBestFit(&pPatch->patch.Patch2GuestAddrTree, pCurPatchInstrGC - pVM->patm.s.pPatchMemGC, true);
-                if (pRec)
+                /* If the next patch instruction doesn't correspond to the next guest instruction, then we have some extra room to fill. */
+                if (RTAvlU32Get(&pPatch->patch.Patch2GuestAddrTree, pCurPatchInstrGC - pVM->patm.s.pPatchMemGC) == NULL)
                 {
-                    unsigned cbFiller  = pRec->Core.Key + pVM->patm.s.pPatchMemGC - pCurPatchInstrGC;
-                    uint8_t *pPatchFillHC = patmPatchGCPtr2PatchHCPtr(pVM, pCurPatchInstrGC);
-
-                    Assert(!pRec->fDirty);
-
-                    if (cbFiller >= SIZEOF_NEARJUMP32)
+                    pRec = (PRECPATCHTOGUEST)RTAvlU32GetBestFit(&pPatch->patch.Patch2GuestAddrTree, pCurPatchInstrGC - pVM->patm.s.pPatchMemGC, true);
+                    if (pRec)
                     {
+                        unsigned cbFiller  = pRec->Core.Key + pVM->patm.s.pPatchMemGC - pCurPatchInstrGC;
+                        uint8_t *pPatchFillHC = patmPatchGCPtr2PatchHCPtr(pVM, pCurPatchInstrGC);
+
+                        Assert(!pRec->fDirty);
+
+                        Log(("Room left in patched instruction stream (%d bytes)\n", cbFiller));
+                        if (cbFiller >= SIZEOF_NEARJUMP32)
+                        {
                             pPatchFillHC[0] = 0xE9;
-                            *(uint32_t *)&pPatchFillHC[1] = cbFiller - SIZEOF_NEARJUMP32;
+                             *(uint32_t *)&pPatchFillHC[1] = cbFiller - SIZEOF_NEARJUMP32;
 #ifdef DEBUG
                             char szBuf[256];
@@ -5971 +5975 @@
                             Log(("FILL:  %s\n", szBuf));
 #endif
-                    }
-                    else
-                    {
-                        for (unsigned i = 0; i < cbFiller; i++)
+                        }
+                        else
                         {
-                            pPatchFillHC[i] = 0x90; /* NOP */
+                            for (unsigned i = 0; i < cbFiller; i++)
+                            {
+                                pPatchFillHC[i] = 0x90; /* NOP */
 #ifdef DEBUG
-                            char szBuf[256];
-                            szBuf[0] = '\0';
-                            DBGFR3DisasInstrEx(pVM, pVCpu->idCpu, pCtx->cs, pCurPatchInstrGC, 0, szBuf, sizeof(szBuf), NULL);
-                            Log(("FILL:  %s\n", szBuf));
-#endif
+                                char szBuf[256];
+                                szBuf[0] = '\0';
+                                DBGFR3DisasInstrEx(pVM, pVCpu->idCpu, pCtx->cs, pCurPatchInstrGC, 0, szBuf, sizeof(szBuf), NULL);
+                                Log(("FILL:  %s\n", szBuf));
+#endif
+                            }
                         }
                     }