Index: /trunk/Makefile.kmk =================================================================== --- /trunk/Makefile.kmk (revision 81149) +++ /trunk/Makefile.kmk (revision 81150) @@ -485,5 +485,5 @@ # -# The core (VMM+REM+Devices+Main) documentation. +# The core (VMM+Devices+Main) documentation. # # This includes so much because we wish to have the complete CFGM @@ -777,5 +777,4 @@ $(PATH_ROOT)/include/VBox/vmm/pdmserialifs.h \ $(PATH_ROOT)/include/VBox/vmm/pdmstorageifs.h \ - $(PATH_ROOT)/include/VBox/vmm/rem.h \ $(PATH_ROOT)/include/VBox/vmm/iom.h \ $(PATH_ROOT)/include/VBox/vmm/cfgm.h \ @@ -796,5 +795,4 @@ $(PATH_ROOT)/src/VBox/VMM/include/PGMInternal.h \ $(PATH_ROOT)/src/VBox/VMM/include/GIMInternal.h \ - $(PATH_ROOT)/src/VBox/VMM/include/REMInternal.h \ $(PATH_ROOT)/src/VBox/VMM/include/SELMInternal.h \ $(PATH_ROOT)/src/VBox/VMM/include/SSMInternal.h \ @@ -838,9 +836,4 @@ $(VBOX_CORE_DOXYFILE_INPUT_FIRST) \ $(sort $(filter-out $(VBOX_CORE_DOXYFILE_INPUT_FIRST), $(VBOX_CORE_DOXYFILE_INPUT))) - -# And some some additional stuff. -VBOX_CORE_DOXYFILE_INPUT += \ - $(PATH_ROOT)/src/recompiler/VBoxRecompiler.c \ - $(PATH_ROOT)/src/recompiler/VBoxREMWrapper.cpp includedep $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core.dep @@ -2003,5 +1996,4 @@ VBoxSVC \ $(if-expr defined(VBOX_WITH_RAW_MODE),VMMRC VBoxDDRC VBoxDD2RC,) \ - $(if-expr defined(VBOX_WITH_REM),VBoxREM,) \ $(if-expr defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win",VBoxProxyStub,) \ $(if-expr defined(VBOX_WITH_SDS),VBoxSDS,) \ Index: unk/include/VBox/vmm/rem.h =================================================================== --- /trunk/include/VBox/vmm/rem.h (revision 81149) +++ (revision ) @@ -1,104 +1,0 @@ -/** @file - * REM - The Recompiled Execution Manager. - */ - -/* - * Copyright (C) 2006-2019 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - */ - -#ifndef VBOX_INCLUDED_vmm_rem_h -#define VBOX_INCLUDED_vmm_rem_h -#ifndef RT_WITHOUT_PRAGMA_ONCE -# pragma once -#endif - -#include -#include -#include - - -RT_C_DECLS_BEGIN - -/** @defgroup grp_rem The Recompiled Execution Manager API - * @ingroup grp_vmm - * @{ - */ - -/** No pending interrupt. */ -#define REM_NO_PENDING_IRQ (~(uint32_t)0) - - -#if defined(IN_RING0) || defined(IN_RC) -VMMDECL(void) REMNotifyInvalidatePage(PVMCC pVM, RTGCPTR GCPtrPage); -VMMDECL(void) REMNotifyHandlerPhysicalRegister(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler); -VMMDECL(void) REMNotifyHandlerPhysicalDeregister(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM); -VMMDECL(void) REMNotifyHandlerPhysicalModify(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM); -#endif /* IN_RING0 || IN_RC */ -VMMDECL(void) REMFlushTBs(PVM pVM); - - -#ifdef IN_RING3 -/** @defgroup grp_rem_r3 REM Host Context Ring 3 API - * @{ - */ -REMR3DECL(int) REMR3Init(PVM pVM); -REMR3DECL(int) REMR3InitFinalize(PVM pVM); -REMR3DECL(int) REMR3Term(PVM pVM); -REMR3DECL(void) REMR3Reset(PVM pVM); -REMR3DECL(int) REMR3Run(PVM pVM, PVMCPU pVCpu); -REMR3DECL(int) REMR3EmulateInstruction(PVM pVM, PVMCPU pVCpu); -REMR3DECL(int) REMR3Step(PVM pVM, PVMCPU pVCpu); -REMR3DECL(int) REMR3BreakpointSet(PVM pVM, RTGCUINTPTR Address); -REMR3DECL(int) REMR3BreakpointClear(PVM pVM, RTGCUINTPTR Address); -REMR3DECL(int) REMR3State(PVM pVM, PVMCPU pVCpu); -REMR3DECL(int) REMR3StateBack(PVM pVM, PVMCPU pVCpu); -REMR3DECL(void) REMR3StateUpdate(PVM pVM, PVMCPU pVCpu); -REMR3DECL(void) REMR3A20Set(PVM pVM, PVMCPU pVCpu, bool fEnable); -REMR3DECL(int) REMR3DisasEnableStepping(PVM pVM, bool fEnable); -REMR3DECL(void) REMR3ReplayHandlerNotifications(PVM pVM); -REMR3DECL(int) REMR3NotifyCodePageChanged(PVM pVM, PVMCPU pVCpu, RTGCPTR pvCodePage); -REMR3DECL(void) REMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, unsigned fFlags); -/** @name Flags for REMR3NotifyPhysRamRegister. - * @{ */ -#define REM_NOTIFY_PHYS_RAM_FLAGS_RAM RT_BIT(16) -#define REM_NOTIFY_PHYS_RAM_FLAGS_MMIO2 RT_BIT(17) -/** @} */ -REMR3DECL(void) REMR3NotifyPhysRomRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, void *pvCopy, bool fShadow); -REMR3DECL(void) REMR3NotifyPhysRamDeregister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb); -REMR3DECL(void) REMR3NotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler); -REMR3DECL(void) REMR3NotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM); -REMR3DECL(void) REMR3NotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM); -REMR3DECL(void) REMR3NotifyInterruptSet(PVM pVM, PVMCPU pVCpu); -REMR3DECL(void) REMR3NotifyInterruptClear(PVM pVM, PVMCPU pVCpu); -REMR3DECL(void) REMR3NotifyTimerPending(PVM pVM, PVMCPU pVCpuDst); -REMR3DECL(void) REMR3NotifyDmaPending(PVM pVM); -REMR3DECL(void) REMR3NotifyQueuePending(PVM pVM); -REMR3DECL(void) REMR3NotifyFF(PVM pVM); -REMR3DECL(bool) REMR3IsPageAccessHandled(PVM pVM, RTGCPHYS GCPhys); -/** @} */ -#endif /* IN_RING3 */ - - -/** @} */ -RT_C_DECLS_END - - -#endif /* !VBOX_INCLUDED_vmm_rem_h */ - Index: /trunk/src/VBox/VMM/VMMAll/APICAll.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/APICAll.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMAll/APICAll.cpp (revision 81150) @@ -24,8 +24,10 @@ #include #include -#include #include #include #include +#ifdef IN_RING0 +# include +#endif Index: /trunk/src/VBox/VMM/VMMAll/AllPdbTypeHack.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/AllPdbTypeHack.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMAll/AllPdbTypeHack.cpp (revision 81150) @@ -38,5 +38,4 @@ #include "../include/TMInternal.h" #include "../include/IOMInternal.h" -#include "../include/REMInternal.h" #ifdef IN_RING3 # include "../include/SSMInternal.h" @@ -52,5 +51,4 @@ #include "../include/IEMInternal.h" #include "../include/NEMInternal.h" -#include "../include/REMInternal.h" #include "../VMMR0/GMMR0Internal.h" #include "../VMMR0/GVMMR0Internal.h" Index: /trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp (revision 81150) @@ -24,7 +24,4 @@ #include #ifndef IN_RC -# ifdef VBOX_WITH_REM -# include -# endif # include #endif Index: /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (revision 81150) @@ -30,7 +30,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp (revision 81150) @@ -28,7 +28,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include "PGMInternal.h" Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (revision 81150) @@ -27,7 +27,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include "PGMInternal.h" #include Index: unk/src/VBox/VMM/VMMAll/REMAll.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/REMAll.cpp (revision 81149) +++ (revision ) @@ -1,213 +1,0 @@ -/* $Id$ */ -/** @file - * REM - Recompiled Execution Monitor, all Contexts part. - */ - -/* - * Copyright (C) 2006-2019 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - - -/********************************************************************************************************************************* -* Header Files * -*********************************************************************************************************************************/ -#define LOG_GROUP LOG_GROUP_REM -#ifdef VBOX_WITH_REM -# include -#endif -#include -#include -#include "REMInternal.h" -#include -#include -#include - -#include -#include - - -#ifndef IN_RING3 - -/** - * Records a invlpg instruction for replaying upon REM entry. - * - * @param pVM The cross context VM structure. - * @param GCPtrPage The - */ -VMMDECL(void) REMNotifyInvalidatePage(PVMCC pVM, RTGCPTR GCPtrPage) -{ - /* - * Try take the REM lock and push the address onto the array. - */ - if ( pVM->rem.s.cInvalidatedPages < RT_ELEMENTS(pVM->rem.s.aGCPtrInvalidatedPages) - && EMRemTryLock(pVM) == VINF_SUCCESS) - { - uint32_t iPage = pVM->rem.s.cInvalidatedPages; - if (iPage < RT_ELEMENTS(pVM->rem.s.aGCPtrInvalidatedPages)) - { - ASMAtomicWriteU32(&pVM->rem.s.cInvalidatedPages, iPage + 1); - pVM->rem.s.aGCPtrInvalidatedPages[iPage] = GCPtrPage; - - EMRemUnlock(pVM); - return; - } - - CPUMSetChangedFlags(VMMGetCpu(pVM), CPUM_CHANGED_GLOBAL_TLB_FLUSH); /** @todo this array should be per-cpu technically speaking. */ - ASMAtomicWriteU32(&pVM->rem.s.cInvalidatedPages, 0); /** @todo leave this alone? Optimize this code? */ - - EMRemUnlock(pVM); - } - else - { - /* Fallback: Simply tell the recompiler to flush its TLB. */ - CPUMSetChangedFlags(VMMGetCpu(pVM), CPUM_CHANGED_GLOBAL_TLB_FLUSH); - ASMAtomicWriteU32(&pVM->rem.s.cInvalidatedPages, 0); /** @todo leave this alone?! Optimize this code? */ - } - - return; -} - - -/** - * Insert pending notification - * - * @param pVM The cross context VM structure. - * @param pRec Notification record to insert - */ -static void remNotifyHandlerInsert(PVMCC pVM, PREMHANDLERNOTIFICATION pRec) -{ - /* - * Fetch a free record. - */ - uint32_t cFlushes = 0; - uint32_t idxFree; - PREMHANDLERNOTIFICATION pFree; - do - { - idxFree = ASMAtomicUoReadU32(&pVM->rem.s.idxFreeList); - if (idxFree == UINT32_MAX) - { - do - { - cFlushes++; - Assert(cFlushes != 128); - AssertFatal(cFlushes < _1M); - VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_REM_REPLAY_HANDLER_NOTIFICATIONS, 0); - idxFree = ASMAtomicUoReadU32(&pVM->rem.s.idxFreeList); - } while (idxFree == UINT32_MAX); - } - pFree = &pVM->rem.s.aHandlerNotifications[idxFree]; - } while (!ASMAtomicCmpXchgU32(&pVM->rem.s.idxFreeList, pFree->idxNext, idxFree)); - - /* - * Copy the record. - */ - pFree->enmKind = pRec->enmKind; - pFree->u = pRec->u; - - /* - * Insert it into the pending list. - */ - uint32_t idxNext; - do - { - idxNext = ASMAtomicUoReadU32(&pVM->rem.s.idxPendingList); - ASMAtomicWriteU32(&pFree->idxNext, idxNext); - ASMCompilerBarrier(); - } while (!ASMAtomicCmpXchgU32(&pVM->rem.s.idxPendingList, idxFree, idxNext)); - - VM_FF_SET(pVM, VM_FF_REM_HANDLER_NOTIFY); -} - - -/** - * Notification about a successful PGMR3HandlerPhysicalRegister() call. - * - * @param pVM The cross context VM structure. - * @param enmKind Kind of access handler. - * @param GCPhys Handler range address. - * @param cb Size of the handler range. - * @param fHasHCHandler Set if the handler have a HC callback function. - */ -VMMDECL(void) REMNotifyHandlerPhysicalRegister(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler) -{ - REMHANDLERNOTIFICATION Rec; - Rec.enmKind = REMHANDLERNOTIFICATIONKIND_PHYSICAL_REGISTER; - Rec.u.PhysicalRegister.enmKind = enmKind; - Rec.u.PhysicalRegister.GCPhys = GCPhys; - Rec.u.PhysicalRegister.cb = cb; - Rec.u.PhysicalRegister.fHasHCHandler = fHasHCHandler; - remNotifyHandlerInsert(pVM, &Rec); -} - - -/** - * Notification about a successful PGMR3HandlerPhysicalDeregister() operation. - * - * @param pVM The cross context VM structure. - * @param enmKind Kind of access handler. - * @param GCPhys Handler range address. - * @param cb Size of the handler range. - * @param fHasHCHandler Set if the handler have a HC callback function. - * @param fRestoreAsRAM Whether the to restore it as normal RAM or as unassigned memory. - */ -VMMDECL(void) REMNotifyHandlerPhysicalDeregister(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM) -{ - REMHANDLERNOTIFICATION Rec; - Rec.enmKind = REMHANDLERNOTIFICATIONKIND_PHYSICAL_DEREGISTER; - Rec.u.PhysicalDeregister.enmKind = enmKind; - Rec.u.PhysicalDeregister.GCPhys = GCPhys; - Rec.u.PhysicalDeregister.cb = cb; - Rec.u.PhysicalDeregister.fHasHCHandler = fHasHCHandler; - Rec.u.PhysicalDeregister.fRestoreAsRAM = fRestoreAsRAM; - remNotifyHandlerInsert(pVM, &Rec); -} - - -/** - * Notification about a successful PGMR3HandlerPhysicalModify() call. - * - * @param pVM The cross context VM structure. - * @param enmKind Kind of access handler. - * @param GCPhysOld Old handler range address. - * @param GCPhysNew New handler range address. - * @param cb Size of the handler range. - * @param fHasHCHandler Set if the handler have a HC callback function. - * @param fRestoreAsRAM Whether the to restore it as normal RAM or as unassigned memory. - */ -VMMDECL(void) REMNotifyHandlerPhysicalModify(PVMCC pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM) -{ - REMHANDLERNOTIFICATION Rec; - Rec.enmKind = REMHANDLERNOTIFICATIONKIND_PHYSICAL_MODIFY; - Rec.u.PhysicalModify.enmKind = enmKind; - Rec.u.PhysicalModify.GCPhysOld = GCPhysOld; - Rec.u.PhysicalModify.GCPhysNew = GCPhysNew; - Rec.u.PhysicalModify.cb = cb; - Rec.u.PhysicalModify.fHasHCHandler = fHasHCHandler; - Rec.u.PhysicalModify.fRestoreAsRAM = fRestoreAsRAM; - remNotifyHandlerInsert(pVM, &Rec); -} - -#endif /* !IN_RING3 */ - - -/** - * Make REM flush all translation block upon the next call to REMR3State(). - * - * @param pVM The cross context 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; -} - Index: /trunk/src/VBox/VMM/VMMAll/TMAll.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/TMAll.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMAll/TMAll.cpp (revision 81150) @@ -28,7 +28,4 @@ #include #ifdef IN_RING3 -# ifdef VBOX_WITH_REM -# include -# endif #endif #include /* (for TMTIMER_GET_CRITSECT implementation) */ Index: /trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp (revision 81150) @@ -24,7 +24,4 @@ #include #ifdef IN_RING3 -# ifdef VBOX_WITH_REM -# include -# endif # include #endif Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (revision 81150) @@ -36,7 +36,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include "HMInternal.h" #include Index: /trunk/src/VBox/VMM/VMMR3/DBGF.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/DBGF.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/DBGF.cpp (revision 81150) @@ -73,7 +73,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/DBGFBp.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/DBGFBp.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/DBGFBp.cpp (revision 81150) @@ -23,9 +23,5 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#else -# include -#endif +#include #include #include Index: /trunk/src/VBox/VMM/VMMR3/EM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EM.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/EM.cpp (revision 81150) @@ -47,7 +47,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/EMHM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EMHM.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/EMHM.cpp (revision 81150) @@ -30,7 +30,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/EMR3Nem.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EMR3Nem.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/EMR3Nem.cpp (revision 81150) @@ -31,7 +31,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/HM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/HM.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/HM.cpp (revision 81150) @@ -53,7 +53,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp (revision 81150) @@ -24,7 +24,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp (revision 81150) @@ -28,7 +28,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp (revision 81150) @@ -26,7 +26,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp (revision 81150) @@ -31,7 +31,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp (revision 81150) @@ -24,7 +24,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/PDMQueue.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PDMQueue.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/PDMQueue.cpp (revision 81150) @@ -24,7 +24,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/PGM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PGM.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/PGM.cpp (revision 81150) @@ -624,7 +624,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/PGMHandler.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PGMHandler.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/PGMHandler.cpp (revision 81150) @@ -29,11 +29,5 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (revision 81150) @@ -27,7 +27,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include "PGMInternal.h" Index: /trunk/src/VBox/VMM/VMMR3/TM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/TM.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/TM.cpp (revision 81150) @@ -135,7 +135,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/TRPM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/TRPM.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/TRPM.cpp (revision 81150) @@ -89,7 +89,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include Index: /trunk/src/VBox/VMM/VMMR3/VM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/VM.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/VM.cpp (revision 81150) @@ -58,7 +58,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/VMMR3/VMEmt.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/VMEmt.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/VMEmt.cpp (revision 81150) @@ -26,7 +26,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include "VMInternal.h" Index: /trunk/src/VBox/VMM/VMMR3/VMM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/VMM.cpp (revision 81149) +++ /trunk/src/VBox/VMM/VMMR3/VMM.cpp (revision 81150) @@ -121,7 +121,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: unk/src/VBox/VMM/include/REMInternal.h =================================================================== --- /trunk/src/VBox/VMM/include/REMInternal.h (revision 81149) +++ (revision ) @@ -1,285 +1,0 @@ -/* $Id$ */ -/** @file - * REM - Internal header file. - */ - -/* - * Copyright (C) 2006-2019 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -#ifndef VMM_INCLUDED_SRC_include_REMInternal_h -#define VMM_INCLUDED_SRC_include_REMInternal_h -#ifndef RT_WITHOUT_PRAGMA_ONCE -# pragma once -#endif - -#include -#include -#include -#include -#include -#ifdef REM_INCLUDE_CPU_H -# include "target-i386/cpu.h" -#endif - - - -/** @defgroup grp_rem_int Internals - * @ingroup grp_rem - * @internal - * @{ - */ - -/** The saved state version number. */ -#define REM_SAVED_STATE_VERSION_VER1_6 6 -#define REM_SAVED_STATE_VERSION 7 - - -/** @def REM_MONITOR_CODE_PAGES - * Enable to monitor code pages that have been translated by the recompiler. */ -/** Currently broken and interferes with CSAM monitoring (see @bugref{2784}) */ -////#define REM_MONITOR_CODE_PAGES -#ifdef DOXYGEN_RUNNING -# define REM_MONITOR_CODE_PAGES -#endif - -typedef enum REMHANDLERNOTIFICATIONKIND -{ - /** The usual invalid 0 entry. */ - REMHANDLERNOTIFICATIONKIND_INVALID = 0, - /** REMR3NotifyHandlerPhysicalRegister. */ - REMHANDLERNOTIFICATIONKIND_PHYSICAL_REGISTER, - /** REMR3NotifyHandlerPhysicalDeregister. */ - REMHANDLERNOTIFICATIONKIND_PHYSICAL_DEREGISTER, - /** REMR3NotifyHandlerPhysicalModify. */ - REMHANDLERNOTIFICATIONKIND_PHYSICAL_MODIFY, - /** The usual 32-bit hack. */ - REMHANDLERNOTIFICATIONKIND_32BIT_HACK = 0x7fffffff -} REMHANDLERNOTIFICATIONKIND; - - -/** - * A recorded handler notification. - */ -typedef struct REMHANDLERNOTIFICATION -{ - /** The notification kind. */ - REMHANDLERNOTIFICATIONKIND enmKind; - uint32_t padding; - /** Type specific data. */ - union - { - struct - { - RTGCPHYS GCPhys; - RTGCPHYS cb; - PGMPHYSHANDLERKIND enmKind; - bool fHasHCHandler; - } PhysicalRegister; - - struct - { - RTGCPHYS GCPhys; - RTGCPHYS cb; - PGMPHYSHANDLERKIND enmKind; - bool fHasHCHandler; - bool fRestoreAsRAM; - } PhysicalDeregister; - - struct - { - RTGCPHYS GCPhysOld; - RTGCPHYS GCPhysNew; - RTGCPHYS cb; - PGMPHYSHANDLERKIND enmKind; - bool fHasHCHandler; - bool fRestoreAsRAM; - } PhysicalModify; - uint64_t padding[5]; - } u; - uint32_t idxSelf; - uint32_t volatile idxNext; -} REMHANDLERNOTIFICATION; -/** Pointer to a handler notification record. */ -typedef REMHANDLERNOTIFICATION *PREMHANDLERNOTIFICATION; - -/** - * Converts a REM pointer into a VM pointer. - * @returns Pointer to the VM structure the REM is part of. - * @param pREM Pointer to REM instance data. - */ -#define REM2VM(pREM) ( (PVM)((char*)pREM - pREM->offVM) ) - - -/** - * REM Data (part of VM) - */ -typedef struct REM -{ - /** Offset to the VM structure. */ - RTINT offVM; - /** Alignment padding. */ - RTUINT uPadding0; - - /** Cached pointer of the register context of the current VCPU. */ - R3PTRTYPE(PCPUMCTX) pCtx; - - /** In REM mode. - * I.e. the correct CPU state and some other bits are with REM. */ - bool volatile fInREM; - /** In REMR3State. */ - bool fInStateSync; - - /** Set when the translation blocks cache need to be flushed. */ - bool fFlushTBs; - - /** Ignore CR3 load notifications from the REM. */ - bool fIgnoreCR3Load; - /** Ignore invlpg notifications from the REM. */ - bool fIgnoreInvlPg; - /** Ignore CR0, CR4 and EFER load. */ - bool fIgnoreCpuMode; - /** Ignore set page. */ - bool fIgnoreSetPage; - bool bPadding1; - - /** Ignore all that can be ignored. */ - uint32_t cIgnoreAll; - - /** Number of times REMR3CanExecuteRaw has been called. - * It is used to prevent rescheduling on the first call. */ - uint32_t cCanExecuteRaw; - - /** Pending interrupt that remR3LoadDone will assert with TRPM. */ - uint32_t uStateLoadPendingInterrupt; - - /** Number of recorded invlpg instructions. */ - uint32_t volatile cInvalidatedPages; -#if HC_ARCH_BITS == 32 - uint32_t uPadding2; -#endif - /** Array of recorded invlpg instruction. - * These instructions are replayed when entering REM. */ - RTGCPTR aGCPtrInvalidatedPages[48]; - - /** Array of recorded handler notifications. - * These are replayed when entering REM. */ - REMHANDLERNOTIFICATION aHandlerNotifications[64]; - volatile uint32_t idxPendingList; - volatile uint32_t idxFreeList; - - /** MMIO memory type. - * This is used to register MMIO physical access handlers. */ - int32_t iMMIOMemType; - /** Handler memory type. - * This is used to register non-MMIO physical access handlers which are executed in HC. */ - int32_t iHandlerMemType; - - /** Pending exception */ - uint32_t uPendingException; - /** Nr of pending exceptions */ - uint32_t cPendingExceptions; - /** Pending exception's EIP */ - RTGCPTR uPendingExcptEIP; - /** Pending exception's CR2 */ - RTGCPTR uPendingExcptCR2; - - /** The highest known RAM address. */ - RTGCPHYS GCPhysLastRam; - /** Whether GCPhysLastRam has been fixed (see REMR3Init()). */ - bool fGCPhysLastRamFixed; - - /** Pending rc. */ - int32_t rc; - - /** REM critical section. - * This protects cpu_register_physical_memory usage - */ - PDMCRITSECT CritSectRegister; - - /** Time spent in QEMU. */ - STAMPROFILEADV StatsInQEMU; - /** Time spent in rawmode.c. */ - STAMPROFILEADV StatsInRAWEx; - /** Time spent switching state. */ - STAMPROFILE StatsState; - /** Time spent switching state back. */ - STAMPROFILE StatsStateBack; - - /** Padding the CPUX86State structure to 64 byte. */ - uint32_t abPadding[HC_ARCH_BITS == 32 ? 4 : 4]; - -# define REM_ENV_SIZE 0xff00 - - /** Recompiler CPU state. */ -#ifdef REM_INCLUDE_CPU_H - CPUX86State Env; -#else - struct FakeEnv - { - char achPadding[REM_ENV_SIZE]; - } Env; -#endif /* !REM_INCLUDE_CPU_H */ -} REM; - -/** Pointer to the REM Data. */ -typedef REM *PREM; - - -#ifdef REM_INCLUDE_CPU_H -bool remR3CanExecuteRaw(CPUState *env, RTGCPTR eip, unsigned fFlags, int *piException); -void remR3CSAMCheckEIP(CPUState *env, RTGCPTR GCPtrCode); -bool remR3DisasInstr(CPUState *env, int f32BitCode, char *pszPrefix); -void remR3FlushPage(CPUState *env, RTGCPTR GCPtr); -void remR3FlushTLB(CPUState *env, bool fGlobal); -void remR3ProtectCode(CPUState *env, RTGCPTR GCPtr); -void remR3ChangeCpuMode(CPUState *env); -void remR3DmaRun(CPUState *env); -void remR3TimersRun(CPUState *env); -int remR3NotifyTrap(CPUState *env, uint32_t uTrap, uint32_t uErrorCode, RTGCPTR pvNextEIP); -void remR3TrapStat(CPUState *env, uint32_t uTrap); -void remR3RecordCall(CPUState *env); -#endif /* REM_INCLUDE_CPU_H */ -void remR3TrapClear(PVM pVM); -void remR3RaiseRC(PVM pVM, int rc); -void remR3DumpLnxSyscall(PVMCPU pVCpu); -void remR3DumpOBsdSyscall(PVMCPU pVCpu); - - -/** @todo r=bird: clean up the RAWEx stats. */ -/* temporary hacks */ -#define RAWEx_ProfileStart(a, b) remR3ProfileStart(b) -#define RAWEx_ProfileStop(a, b) remR3ProfileStop(b) - - -#ifdef VBOX_WITH_STATISTICS - -# define STATS_EMULATE_SINGLE_INSTR 1 -# define STATS_QEMU_COMPILATION 2 -# define STATS_QEMU_RUN_EMULATED_CODE 3 -# define STATS_QEMU_TOTAL 4 -# define STATS_QEMU_RUN_TIMERS 5 -# define STATS_TLB_LOOKUP 6 -# define STATS_IRQ_HANDLING 7 -# define STATS_RAW_CHECK 8 - -void remR3ProfileStart(int statcode); -void remR3ProfileStop(int statcode); - -#else /* !VBOX_WITH_STATISTICS */ -# define remR3ProfileStart(c) do { } while (0) -# define remR3ProfileStop(c) do { } while (0) -#endif /* !VBOX_WITH_STATISTICS */ - -/** @} */ - -#endif /* !VMM_INCLUDED_SRC_include_REMInternal_h */ - Index: /trunk/src/VBox/VMM/testcase/tstAnimate.cpp =================================================================== --- /trunk/src/VBox/VMM/testcase/tstAnimate.cpp (revision 81149) +++ /trunk/src/VBox/VMM/testcase/tstAnimate.cpp (revision 81150) @@ -26,7 +26,4 @@ #include #include -#ifdef VBOX_WITH_REM -# include -#endif #include #include Index: /trunk/src/VBox/VMM/testcase/tstVMStructDTrace.cpp =================================================================== --- /trunk/src/VBox/VMM/testcase/tstVMStructDTrace.cpp (revision 81149) +++ /trunk/src/VBox/VMM/testcase/tstVMStructDTrace.cpp (revision 81150) @@ -42,5 +42,4 @@ #include "TMInternal.h" #include "IOMInternal.h" -#include "REMInternal.h" #include "HMInternal.h" #include "APICInternal.h" @@ -51,5 +50,4 @@ #include "EMInternal.h" #include "IEMInternal.h" -#include "REMInternal.h" #include "NEMInternal.h" #ifdef VBOX_WITH_RAW_MODE Index: /trunk/src/VBox/VMM/testcase/tstVMStructRC.cpp =================================================================== --- /trunk/src/VBox/VMM/testcase/tstVMStructRC.cpp (revision 81149) +++ /trunk/src/VBox/VMM/testcase/tstVMStructRC.cpp (revision 81150) @@ -68,5 +68,4 @@ #include "TMInternal.h" #include "IOMInternal.h" -#include "REMInternal.h" #include "HMInternal.h" #include "APICInternal.h" @@ -79,5 +78,4 @@ #include "EMInternal.h" #include "IEMInternal.h" -#include "REMInternal.h" #include "NEMInternal.h" #include Index: /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp =================================================================== --- /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp (revision 81149) +++ /trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp (revision 81150) @@ -41,5 +41,4 @@ #include "TMInternal.h" #include "IOMInternal.h" -#include "REMInternal.h" #include "SSMInternal.h" #include "HMInternal.h" @@ -52,5 +51,4 @@ #include "EMInternal.h" #include "IEMInternal.h" -#include "REMInternal.h" #include "NEMInternal.h" #include "../VMMR0/GMMR0Internal.h"