Changeset 16941 in vbox

Timestamp:

Feb 19, 2009 10:14:40 AM (16 years ago)

Author:

vboxsync

Message:

Cleaned up + PAE write fix for 2nd PTE

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -2969 +2969 @@
 void            pgmPoolTrackPhysExtDerefGCPhys(PPGMPOOL pPool, PPGMPOOLPAGE pPoolPage, PPGMPAGE pPhysPage);
 #ifdef PGMPOOL_WITH_MONITORING
-# ifdef IN_RING3
-void            pgmPoolMonitorChainChanging(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTGCPHYS GCPhysFault, RTHCPTR pvAddress, PDISCPUSTATE pCpu);
-# else
-void            pgmPoolMonitorChainChanging(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTGCPHYS GCPhysFault, RTGCPTR pvAddress, PDISCPUSTATE pCpu);
-# endif
+void            pgmPoolMonitorChainChanging(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTGCPHYS GCPhysFault, CTXTYPE(RTGCPTR, RTHCPTR, RTGCPTR) pvAddress, PDISCPUSTATE pCpu);
 int             pgmPoolMonitorChainFlush(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
 void            pgmPoolMonitorModifiedInsert(PPGMPOOL pPool, PPGMPOOLPAGE pPage);

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

@@ -262 +262 @@
  * @param   cbEntry     The entry size.
  */
-#ifdef IN_RING3
-DECLINLINE(const void *) pgmPoolMonitorGCPtr2CCPtr(PPGMPOOL pPool, RTHCPTR pvFault, RTGCPHYS GCPhysFault, const unsigned cbEntry)
-#else
-DECLINLINE(const void *) pgmPoolMonitorGCPtr2CCPtr(PPGMPOOL pPool, RTGCPTR pvFault, RTGCPHYS GCPhysFault, const unsigned cbEntry)
-#endif
+DECLINLINE(const void *) pgmPoolMonitorGCPtr2CCPtr(PPGMPOOL pPool, CTXTYPE(RTGCPTR, RTHCPTR, RTGCPTR) pvFault, RTGCPHYS GCPhysFault, const unsigned cbEntry)
 {
 #ifdef IN_RC
@@ -305 +301 @@
  *                      This need not be specified if the caller knows we won't do cross entry accesses.
  */
-#ifdef IN_RING3
-void pgmPoolMonitorChainChanging(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTGCPHYS GCPhysFault, RTHCPTR pvAddress, PDISCPUSTATE pCpu)
-#else
-void pgmPoolMonitorChainChanging(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTGCPHYS GCPhysFault, RTGCPTR pvAddress, PDISCPUSTATE pCpu)
-#endif
+void pgmPoolMonitorChainChanging(PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTGCPHYS GCPhysFault, CTXTYPE(RTGCPTR, RTHCPTR, RTGCPTR) pvAddress, PDISCPUSTATE pCpu)
 {
     Assert(pPage->iMonitoredPrev == NIL_PGMPOOL_IDX);
@@ -469 +461 @@
                     {
 #  ifdef PGMPOOL_WITH_GCPHYS_TRACKING
-                        PCX86PTEPAE pGstPte = (PCX86PTEPAE)pgmPoolMonitorGCPtr2CCPtr(pPool, pvAddress, GCPhysFault, sizeof(*pGstPte));
+                        PCX86PTEPAE pGstPte = (PCX86PTEPAE)pgmPoolMonitorGCPtr2CCPtr(pPool, 
+                                                                                     (CTXTYPE(RTGCPTR, RTHCPTR, RTGCPTR))((RTGCUINTPTR)pvAddress + sizeof(X86PTEPAE)), 
+                                                                                     GCPhysFault + sizeof(X86PTEPAE), sizeof(*pGstPte));
                         Log4(("pgmPoolMonitorChainChanging pae: deref %016RX64 GCPhys %016RX64\n", uShw.pPTPae->a[iShw2].u & X86_PTE_PAE_PG_MASK, pGstPte->u & X86_PTE_PAE_PG_MASK));
                         pgmPoolTracDerefGCPhysHint(pPool, pPage,