Changeset 13565

Timestamp:

10/24/08 19:48:59 (3 months ago)

Author:

vboxsync

Message:

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

Files:

• trunk/include/VBox/em.h (modified) (1 diff)
• trunk/include/VBox/rem.h (modified) (2 diffs)
• trunk/src/VBox/VMM/EM.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/EMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/HWACCM.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/REMInternal.h (modified) (5 diffs)
• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/VMMAll/REMAll.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMGC/REMGC.cpp (deleted)
• trunk/src/recompiler/VBoxREMWrapper.cpp (modified) (5 diffs)
• trunk/src/recompiler/VBoxRecompiler.c (modified) (4 diffs)

trunk/include/VBox/em.h

@@ -137 +137 @@
-VMMDECL(int)        EMInterpretRdmsr(PVM pVM, PCPUMCTXCORE pRegFrame);
-VMMDECL(int)        EMInterpretWrmsr(PVM pVM, PCPUMCTXCORE pRegFrame);
-VMMDECL(void)       EMFlushREMTBs(PVM pVM);
-
-/** @name Assembly routines

trunk/include/VBox/rem.h

@@ -53 +53 @@
-VMMDECL(void) REMNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM);
-#endif /* IN_RING0 || IN_GC */
+VMMDECL(void) REMFlushTBs(PVM pVM);
-
-
@@ -68 +69 @@
-REMR3DECL(int)  REMR3BreakpointSet(PVM pVM, RTGCUINTPTR Address);
-REMR3DECL(int)  REMR3BreakpointClear(PVM pVM, RTGCUINTPTR Address);
-, bool fFlushTBs
+
-REMR3DECL(int)  REMR3StateBack(PVM pVM);
-REMR3DECL(void) REMR3StateUpdate(PVM pVM);

trunk/src/VBox/VMM/EM.cpp

@@ -748 +748 @@
-     * Switch to REM, step instruction, switch back.
-     */
-, 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)));
@@ -808 +807 @@
-        {
-            STAM_PROFILE_START(&pVM->em.s.StatREMSync, b);
-, 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

@@ -294 +294 @@
-#endif
-
-
-
-
-
+
-
-    /** Inhibit interrupts for this instruction. Valid only when VM_FF_INHIBIT_INTERRUPTS is set. */

trunk/src/VBox/VMM/HWACCM.cpp

@@ -31 +31 @@
-#include <VBox/trpm.h>
-#include <VBox/dbgf.h>
+#include <VBox/patm.h>
+#include <VBox/csam.h>
+#include <VBox/selm.h>
+#include <VBox/rem.h>
-#include <VBox/hwacc_vmx.h>
-#include <VBox/hwacc_svm.h>
@@ -37 +41 @@
-#include <VBox/err.h>
-#include <VBox/param.h>
-#include <VBox/patm.h>
-#include <VBox/csam.h>
-#include <VBox/selm.h>
-
-#include <iprt/assert.h>
@@ -604 +605 @@
-            *((unsigned char *)pVM->hwaccm.s.vmx.pRealModeTSS + HWACCM_VTX_TSS_SIZE - 2) = 0xff;
-
- 
+
-             * real and protected mode without paging with EPT.
-             */
@@ -616 +617 @@
-            /* We convert it here every time as pci regions could be reconfigured. */
-            rc = PDMVMMDevHeapR3ToGCPhys(pVM, pVM->hwaccm.s.vmx.pRealModeTSS, &GCPhys);
-            
+
-            LogRel(("HWACCM: Real Mode TSS guest physaddr  = %VGp\n", GCPhys));
-
-            rc = PDMVMMDevHeapR3ToGCPhys(pVM, pVM->hwaccm.s.vmx.pNonPagingModeEPTPageTable, &GCPhys);
-            
+
-            LogRel(("HWACCM: Non-Paging Mode EPT CR3       = %VGp\n", GCPhys));
-
@@ -883 +884 @@
-    if (CPUMIsGuestInRealModeEx(pCtx))
-    {
- 
+
-         * The base must also be equal to (sel << 4).
-         */
@@ -914 +915 @@
-                 * changed (Fedora4 boot image, reset, boot iso)
-                 */
-EMFlushREM
+REMFlush
-                return false;
-            }

trunk/src/VBox/VMM/Makefile.kmk

@@ -110 +110 @@
-        VMMAll/PGMAllPhys.cpp \
-        VMMAll/PGMAllPool.cpp \
+        VMMAll/REMAll.cpp \
-        VMMAll/SELMAll.cpp \
-        VMMAll/EMAll.cpp \

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

@@ -33 +33 @@
-#include <VBox/sup.h>
-#include <VBox/mm.h>
+#include <VBox/rem.h>
-#include <VBox/param.h>
-#include <iprt/avl.h>
@@ -72 +73 @@
-
-    /* Flush the recompilers translation block cache as the guest seems to be modifying instructions. */
-EMFlushREM
+REMFlush
-
-    pPATMGCState = PATMQueryGCState(pVM);

trunk/src/VBox/VMM/REMInternal.h

@@ -166 +166 @@
-    bool                    fInStateSync;
-
+    /** Set when the translation blocks cache need to be flushed. */
+    bool                    fFlushTBs;
+
-    /** Ignore all that can be ignored. */
-    bool                    fIgnoreAll;
@@ -245 +248 @@
-#ifdef VBOX_WITH_NEW_RECOMPILER
-#if GC_ARCH_BITS == 32
-
+ 
-#else
-
-
+
+
+
+
+
-#else
-
-
-
-
-
-
+
+
+
-
-    /** Recompiler CPU state. */
@@ -265 +268 @@
-        char                achPadding[REM_ENV_SIZE];
-    }                       Env;
-
+ /* !REM_INCLUDE_CPU_H */
-} REM;
-
@@ -289 +292 @@
-void    remR3CpuId(CPUState *env, unsigned uOperator, void *pvEAX, void *pvEBX, void *pvECX, void *pvEDX);
-void    remR3RecordCall(CPUState *env);
-
+ /* REM_INCLUDE_CPU_H */
-void    remR3TrapClear(PVM pVM);
-void    remR3RaiseRC(PVM pVM, int rc);
@@ -304 +307 @@
-#ifdef VBOX_WITH_STATISTICS
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-void remR3ProfileStart(int statcode);
-void remR3ProfileStop(int statcode);
-
-
-
-
+
+
+
+
+
-
-/** @} */

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

