Changeset 12305 in vbox

Timestamp:

Sep 9, 2008 3:50:15 PM (17 years ago)

Author:

vboxsync

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

36314

Message:

Flush the recompiler's TB cache each time we detect writes to PATM/CSAM monitored pages.

Location:

trunk

Files:

• include/VBox/em.h (modified) (1 diff)
• src/VBox/VMM/EM.cpp (modified) (2 diffs)
• src/VBox/VMM/EMInternal.h (modified) (1 diff)
• src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)

trunk/include/VBox/em.h

@@ -324 +324 @@
 EMDECL(int) EMInterpretPortIO(PVM pVM, PCPUMCTXCORE pCtxCore, PDISCPUSTATE pCpu, uint32_t cbOp);
 
+/**
+ * Flushes the REM translation blocks the next time we execute code there.
+ *
+ * @param   pVM         The VM handle.
+ */
+EMDECL(void) EMFlushREMTBs(PVM pVM);
+
 EMDECL(uint32_t) EMEmulateCmp(uint32_t u32Param1, uint64_t u64Param2, size_t cb);
 EMDECL(uint32_t) EMEmulateAnd(void *pvParam1, uint64_t u64Param2, size_t cb);

trunk/src/VBox/VMM/EM.cpp

@@ -723 +723 @@
      * Switch to REM, step instruction, switch back.
      */
-    int rc = REMR3State(pVM, true /* flush the TBs */);
+    int rc = REMR3State(pVM, pVM->em.s.fREMFlushTBs);
     if (VBOX_SUCCESS(rc))
     {
         rc = REMR3Step(pVM);
         REMR3StateBack(pVM);
+        pVM->em.s.fREMFlushTBs = false;
     }
     LogFlow(("emR3RemStep: returns %Vrc cs:eip=%04x:%08x\n", rc, CPUMGetGuestCS(pVM),  CPUMGetGuestEIP(pVM)));
@@ -781 +782 @@
         {
             STAM_PROFILE_START(&pVM->em.s.StatREMSync, b);
-            rc = REMR3State(pVM, true /* flush TBs */);
+            rc = REMR3State(pVM, pVM->em.s.fREMFlushTBs);
             STAM_PROFILE_STOP(&pVM->em.s.StatREMSync, b);
             if (VBOX_FAILURE(rc))
                 break;
             fInREMState = true;
+            pVM->em.s.fREMFlushTBs = false;
 
             /*

trunk/src/VBox/VMM/EMInternal.h

@@ -277 +277 @@
 #endif
 
-    uint8_t                 u8Padding[GC_ARCH_BITS == 64 ? 6 : 2];
+    /* Set when the translation blocks in the recompiler cache need to be flushed. */
+    bool                    fREMFlushTBs;
+
+    uint8_t                 u8Padding[GC_ARCH_BITS == 64 ? 5 : 1];
 
     /** Inhibit interrupts for this instruction. Valid only when VM_FF_INHIBIT_INTERRUPTS is set. */

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

@@ -71 +71 @@
     Assert(pVM->csam.s.cDirtyPages < CSAM_MAX_DIRTY_PAGES);
 
+    /* Flush the recompilers translation block cache as the guest seems to be modifying instructions. */
+    EMFlushREMTBs(pVM);
+
     pPATMGCState = PATMQueryGCState(pVM);
     Assert(pPATMGCState);

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -69 +69 @@
 }
 
+/**
+ * Flushes the REM translation blocks the next time we execute code there.
+ *
+ * @param   pVM         The VM handle.
+ */
+EMDECL(void) EMFlushREMTBs(PVM pVM)
+{
+    pVM->em.s.fREMFlushTBs = true;
+}
 
 #ifndef IN_GC