儲存庫 vbox 的更動 12299

時間撮記:

2008-9-9 下午02:31:16 (16 年 以前)

作者:

vboxsync

訊息:

Add option to REMR3State to flush all TBs. (currently not yet active)

位置:

trunk

檔案:

• include/VBox/rem.h (修改) (1 筆差異)
• src/VBox/VMM/EM.cpp (修改) (2 筆差異)
• src/recompiler/VBoxREMWrapper.cpp (修改) (5 筆差異)
• src/recompiler/VBoxRecompiler.c (修改) (8 筆差異)

trunk/include/VBox/rem.h

@@ -68 +68 @@
 REMR3DECL(int)  REMR3BreakpointSet(PVM pVM, RTGCUINTPTR Address);
 REMR3DECL(int)  REMR3BreakpointClear(PVM pVM, RTGCUINTPTR Address);
-REMR3DECL(int)  REMR3State(PVM pVM);
+REMR3DECL(int)  REMR3State(PVM pVM, bool fFlushTBs);
 REMR3DECL(int)  REMR3StateBack(PVM pVM);
 REMR3DECL(void) REMR3StateUpdate(PVM pVM);

trunk/src/VBox/VMM/EM.cpp

@@ -723 +723 @@
      * Switch to REM, step instruction, switch back.
      */
-    int rc = REMR3State(pVM);
+    int rc = REMR3State(pVM, true /* flush the TBs */);
     if (VBOX_SUCCESS(rc))
     {
@@ -781 +781 @@
         {
             STAM_PROFILE_START(&pVM->em.s.StatREMSync, b);
-            rc = REMR3State(pVM);
+            rc = REMR3State(pVM, true /* flush TBs */);
             STAM_PROFILE_STOP(&pVM->em.s.StatREMSync, b);
             if (VBOX_FAILURE(rc))

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -333 +333 @@
 static DECLCALLBACKPTR(int, pfnREMR3EmulateInstruction)(PVM);
 static DECLCALLBACKPTR(int, pfnREMR3Run)(PVM);
-static DECLCALLBACKPTR(int, pfnREMR3State)(PVM);
+static DECLCALLBACKPTR(int, pfnREMR3State)(PVM, bool fFlushTBs);
 static DECLCALLBACKPTR(int, pfnREMR3StateBack)(PVM);
 static DECLCALLBACKPTR(void, pfnREMR3StateUpdate)(PVM);
@@ -963 +963 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(size_t), NULL }
 };
-
+static const REMPARMDESC g_aArgsState[] = 
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(bool), NULL }
+};
 
 /** @} */
@@ -980 +984 @@
     { "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_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 },
     { "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 },
@@ -1956 +1960 @@
 }
 
-REMR3DECL(int) REMR3State(PVM pVM)
+REMR3DECL(int) REMR3State(PVM pVM, bool fFlushTBs)
 {
 #ifdef USE_REM_STUBS
@@ -1962 +1966 @@
 #else
     Assert(VALID_PTR(pfnREMR3State));
-    return pfnREMR3State(pVM);
+    return pfnREMR3State(pVM, fFlushTBs);
 #endif
 }

trunk/src/recompiler/VBoxRecompiler.c

@@ -736 +736 @@
      * Sync the state and enable single instruction / single stepping.
      */
-    int rc = REMR3State(pVM);
+    int rc = REMR3State(pVM, false /* no need to flush the TBs; we always compile. */);
     if (VBOX_SUCCESS(rc))
     {
@@ -1356 +1356 @@
 void remR3ProtectCode(CPUState *env, RTGCPTR GCPtr)
 {
+#ifndef VBOX_REM_FLUSH_ALL_TBS
     Assert(env->pVM->rem.s.fInREM);
     if (     (env->cr[0] & X86_CR0_PG)                      /* paging must be enabled */
@@ -1363 +1364 @@
         &&  !HWACCMIsEnabled(env->pVM))
         CSAMR3MonitorPage(env->pVM, GCPtr, CSAM_TAG_REM);
+#endif
 }
 
@@ -1374 +1376 @@
 {
     Assert(env->pVM->rem.s.fInREM);
+#ifndef VBOX_REM_FLUSH_ALL_TBS
     if (     (env->cr[0] & X86_CR0_PG)                      /* paging must be enabled */
         &&  !(env->state & CPU_EMULATE_SINGLE_INSTR)        /* ignore during single instruction execution */
@@ -1380 +1383 @@
         &&  !HWACCMIsEnabled(env->pVM))
         CSAMR3UnmonitorPage(env->pVM, GCPtr, CSAM_TAG_REM);
+#endif
 }
 
@@ -1587 +1591 @@
  *
  * @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
@@ -1592 +1597 @@
  *          pending that would immediatly interrupt execution.
  */
-REMR3DECL(int) REMR3State(PVM pVM)
+REMR3DECL(int)  REMR3State(PVM pVM, bool fFlushTBs)
 {
     Log2(("REMR3State:\n"));
@@ -1602 +1607 @@
     Assert(!pVM->rem.s.fInREM);
     pVM->rem.s.fInStateSync = true;
+
+#ifdef VBOX_REM_FLUSH_ALL_TBS
+    if (fFlushTBs)
+        tb_flush(&pVM->rem.s.Env);
+#endif
 
     /*