Changeset 13565 in vbox for trunk/src/recompiler

Timestamp:

Oct 24, 2008 5:48:59 PM (16 years ago)

Author:

vboxsync

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

38439

Message:

#1865: REM (VMM bits) - moved EMFlushREMTBs to REMFlushTBs, deleted dead REMGC.cpp.

Location:

trunk/src/recompiler

Files:

• VBoxREMWrapper.cpp (modified) (5 diffs)
• VBoxRecompiler.c (modified) (4 diffs)

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -337 +337 @@
 static DECLCALLBACKPTR(int, pfnREMR3EmulateInstruction)(PVM);
 static DECLCALLBACKPTR(int, pfnREMR3Run)(PVM);
-static DECLCALLBACKPTR(int, pfnREMR3State)(PVM, bool fFlushTBs);
+static DECLCALLBACKPTR(int, pfnREMR3State)(PVM);
 static DECLCALLBACKPTR(int, pfnREMR3StateBack)(PVM);
 static DECLCALLBACKPTR(void, pfnREMR3StateUpdate)(PVM);
@@ -988 +988 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(size_t), NULL }
 };
-static const REMPARMDESC g_aArgsState[] =
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(bool), NULL }
-};
 
 /** @} */
@@ -1009 +1004 @@
     { "REMR3EmulateInstruction",                (void *)&pfnREMR3EmulateInstruction,                &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),    NULL },
     { "REMR3Run",                               (void *)&pfnREMR3Run,                               &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),    NULL },
-    { "REMR3State",                             (void *)&pfnREMR3State,                             &g_aArgsState[0],                           RT_ELEMENTS(g_aArgsState),                             REMFNDESC_FLAGS_RET_INT,    sizeof(int),    NULL },
+    { "REMR3State",                             (void *)&pfnREMR3State,                             &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),    NULL },
     { "REMR3StateBack",                         (void *)&pfnREMR3StateBack,                         &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),    NULL },
     { "REMR3StateUpdate",                       (void *)&pfnREMR3StateUpdate,                       &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_VOID,   0,              NULL },
@@ -1991 +1986 @@
 }
 
-REMR3DECL(int) REMR3State(PVM pVM, bool fFlushTBs)
+REMR3DECL(int) REMR3State(PVM pVM)
 {
 #ifdef USE_REM_STUBS
@@ -1997 +1992 @@
 #else
     Assert(VALID_PTR(pfnREMR3State));
-    return pfnREMR3State(pVM, fFlushTBs);
+    return pfnREMR3State(pVM);
 #endif
 }

trunk/src/recompiler/VBoxRecompiler.c

@@ -741 +741 @@
      * Sync the state and enable single instruction / single stepping.
      */
-    int rc = REMR3State(pVM, false /* no need to flush the TBs; we always compile. */);
+    int rc = REMR3State(pVM);
     if (VBOX_SUCCESS(rc))
     {
@@ -1632 +1632 @@
  *
  * @param   pVM         VM Handle.
- * @param   fFlushTBs   Flush all translation blocks before executing code
  *
  * @remark  The caller has to check for important FFs before calling REMR3Run. REMR3State will
@@ -1638 +1637 @@
  *          pending that would immediatly interrupt execution.
  */
-REMR3DECL(int)  REMR3State(PVM pVM, bool fFlushTBs)
+REMR3DECL(int)  REMR3State(PVM pVM)
 {
     Log2(("REMR3State:\n"));
@@ -1650 +1649 @@
     pVM->rem.s.fInStateSync = true;
 
-    if (fFlushTBs)
+    /*
+     * If we have to flush TBs, do that immediately.
+     */
+    if (pVM->rem.s.fFlushTBs)
     {
         STAM_COUNTER_INC(&gStatFlushTBs);
         tb_flush(&pVM->rem.s.Env);
+        pVM->rem.s.fFlushTBs = false;
     }