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

Timestamp:

Apr 3, 2007 11:14:29 AM (18 years ago)

Author:

vboxsync

Message:

Got rid of annoying assertions.

Location:

trunk/src/VBox/VMM/PATM

Files:

• PATM.cpp (modified) (2 diffs)
• PATMInternal.h (modified) (1 diff)

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

@@ -541 +541 @@
             return VINF_SUCCESS;
 #ifdef VBOX_STRICT
-        if (!(pDisInfo->pPatchInfo->flags & (PATMFL_DUPLICATE_FUNCTION|PATMFL_IDTHANDLER)))
+        if (    !(pDisInfo->pPatchInfo->flags & (PATMFL_DUPLICATE_FUNCTION|PATMFL_IDTHANDLER))
+            &&  !(pDisInfo->fReadFlags & PATMREAD_NOCHECK))
         {
             Assert(PATMR3IsInsidePatchJump(pDisInfo->pVM, pSrc, NULL) == false);
@@ -4367 +4368 @@
 
         cpu.mode = (pPatch->flags & PATMFL_CODE32) ? CPUMODE_32BIT : CPUMODE_16BIT;
-        disret = PATMR3DISInstr(pVM, pPatch, &cpu, pInstrGC, pInstrHC, &opsize, NULL);
+        disret = PATMR3DISInstr(pVM, pPatch, &cpu, pInstrGC, pInstrHC, &opsize, NULL, PATMREAD_ORGCODE | PATMREAD_NOCHECK);
         if (disret)
             return opsize;

trunk/src/VBox/VMM/PATM/PATMInternal.h

@@ -671 +671 @@
 #define PATMREAD_RAWCODE        1  /* read code as-is */
 #define PATMREAD_ORGCODE        2  /* read original guest opcode bytes; not the patched bytes */
+#define PATMREAD_NOCHECK        4  /* don't check for patch conflicts */
 
 /*