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

Timestamp:

Feb 1, 2010 2:59:45 PM (15 years ago)

Author:

vboxsync

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

57126

Message:

PATM: Check if we expanded a complex guest instruction into a patch stream (e.g. call)

File:

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

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

@@ -5949 +5949 @@
             pCurPatchInstrGC += CpuNew.opsize;
             cbLeft           -= CpuNew.opsize;
+
+            /* Check if we expanded a complex guest instruction into a patch stream (e.g. call) */
+            if (!cbLeft)
+            {
+                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);
+
+                    if (cbFiller >= SIZEOF_NEARJUMP32)
+                    {
+                            pPatchFillHC[0] = 0xE9;
+                            *(uint32_t *)&pPatchFillHC[1] = cbFiller - SIZEOF_NEARJUMP32;
+#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
+                    }
+                    else
+                    {
+                        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
+                        }
+                    }
+                }
+            }
         }
     }