Changeset 12835 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 30, 2008 2:54:51 PM (16 years ago)

Author:

vboxsync

Message:

Solved some overwritten patch instruction issues. (triggered assertions)

File:

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

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

@@ -5848 +5848 @@
         if (!pRec || !pRec->fDirty)
             break;  /* no more dirty instructions */
+
+        /* In case of complex instructions the next guest instruction could be quite far off. */
+        pCurPatchInstrGC = pRec->Core.Key + pVM->patm.s.pPatchMemGC;
     }
 
@@ -6075 +6078 @@
                 }
             }
+        }
+        else
+        if (pPatch->patch.pPrivInstrGC == pNewEip)
+        {
+            /* Invalidated patch or first instruction overwritten.
+             * We can ignore the fPIF state in this case. 
+             */
+            /* Reset the PATM stack. */
+            CTXSUFF(pVM->patm.s.pGCState)->Psp = PATM_STACK_SIZE;
+
+            Log(("Call to invalidated patch -> go back to the original instruction\n"));
+
+            pVM->patm.s.pGCStateHC->fPIF = 1;
+            
+            /* continue at the original instruction */
+            *ppNewEip = pNewEip - SELMToFlat(pVM, DIS_SELREG_CS, CPUMCTX2CORE(pCtx), 0);
+            STAM_PROFILE_ADV_STOP(&pVM->patm.s.StatHandleTrap, a);
+            return VINF_SUCCESS;
         }