Index: /trunk/include/VBox/vmm/pgm.h =================================================================== --- /trunk/include/VBox/vmm/pgm.h (revision 55902) +++ /trunk/include/VBox/vmm/pgm.h (revision 55903) @@ -121,38 +121,4 @@ /** - * \#PF Handler callback for physical access handler ranges in RC. - * - * @returns VBox status code (appropriate for RC return). - * @param pVM VM Handle. - * @param uErrorCode CPU Error code. - * @param pRegFrame Trap register frame. - * NULL on DMA and other non CPU access. - * @param pvFault The fault address (cr2). - * @param GCPhysFault The GC physical address corresponding to pvFault. - * @param pvUser User argument. - */ -typedef DECLCALLBACK(int) FNPGMRCPHYSPFHANDLER(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, - RTGCPHYS GCPhysFault, void *pvUser); -/** Pointer to PGM access callback. */ -typedef FNPGMRCPHYSPFHANDLER *PFNPGMRCPHYSPFHANDLER; - -/** - * \#PF Handler callback for physical access handler ranges in R0. - * - * @returns VBox status code (appropriate for R0 return). - * @param pVM VM Handle. - * @param uErrorCode CPU Error code. - * @param pRegFrame Trap register frame. - * NULL on DMA and other non CPU access. - * @param pvFault The fault address (cr2). - * @param GCPhysFault The GC physical address corresponding to pvFault. - * @param pvUser User argument. - */ -typedef DECLCALLBACK(int) FNPGMR0PHYSPFHANDLER(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, - RTGCPHYS GCPhysFault, void *pvUser); -/** Pointer to PGM access callback. */ -typedef FNPGMR0PHYSPFHANDLER *PFNPGMR0PHYSPFHANDLER; - -/** * Guest Access type */ @@ -165,4 +131,25 @@ } PGMACCESSTYPE; + +/** + * \#PF Handler callback for physical access handler ranges in RC and R0. + * + * @returns VBox status code (appropriate for RC return). + * @param pVM VM Handle. + * @param pVCpu Pointer to the cross context CPU context for the + * calling EMT. + * @param uErrorCode CPU Error code. + * @param pRegFrame Trap register frame. + * NULL on DMA and other non CPU access. + * @param pvFault The fault address (cr2). + * @param GCPhysFault The GC physical address corresponding to pvFault. + * @param pvUser User argument. + */ +typedef DECLCALLBACK(int) FNPGMRZPHYSPFHANDLER(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, + RTGCPHYS GCPhysFault, void *pvUser); +/** Pointer to PGM access callback. */ +typedef FNPGMRZPHYSPFHANDLER *PFNPGMRZPHYSPFHANDLER; + + /** * \#PF Handler callback for physical access handler ranges (MMIO among others) in HC. @@ -174,4 +161,6 @@ * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation. * @param pVM VM Handle. + * @param pVCpu Pointer to the cross context CPU context for the + * calling EMT. * @param GCPhys The physical address the guest is writing to. * @param pvPhys The HC mapping of that address. @@ -179,10 +168,11 @@ * @param cbBuf How much it's reading/writing. * @param enmAccessType The access type. + * @param enmOrigin The origin of this call. * @param pvUser User argument. * * @todo Add pVCpu, possibly replacing pVM. */ -typedef DECLCALLBACK(int) FNPGMR3PHYSHANDLER(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, - PGMACCESSTYPE enmAccessType, void *pvUser); +typedef DECLCALLBACK(int) FNPGMR3PHYSHANDLER(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, + PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser); /** Pointer to PGM access callback. */ typedef FNPGMR3PHYSHANDLER *PFNPGMR3PHYSHANDLER; @@ -222,5 +212,5 @@ * @param pvUser User argument. */ -typedef DECLCALLBACK(int) FNPGMRCVIRTPFHANDLER(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, +typedef DECLCALLBACK(int) FNPGMRCVIRTPFHANDLER(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange, void *pvUser); /** Pointer to PGM access callback. */ @@ -578,6 +568,6 @@ VMMR3_INT_DECL(int) PGMR3HandlerPhysicalTypeRegisterEx(PVM pVM, PGMPHYSHANDLERKIND enmKind, PFNPGMR3PHYSHANDLER pfnHandlerR3, - R0PTRTYPE(PFNPGMR0PHYSPFHANDLER) pfnPfHandlerR0, - RCPTRTYPE(PFNPGMRCPHYSPFHANDLER) pfnPfHandlerRC, + R0PTRTYPE(PFNPGMRZPHYSPFHANDLER) pfnPfHandlerR0, + RCPTRTYPE(PFNPGMRZPHYSPFHANDLER) pfnPfHandlerRC, const char *pszDesc, PPGMPHYSHANDLERTYPE phType); VMMR3DECL(int) PGMR3HandlerPhysicalTypeRegister(PVM pVM, PGMPHYSHANDLERKIND enmKind, Index: /trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (revision 55902) +++ /trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (revision 55903) @@ -1735,4 +1735,6 @@ * @returns VBox status code (appropriate for GC return). * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the cross context CPU context for the + * calling EMT. * @param uErrorCode CPU Error code. * @param pCtxCore Trap register frame. @@ -1741,10 +1743,10 @@ * @param pvUser Pointer to the MMIO ring-3 range entry. */ -DECLEXPORT(int) iomMmioPfHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPTR pvFault, +DECLEXPORT(int) iomMmioPfHandler(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser) { LogFlow(("iomMmioPfHandler: GCPhys=%RGp uErr=%#x pvFault=%RGv rip=%RGv\n", GCPhysFault, (uint32_t)uErrorCode, pvFault, (RTGCPTR)pCtxCore->rip)); - VBOXSTRICTRC rcStrict = iomMMIOHandler(pVM, VMMGetCpu(pVM), (uint32_t)uErrorCode, pCtxCore, GCPhysFault, pvUser); + VBOXSTRICTRC rcStrict = iomMMIOHandler(pVM, pVCpu, (uint32_t)uErrorCode, pCtxCore, GCPhysFault, pvUser); return VBOXSTRICTRC_VAL(rcStrict); } @@ -1793,4 +1795,5 @@ * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation. * @param pVM Pointer to the VM. + * @param pVCpu The cross context CPU structure for the calling EMT. * @param GCPhys The physical address the guest is writing to. * @param pvPhys The HC mapping of that address. @@ -1798,10 +1801,10 @@ * @param cbBuf How much it's reading/writing. * @param enmAccessType The access type. + * @param enmOrigin Who is making the access. * @param pvUser Pointer to the MMIO range entry. */ -DECLCALLBACK(int) iomR3MmioHandler(PVM pVM, RTGCPHYS GCPhysFault, void *pvPhys, void *pvBuf, size_t cbBuf, - PGMACCESSTYPE enmAccessType, void *pvUser) -{ - PVMCPU pVCpu = VMMGetCpu(pVM); +DECLCALLBACK(int) iomR3MmioHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhysFault, void *pvPhys, void *pvBuf, size_t cbBuf, + PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser) +{ PIOMMMIORANGE pRange = (PIOMMMIORANGE)pvUser; STAM_COUNTER_INC(&pVM->iom.s.StatR3MMIOHandler); @@ -1809,5 +1812,5 @@ AssertMsg(cbBuf >= 1 && cbBuf <= 16, ("%zu\n", cbBuf)); AssertPtr(pRange); - NOREF(pvPhys); + NOREF(pvPhys); NOREF(enmOrigin); /* Index: /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 55902) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 55903) @@ -260,5 +260,5 @@ } - rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, uErr, pRegFrame, pvFault, GCPhysFault, pvUser); + rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, pVCpu, uErr, pRegFrame, pvFault, GCPhysFault, pvUser); # ifdef VBOX_WITH_STATISTICS @@ -330,9 +330,10 @@ STAM_PROFILE_START(&pCur->Stat, h); RTGCPTR GCPtrStart = pCur->Core.Key; + void *pvUser = pCur->CTX_SUFF(pvUser); pgmUnlock(pVM); *pfLockTaken = false; - rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, uErr, pRegFrame, pvFault, GCPtrStart, pvFault - GCPtrStart, - pCur->pvUserRC); + rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, pVCpu, uErr, pRegFrame, pvFault, GCPtrStart, + pvFault - GCPtrStart, pvUser); # ifdef VBOX_WITH_STATISTICS @@ -370,4 +371,5 @@ STAM_PROFILE_START(&pCur->Stat, h); RTGCPTR GCPtrStart = pCur->Core.Key; + void *pvUser = pCur->CTX_SUFF(pvUser); pgmUnlock(pVM); *pfLockTaken = false; @@ -377,5 +379,5 @@ - (GCPtrStart & PAGE_OFFSET_MASK); Assert(off < pCur->cb); - rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, uErr, pRegFrame, pvFault, GCPtrStart, off, pCur->pvUserRC); + rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, pVCpu, uErr, pRegFrame, pvFault, GCPtrStart, off, pvUser); # ifdef VBOX_WITH_STATISTICS @@ -721,7 +723,8 @@ STAM_PROFILE_START(&pCur->Stat, h); PPGMVIRTHANDLERTYPEINT pCurType = PGMVIRTANDLER_GET_TYPE(pVM, pCur); + void *pvUser = pCur->CTX_SUFF(pvUser); pgmUnlock(pVM); - rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, uErr, pRegFrame, pvFault, pCur->Core.Key, pvFault - pCur->Core.Key, - pCur->pvUserRC); + rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, pVCpu, uErr, pRegFrame, pvFault, pCur->Core.Key, + pvFault - pCur->Core.Key, pvUser); pgmLock(pVM); STAM_PROFILE_STOP(&pCur->Stat, h); @@ -816,7 +819,8 @@ # ifdef IN_RC STAM_PROFILE_START(&pCur->Stat, h); + void *pvUser = pCur->CTX_SUFF(pvUser); pgmUnlock(pVM); - rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, uErr, pRegFrame, pvFault, pCur->Core.Key, pvFault - pCur->Core.Key, - pCur->pvUserRC); + rc = pCurType->CTX_SUFF(pfnPfHandler)(pVM, pVCpu, uErr, pRegFrame, pvFault, pCur->Core.Key, + pvFault - pCur->Core.Key, pvUser); pgmLock(pVM); STAM_PROFILE_STOP(&pCur->Stat, h); Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (revision 55902) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (revision 55903) @@ -58,4 +58,6 @@ * @returns VBox status code (appropriate for trap handling and GC return). * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the cross context CPU context for the + * calling EMT. * @param uErrorCode CPU Error code. * @param pRegFrame Trap register frame. @@ -64,8 +66,8 @@ * @param pvUser User argument. */ -VMMDECL(int) pgmPhysPfHandlerRedirectToHC(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, +VMMDECL(int) pgmPhysPfHandlerRedirectToHC(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser) { - NOREF(pVM); NOREF(uErrorCode); NOREF(pRegFrame); NOREF(pvFault); NOREF(GCPhysFault); NOREF(pvUser); + NOREF(pVM); NOREF(pVCpu); NOREF(uErrorCode); NOREF(pRegFrame); NOREF(pvFault); NOREF(GCPhysFault); NOREF(pvUser); return (uErrorCode & X86_TRAP_PF_RW) ? VINF_IOM_R3_MMIO_WRITE : VINF_IOM_R3_MMIO_READ; } @@ -78,4 +80,6 @@ * @returns VBox status code (appropriate for trap handling and GC return). * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the cross context CPU context for the + * calling EMT. * @param uErrorCode CPU Error code. * @param pRegFrame Trap register frame. @@ -84,5 +88,5 @@ * @param pvUser User argument. Pointer to the ROM range structure. */ -DECLEXPORT(int) pgmPhysRomWritePfHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, +DECLEXPORT(int) pgmPhysRomWritePfHandler(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser) { @@ -90,5 +94,4 @@ PPGMROMRANGE pRom = (PPGMROMRANGE)pvUser; uint32_t iPage = (GCPhysFault - pRom->GCPhys) >> PAGE_SHIFT; - PVMCPU pVCpu = VMMGetCpu(pVM); NOREF(uErrorCode); NOREF(pvFault); @@ -2131,5 +2134,5 @@ /* Release the PGM lock as MMIO handlers take the IOM lock. (deadlock prevention) */ pgmUnlock(pVM); - rc = pfnHandler(pVM, GCPhys, (void *)pvSrc, pvBuf, cb, PGMACCESSTYPE_READ, pvUser); + rc = pfnHandler(pVM, pVCpu, GCPhys, (void *)pvSrc, pvBuf, cb, PGMACCESSTYPE_READ, enmOrigin, pvUser); pgmLock(pVM); # ifdef VBOX_WITH_STATISTICS @@ -2391,5 +2394,5 @@ /* Release the PGM lock as MMIO handlers take the IOM lock. (deadlock prevention) */ pgmUnlock(pVM); - rc = pfnHandler(pVM, GCPhys, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, pvUser); + rc = pfnHandler(pVM, pVCpu, GCPhys, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, enmOrigin, pvUser); pgmLock(pVM); # ifdef VBOX_WITH_STATISTICS @@ -2617,5 +2620,5 @@ /* Release the PGM lock as MMIO handlers take the IOM lock. (deadlock prevention) */ pgmUnlock(pVM); - rc = pfnHandler(pVM, GCPhys, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, pvUser); + rc = pfnHandler(pVM, pVCpu, GCPhys, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, enmOrigin, pvUser); pgmLock(pVM); # ifdef VBOX_WITH_STATISTICS @@ -2692,5 +2695,5 @@ /* Release the PGM lock as MMIO handlers take the IOM lock. (deadlock prevention) */ pgmUnlock(pVM); - rc = pfnHandler(pVM, GCPhys, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, pvUser); + rc = pfnHandler(pVM, pVCpu, GCPhys, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, enmOrigin, pvUser); pgmLock(pVM); # ifdef VBOX_WITH_STATISTICS Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (revision 55902) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (revision 55903) @@ -52,5 +52,5 @@ static void pgmPoolMonitorModifiedRemove(PPGMPOOL pPool, PPGMPOOLPAGE pPage); #ifndef IN_RING3 -DECLEXPORT(CTX_MID(FNPGM,PHYSPFHANDLER)) pgmPoolAccessPfHandler; +DECLEXPORT(FNPGMRZPHYSPFHANDLER) pgmPoolAccessPfHandler; #endif #if defined(LOG_ENABLED) || defined(VBOX_STRICT) @@ -1051,4 +1051,6 @@ * @returns VBox status code (appropriate for GC return). * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the cross context CPU context for the + * calling EMT. * @param uErrorCode CPU Error code. * @param pRegFrame Trap register frame. @@ -1058,5 +1060,5 @@ * @param pvUser User argument. */ -DECLEXPORT(int) pgmPoolAccessPfHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, +DECLEXPORT(int) pgmPoolAccessPfHandler(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser) { @@ -1064,5 +1066,4 @@ PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool); PPGMPOOLPAGE pPage = (PPGMPOOLPAGE)pvUser; - PVMCPU pVCpu = VMMGetCpu(pVM); unsigned cMaxModifications; bool fForcedFlush = false; Index: /trunk/src/VBox/VMM/VMMR0/PGMR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/PGMR0.cpp (revision 55902) +++ /trunk/src/VBox/VMM/VMMR0/PGMR0.cpp (revision 55903) @@ -587,5 +587,5 @@ Log6(("PGMR0Trap0eHandlerNPMisconfig: calling %p(,%#x,,%RGp,%p)\n", pHandlerType->CTX_SUFF(pfnPfHandler), uErr, GCPhysFault, pvUser)); - rc = pHandlerType->CTX_SUFF(pfnPfHandler)(pVM, uErr == UINT32_MAX ? RTGCPTR_MAX : uErr, pRegFrame, + rc = pHandlerType->CTX_SUFF(pfnPfHandler)(pVM, pVCpu, uErr == UINT32_MAX ? RTGCPTR_MAX : uErr, pRegFrame, GCPhysFault, GCPhysFault, pvUser); Index: /trunk/src/VBox/VMM/VMMR3/GIM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/GIM.cpp (revision 55902) +++ /trunk/src/VBox/VMM/VMMR3/GIM.cpp (revision 55903) @@ -70,4 +70,5 @@ static DECLCALLBACK(int) gimR3Save(PVM pVM, PSSMHANDLE pSSM); static DECLCALLBACK(int) gimR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uSSMVersion, uint32_t uPass); +static FNPGMR3PHYSHANDLER gimR3Mmio2WriteHandler; @@ -486,14 +487,16 @@ * * @returns VBox status code. - * @param pVM Pointer to the VM. - * @param GCPhys The guest-physical address of the region. - * @param pvPhys Pointer to the region in the guest address space. - * @param pvBuf Pointer to the data being read/written. - * @param cbBuf The size of the buffer in @a pvBuf. - * @param enmAccessType The type of access. - * @param pvUser User argument (NULL, not used). - */ -static DECLCALLBACK(int) gimR3Mmio2WriteHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, - PGMACCESSTYPE enmAccessType, void *pvUser) + * @param pVM Pointer to the VM. + * @param pVCpu The cross context CPU structure for the calling EMT. + * @param GCPhys The guest-physical address of the region. + * @param pvPhys Pointer to the region in the guest address space. + * @param pvBuf Pointer to the data being read/written. + * @param cbBuf The size of the buffer in @a pvBuf. + * @param enmAccessType The type of access. + * @param enmOrigin Who is making the access. + * @param pvUser User argument (NULL, not used). + */ +static DECLCALLBACK(int) gimR3Mmio2WriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, + PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser) { /* Index: /trunk/src/VBox/VMM/VMMR3/PGMHandler.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PGMHandler.cpp (revision 55902) +++ /trunk/src/VBox/VMM/VMMR3/PGMHandler.cpp (revision 55903) @@ -82,6 +82,6 @@ VMMR3_INT_DECL(int) PGMR3HandlerPhysicalTypeRegisterEx(PVM pVM, PGMPHYSHANDLERKIND enmKind, PFNPGMR3PHYSHANDLER pfnHandlerR3, - R0PTRTYPE(PFNPGMR0PHYSPFHANDLER) pfnPfHandlerR0, - RCPTRTYPE(PFNPGMRCPHYSPFHANDLER) pfnPfHandlerRC, + R0PTRTYPE(PFNPGMRZPHYSPFHANDLER) pfnPfHandlerR0, + RCPTRTYPE(PFNPGMRZPHYSPFHANDLER) pfnPfHandlerRC, const char *pszDesc, PPGMPHYSHANDLERTYPE phType) { Index: /trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (revision 55902) +++ /trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (revision 55903) @@ -3502,4 +3502,5 @@ * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation. * @param pVM Pointer to the VM. + * @param pVCpu The cross context CPU structure for the calling EMT. * @param GCPhys The physical address the guest is writing to. * @param pvPhys The HC mapping of that address. @@ -3507,8 +3508,9 @@ * @param cbBuf How much it's reading/writing. * @param enmAccessType The access type. + * @param enmOrigin Who is making the access. * @param pvUser User argument. */ -DECLCALLBACK(int) pgmR3PhysRomWriteHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, - PGMACCESSTYPE enmAccessType, void *pvUser) +DECLCALLBACK(int) pgmR3PhysRomWriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, + PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser) { PPGMROMRANGE pRom = (PPGMROMRANGE)pvUser; @@ -3517,5 +3519,5 @@ PPGMROMPAGE pRomPage = &pRom->aPages[iPage]; Log5(("pgmR3PhysRomWriteHandler: %d %c %#08RGp %#04zx\n", pRomPage->enmProt, enmAccessType == PGMACCESSTYPE_READ ? 'R' : 'W', GCPhys, cbBuf)); - NOREF(pvPhys); + NOREF(pVCpu); NOREF(pvPhys); NOREF(enmOrigin); if (enmAccessType == PGMACCESSTYPE_READ) Index: /trunk/src/VBox/VMM/VMMR3/PGMPool.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PGMPool.cpp (revision 55902) +++ /trunk/src/VBox/VMM/VMMR3/PGMPool.cpp (revision 55903) @@ -518,4 +518,5 @@ * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation. * @param pVM Pointer to the VM. + * @param pVCpu The cross context CPU structure for the calling EMT. * @param GCPhys The physical address the guest is writing to. * @param pvPhys The HC mapping of that address. @@ -523,17 +524,17 @@ * @param cbBuf How much it's reading/writing. * @param enmAccessType The access type. + * @param enmOrigin Who is making the access. * @param pvUser User argument. */ -static DECLCALLBACK(int) pgmR3PoolAccessHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, - PGMACCESSTYPE enmAccessType, void *pvUser) +static DECLCALLBACK(int) pgmR3PoolAccessHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, + PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser) { STAM_PROFILE_START(&pVM->pgm.s.pPoolR3->StatMonitorR3, a); PPGMPOOL pPool = pVM->pgm.s.pPoolR3; PPGMPOOLPAGE pPage = (PPGMPOOLPAGE)pvUser; - PVMCPU pVCpu = VMMGetCpu(pVM); LogFlow(("pgmR3PoolAccessHandler: GCPhys=%RGp %p:{.Core=%RHp, .idx=%d, .GCPhys=%RGp, .enmType=%d}\n", GCPhys, pPage, pPage->Core.Key, pPage->idx, pPage->GCPhys, pPage->enmKind)); - NOREF(pvBuf); NOREF(enmAccessType); + NOREF(pvBuf); NOREF(enmAccessType); NOREF(enmOrigin); /* Index: /trunk/src/VBox/VMM/include/IOMInternal.h =================================================================== --- /trunk/src/VBox/VMM/include/IOMInternal.h (revision 55902) +++ /trunk/src/VBox/VMM/include/IOMInternal.h (revision 55903) @@ -423,8 +423,8 @@ #ifndef IN_RING3 -DECLEXPORT(CTX_MID(FNPGM,PHYSPFHANDLER)) iomMmioPfHandler; +DECLEXPORT(FNPGMRZPHYSPFHANDLER) iomMmioPfHandler; #endif #ifdef IN_RING3 -FNPGMR3PHYSHANDLER iomR3MmioHandler; +FNPGMR3PHYSHANDLER iomR3MmioHandler; #endif Index: /trunk/src/VBox/VMM/include/PGMInternal.h =================================================================== --- /trunk/src/VBox/VMM/include/PGMInternal.h (revision 55902) +++ /trunk/src/VBox/VMM/include/PGMInternal.h (revision 55903) @@ -591,5 +591,5 @@ uint32_t uState; /** Pointer to RC callback function for \#PFs. */ - RCPTRTYPE(PFNPGMRCPHYSPFHANDLER) pfnPfHandlerRC; + RCPTRTYPE(PFNPGMRZPHYSPFHANDLER) pfnPfHandlerRC; /** Explicit alignment padding. */ RTRCPTR RCPtrPadding; @@ -597,5 +597,5 @@ R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3; /** Pointer to R0 callback function for \#PFs. */ - R0PTRTYPE(PFNPGMR0PHYSPFHANDLER) pfnPfHandlerR0; + R0PTRTYPE(PFNPGMRZPHYSPFHANDLER) pfnPfHandlerR0; /** Description / Name. For easing debugging. */ R3PTRTYPE(const char *) pszDesc; @@ -4147,6 +4147,6 @@ void pgmPhysReleaseInternalPageMappingLock(PVM pVM, PPGMPAGEMAPLOCK pLock); #ifndef IN_RING3 -DECLEXPORT(CTX_MID(FNPGM,PHYSPFHANDLER)) pgmPhysPfHandlerRedirectToHC; -DECLEXPORT(CTX_MID(FNPGM,PHYSPFHANDLER)) pgmPhysRomWritePfHandler; +DECLEXPORT(FNPGMRZPHYSPFHANDLER) pgmPhysPfHandlerRedirectToHC; +DECLEXPORT(FNPGMRZPHYSPFHANDLER) pgmPhysRomWritePfHandler; #endif int pgmPhysFreePage(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t *pcPendingPages, PPGMPAGE pPage, RTGCPHYS GCPhys);