Changeset 20406 in vbox for trunk

Timestamp:

Jun 8, 2009 1:39:32 PM (16 years ago)

Author:

vboxsync

Message:

Removed obsolete REMR3ReplayInvalidatedPages

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/VMM/EM.cpp (modified) (1 diff)
• src/VBox/VMM/VMM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/REMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMInternal.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)
• src/recompiler/VBoxREM.def (modified) (1 diff)
• src/recompiler/VBoxREMWrapper.cpp (modified) (3 diffs)
• src/recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/include/VBox/err.h

@@ -690 +690 @@
 /** Recompiler execution was interrupted by forced action. */
 #define VINF_REM_INTERRUPED_FF              2302
-/** Reason for leaving GC: Must flush pending invlpg operations to REM.
- * Tell REM to flush page invalidations. Will temporary go to REM context
- * from REM and perform the flushes. */
-#define VERR_REM_FLUSHED_PAGES_OVERFLOW     (-2303)
 /** Too many similar traps. This is a very useful debug only
  * check (we don't do double/tripple faults in REM). */

trunk/src/VBox/VMM/EM.cpp

@@ -2505 +2505 @@
 
         /*
-         * REMGCNotifyInvalidatePage() failed because of overflow.
-         */
-        case VERR_REM_FLUSHED_PAGES_OVERFLOW:
-            Assert((pCtx->ss & X86_SEL_RPL) != 1);
-            EMR3RemLock(pVM);
-            REMR3ReplayInvalidatedPages(pVM, pVCpu);
-            EMR3RemUnlock(pVM);
-            rc = VINF_SUCCESS;
-            break;
-
-        /*
          * I/O Port access - emulate the instruction.
          */

trunk/src/VBox/VMM/VMM.cpp

@@ -357 +357 @@
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetPatchGP,             STAMTYPE_COUNTER, "/VMM/RZRet/PatchGP",             STAMUNIT_OCCURENCES, "Number of VINF_PATM_PATCH_TRAP_GP returns.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetPatchIretIRQ,        STAMTYPE_COUNTER, "/VMM/RZRet/PatchIret",           STAMUNIT_OCCURENCES, "Number of VINF_PATM_PENDING_IRQ_AFTER_IRET returns.");
-    STAM_REG(pVM, &pVM->vmm.s.StatRZRetPageOverflow,        STAMTYPE_COUNTER, "/VMM/RZRet/InvlpgOverflow",      STAMUNIT_OCCURENCES, "Number of VERR_REM_FLUSHED_PAGES_OVERFLOW returns.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetRescheduleREM,       STAMTYPE_COUNTER, "/VMM/RZRet/ScheduleREM",         STAMUNIT_OCCURENCES, "Number of VINF_EM_RESCHEDULE_REM returns.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetToR3,                STAMTYPE_COUNTER, "/VMM/RZRet/ToR3",                STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_TO_R3 returns.");

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

@@ -1888 +1888 @@
         ||  rc == VINF_PGM_SYNC_CR3 /* we can rely on the FF */)
         return VINF_SUCCESS;
-    AssertMsgReturn(   rc == VERR_REM_FLUSHED_PAGES_OVERFLOW
-                    || rc == VINF_EM_RAW_EMULATE_INSTR,
+    AssertMsgReturn(rc == VINF_EM_RAW_EMULATE_INSTR,
                     ("%Rrc addr=%RGv\n", rc, pAddrGC),
                     VERR_EM_INTERPRETER);
@@ -1931 +1930 @@
         ||  rc == VINF_PGM_SYNC_CR3 /* we can rely on the FF */)
         return VINF_SUCCESS;
-    AssertMsgReturn(   rc == VERR_REM_FLUSHED_PAGES_OVERFLOW
-                    || rc == VINF_EM_RAW_EMULATE_INSTR,
+    AssertMsgReturn(rc == VINF_EM_RAW_EMULATE_INSTR,
                     ("%Rrc addr=%RGv\n", rc, addr),
                     VERR_EM_INTERPRETER);

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

@@ -41 +41 @@
  *
  * @returns VINF_SUCCESS on success.
- * @returns VERR_REM_FLUSHED_PAGES_OVERFLOW if a return to HC for flushing of
- *          recorded pages is required before the call can succeed.
  * @param   pVM         The VM handle.
  * @param   GCPtrPage   The

trunk/src/VBox/VMM/VMMInternal.h

@@ -297 +297 @@
     STAMCOUNTER                 StatRZRetPatchGP;
     STAMCOUNTER                 StatRZRetPatchIretIRQ;
-    STAMCOUNTER                 StatRZRetPageOverflow;
     STAMCOUNTER                 StatRZRetRescheduleREM;
     STAMCOUNTER                 StatRZRetToR3;

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -2652 +2652 @@
         return VINF_SUCCESS;
     }