@@ -83 +83 @@
-{
-    return pVM->em.s.enmState;
-}
-
-
-/**
- * Flushes the REM translation blocks the next time we execute code there.
- *
- * @param   pVM         The VM handle.
- *
- * @todo    This doesn't belong here, it should go in REMAll.cpp!
- */
-VMMDECL(void) EMFlushREMTBs(PVM pVM)
-{
-    LogFlow(("EMFlushREMTBs\n"));
-    pVM->em.s.fREMFlushTBs = true;
-}
-

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

@@ -20 +20 @@
- */
-
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
-/** @def PGM_IGNORE_RAM_FLAGS_RESERVED
- * Don't respect the MM_RAM_FLAGS_RESERVED flag when converting to HC addresses.
@@ -263 +266 @@
-    AssertFatalFailed();
-}
-
-
-
@@ -1126 +1128 @@
-    pCache->Entry[iCacheIndex].pbR3   = pbR3;
-}
-
+ /* IN_RING3 */
-
-/**
@@ -1216 +1218 @@
-                        void *pvSrc = PGMRAMRANGE_GETHCPTR(pRam, off)
-
-* @note
+ Note!
-                        rc = pNode->pfnHandlerR3(pVM, GCPhys, pvSrc, pvBuf, cb, PGMACCESSTYPE_READ, pNode->pvUserR3);
-                    }
@@ -1264 +1266 @@
-                        void *pvSrc = PGMRAMRANGE_GETHCPTR(pRam, off)
-
-:
+!
-                        rc = pNode->pfnHandlerR3(pVM, (RTGCPTR)GCPtr, pvSrc, pvBuf, cb, PGMACCESSTYPE_READ, 0);
-                    }
@@ -1385 +1387 @@
-    return;
-}
+
-
-/**

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

@@ -34 +34 @@
-#include <iprt/assert.h>
-
+
+#ifndef IN_RING3
-
-/**
@@ -157 +159 @@
-}
-
+#endif /* !IN_RING3 */
+
+/**
+ * Make REM flush all translation block upon the next call to REMR3State().
+ *
+ * @param   pVM             Pointer to the shared VM structure.
+ */
+VMMDECL(void) REMFlushTBs(PVM pVM)
+{
+    LogFlow(("REMFlushTBs: fFlushTBs=%RTbool fInREM=%RTbool fInStateSync=%RTbool\n",
+             pVM->rem.s.fFlushTBs, pVM->rem.s.fInREM, pVM->rem.s.fInStateSync));
+    pVM->rem.s.fFlushTBs = true;
+}
+

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -337 +337 @@
-static DECLCALLBACKPTR(int, pfnREMR3EmulateInstruction)(PVM);
-static DECLCALLBACKPTR(int, pfnREMR3Run)(PVM);
-, bool fFlushTBs
+
-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 },
-State[0],                           RT_ELEMENTS(g_aArgsState),
+VM[0],                              RT_ELEMENTS(g_aArgsVM),   
-    { "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 @@
-}
-
-, bool fFlushTBs
+
-{
-#ifdef USE_REM_STUBS
@@ -1997 +1992 @@
-#else
-    Assert(VALID_PTR(pfnREMR3State));
-, fFlushTBs
+
-#endif
-}

trunk/src/recompiler/VBoxRecompiler.c

@@ -741 +741 @@
-     * Sync the state and enable single instruction / single stepping.
-     */
-, false /* no need to flush the TBs; we always compile. */
+
-    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.
- */
-, bool fFlushTBs
+
-{
-    Log2(("REMR3State:\n"));
@@ -1650 +1649 @@
-    pVM->rem.s.fInStateSync = true;
-
-
+
+
+
+
-    {
-        STAM_COUNTER_INC(&gStatFlushTBs);
-        tb_flush(&pVM->rem.s.Env);
+        pVM->rem.s.fFlushTBs = false;
-    }
-