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

Timestamp:

Mar 29, 2007 11:47:32 AM (18 years ago)

Author:

vboxsync

Message:

Proper interrupt redirection bitmap sync

Location:

trunk/src/VBox/VMM/PATM

Files:

• PATM.cpp (modified) (1 diff)
• PATMA.asm (modified) (1 diff)
• VMMGC/PATMGC.cpp (modified) (3 diffs)

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

@@ -4480 +4480 @@
             /* Increase by instruction size. */
             uint32_t size = patmGetInstrSize(pVM, pPatch, pPatchPage->pHighestAddrGC);
-            Assert(size);
+////            Assert(size);
             pPatchPage->pHighestAddrGC += size;
         }

trunk/src/VBox/VMM/PATM/PATMA.asm

@@ -41 +41 @@
 ; Noisy, but useful for debugging certain problems
 ;;;%define PATM_LOG_PATCHINSTR
-;;%define PATM_LOG_PATCHIRET
+%define PATM_LOG_PATCHIRET
 %endif
 

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

@@ -107 +107 @@
 #ifdef LOG_ENABLED
     if (pPatchPage)
-        Log(("PATMIsWriteToPatchPage: Found page %VGv for write to %VGv %d bytes\n", pPatchPage->Core.Key, GCPtr, cbWrite));
+        Log2(("PATMIsWriteToPatchPage: Found page %VGv for write to %VGv %d bytes\n", pPatchPage->Core.Key, GCPtr, cbWrite));
 #endif
 
@@ -296 +296 @@
                     /* We are no longer executing PATM code; set PIF again. */
                     pVM->patm.s.CTXSUFF(pGCState)->fPIF = 1;
+
+#ifndef VBOX_RAW_V86
+                    return VINF_EM_RESCHEDULE;
+#else
                     CPUMGCCallV86Code(pRegFrame);
+#endif
                     /* does not return */
                 }
@@ -407 +412 @@
                                 Log(("PATMGC: GATE->VM stack frame: DS=%04X ES=%04X FS=%04X GS=%04X\n", selDS, selES, selFS, selGS));
                             }
+if (eip == 0x690) 
+{
+   pRegFrame->eip += PATM_ILLEGAL_INSTR_SIZE;
+   return VINF_EM_RESCHEDULE;
+}
                         }
                         else