-    Assert(rc == VERR_REM_FLUSHED_PAGES_OVERFLOW);
+    AssertRC(rc);
     return rc;
 }

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -433 +433 @@
         case VINF_PATM_PENDING_IRQ_AFTER_IRET:
             STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetPatchIretIRQ);
-            break;
-        case VERR_REM_FLUSHED_PAGES_OVERFLOW:
-            STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetPageOverflow);
             break;
         case VINF_EM_RESCHEDULE_REM:

trunk/src/recompiler/VBoxREM.def

@@ -37 +37 @@
     REMR3A20Set
     REMR3DisasEnableStepping
-    REMR3ReplayInvalidatedPages
     REMR3ReplayHandlerNotifications
     REMR3NotifyPhysRamRegister

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -345 +345 @@
 static DECLCALLBACKPTR(void, pfnREMR3StateUpdate)(PVM, PVMCPU);
 static DECLCALLBACKPTR(void, pfnREMR3A20Set)(PVM, PVMCPU, bool);
-static DECLCALLBACKPTR(void, pfnREMR3ReplayInvalidatedPages)(PVM, PVMCPU);
 static DECLCALLBACKPTR(void, pfnREMR3ReplayHandlerNotifications)(PVM pVM);
 static DECLCALLBACKPTR(void, pfnREMR3NotifyPhysRamRegister)(PVM, RTGCPHYS, RTGCPHYS, unsigned);
@@ -1048 +1047 @@
     { "REMR3StateUpdate",                       (void *)&pfnREMR3StateUpdate,                       &g_aArgsVMandVMCPU[0],                      RT_ELEMENTS(g_aArgsVMandVMCPU),                        REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
     { "REMR3A20Set",                            (void *)&pfnREMR3A20Set,                            &g_aArgsA20Set[0],                          RT_ELEMENTS(g_aArgsA20Set),                            REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
-    { "REMR3ReplayInvalidatedPages",            (void *)&pfnREMR3ReplayInvalidatedPages,            &g_aArgsVMandVMCPU[0],                      RT_ELEMENTS(g_aArgsVMandVMCPU),                        REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
     { "REMR3ReplayHandlerNotifications",        (void *)&pfnREMR3ReplayHandlerNotifications,        &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
     { "REMR3NotifyPhysRamRegister",             (void *)&pfnREMR3NotifyPhysRamRegister,             &g_aArgsNotifyPhysRamRegister[0],           RT_ELEMENTS(g_aArgsNotifyPhysRamRegister),             REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
@@ -2154 +2152 @@
 }
 
-REMR3DECL(void) REMR3ReplayInvalidatedPages(PVM pVM, PVMCPU pVCpu)
-{
-#ifndef USE_REM_STUBS
-    Assert(VALID_PTR(pfnREMR3ReplayInvalidatedPages));
-    pfnREMR3ReplayInvalidatedPages(pVM, pVCpu);
-#endif
-}
-
 REMR3DECL(void) REMR3ReplayHandlerNotifications(PVM pVM)
 {

trunk/src/recompiler/VBoxRecompiler.c

@@ -2682 +2682 @@
 
     pVM->rem.s.fIgnoreAll = fSaved;
-}
-
-
-/**
- * Replays the invalidated recorded pages.
- * Called in response to VERR_REM_FLUSHED_PAGES_OVERFLOW from the RAW execution loop.
- *
- * @param   pVM         VM handle.
- * @param   pVCpu       VMCPU handle.
- */
-REMR3DECL(void) REMR3ReplayInvalidatedPages(PVM pVM, PVMCPU pVCpu)
-{
-    RTUINT i;
-
-    VM_ASSERT_EMT(pVM);
-
-    /*
-     * Sync the required registers.
-     */
-    pVM->rem.s.Env.cr[0] = pVM->rem.s.pCtx->cr0;
-    pVM->rem.s.Env.cr[2] = pVM->rem.s.pCtx->cr2;
-    pVM->rem.s.Env.cr[3] = pVM->rem.s.pCtx->cr3;
-    pVM->rem.s.Env.cr[4] = pVM->rem.s.pCtx->cr4;
-
-    /*
-     * Replay the flushes.
-     */
-    pVM->rem.s.fIgnoreInvlPg = true;
-    for (i = 0; i < pVM->rem.s.cInvalidatedPages; i++)
-    {
-        Log2(("REMR3ReplayInvalidatedPages: invlpg %RGv\n", pVM->rem.s.aGCPtrInvalidatedPages[i]));
-        tlb_flush_page(&pVM->rem.s.Env, pVM->rem.s.aGCPtrInvalidatedPages[i]);
-    }
-    pVM->rem.s.fIgnoreInvlPg = false;
-    pVM->rem.s.cInvalidatedPages = 0;
 }