Changeset 80180 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Aug 7, 2019 10:49:36 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132621

Message:

Backing out r132620.

File:

• trunk/src/VBox/VMM/include/PGMInternal.h (modified) (11 diffs)

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -2187 +2187 @@
     /** The VM handle - R0 Ptr. */
     PVMR0                       pVMR0;
+    /** The VM handle - RC Ptr. */
+    PVMRC                       pVMRC;
     /** The max pool size. This includes the special IDs. */
     uint16_t                    cMaxPages;
@@ -2201 +2203 @@
     /** The number of present page table entries in the entire pool. */
     uint32_t                    cPresent;
+    /** Pointer to the array of user nodes - RC pointer. */
+    RCPTRTYPE(PPGMPOOLUSER)     paUsersRC;
     /** Pointer to the array of user nodes - R3 pointer. */
     R3PTRTYPE(PPGMPOOLUSER)     paUsersR3;
@@ -2209 +2213 @@
     /** The number of user nodes we've allocated. */
     uint16_t                    cMaxPhysExts;
-    uint32_t                    u32Padding0b;
+    /** Pointer to the array of physical xref extent - RC pointer. */
+    RCPTRTYPE(PPGMPOOLPHYSEXT)  paPhysExtsRC;
     /** Pointer to the array of physical xref extent nodes - R3 pointer. */
     R3PTRTYPE(PPGMPOOLPHYSEXT)  paPhysExtsR3;
@@ -3194 +3199 @@
     R0PTRTYPE(PPGMREGMMIORANGE)     apMmio2RangesR0[PGM_MMIO2_MAX_RANGES];
 
+    /** RAM range TLB for RC. */
+    RCPTRTYPE(PPGMRAMRANGE)         apRamRangesTlbRC[PGM_RAMRANGE_TLB_ENTRIES];
+    /** RC pointer corresponding to PGM::pRamRangesXR3. */
+    RCPTRTYPE(PPGMRAMRANGE)         pRamRangesXRC;
+    /** Root of the RAM range search tree for raw-mode context. */
+    RCPTRTYPE(PPGMRAMRANGE)         pRamRangeTreeRC;
+    /** PGM offset based trees - RC Ptr. */
+    RCPTRTYPE(PPGMTREES)            pTreesRC;
+    /** Caching the last physical handler we looked up in RC. */
+    RCPTRTYPE(PPGMPHYSHANDLER)      pLastPhysHandlerRC;
+    /** Shadow Page Pool - RC Ptr. */
+    RCPTRTYPE(PPGMPOOL)             pPoolRC;
+#ifndef PGM_WITHOUT_MAPPINGS
+    /** Linked list of GC mappings - for RC.
+     * The list is sorted ascending on address. */
+    RCPTRTYPE(PPGMMAPPING)          pMappingsRC;
+    RTRCPTR                         RCPtrAlignment0;
+#endif
+    /** RC pointer corresponding to PGM::pRomRangesR3. */
+    RCPTRTYPE(PPGMROMRANGE)         pRomRangesRC;
+#ifndef PGM_WITHOUT_MAPPINGS
+    /** Pointer to the page table entries for the dynamic page mapping area - GCPtr. */
+    RCPTRTYPE(PX86PTE)              paDynPageMap32BitPTEsGC;
+    /** Pointer to the page table entries for the dynamic page mapping area - GCPtr. */
+    RCPTRTYPE(PPGMSHWPTEPAE)        paDynPageMapPaePTEsGC;
+#endif
+
+
 #ifndef PGM_WITHOUT_MAPPINGS
     /** Pointer to the 5 page CR3 content mapping.
@@ -3246 +3279 @@
     uint32_t                        cDeprecatedPageLocks;
     /** Alignment padding. */
-    uint32_t                        au32Alignment2[1];
+    uint32_t                        au32Alignment2[3];
 
 
@@ -3433 +3466 @@
     R3PTRTYPE(PGMSTATS *)           pStatsR3;
     R0PTRTYPE(PGMSTATS *)           pStatsR0;
+    RCPTRTYPE(PGMSTATS *)           pStatsRC;
+    RTRCPTR                         RCPtrAlignment;
     /** @} */
 #endif
@@ -3719 +3754 @@
     R0PTRTYPE(PX86PD)               pGst32BitPdR0;
 #endif
+    /** The guest's page directory, static RC mapping. */
+    RCPTRTYPE(PX86PD)               pGst32BitPdRC;
     /** Mask containing the MBZ bits of a big page PDE. */
     uint32_t                        fGst32BitMbzBigPdeMask;
@@ -3729 +3766 @@
     /** @name PAE Guest Paging.
      * @{ */
+    /** The guest's page directory pointer table, static RC mapping. */
+    RCPTRTYPE(PX86PDPT)             pGstPaePdptRC;
     /** The guest's page directory pointer table, R3 pointer. */
     R3PTRTYPE(PX86PDPT)             pGstPaePdptR3;
@@ -3745 +3784 @@
     R0PTRTYPE(PX86PDPAE)            apGstPaePDsR0[4];
 #endif
+    /** The guest's page directories, static GC mapping.
+     * Unlike the R3/R0 array the first entry can be accessed as a 2048 entry PD.
+     * These don't have to be up-to-date - use pgmGstGetPaePD() to access them. */
+    RCPTRTYPE(PX86PDPAE)            apGstPaePDsRC[4];
     /** The physical addresses of the guest page directories (PAE) pointed to by apGstPagePDsHC/GC.
      * @todo Remove this and use aGstPaePdpeRegs instead? */
@@ -3806 +3849 @@
     /** Pointer to the page of the current active CR3 - R0 Ptr. */
     R0PTRTYPE(PPGMPOOLPAGE)         pShwPageCR3R0;
+    /** Pointer to the page of the current active CR3 - RC Ptr. */
+    RCPTRTYPE(PPGMPOOLPAGE)         pShwPageCR3RC;
+    /** Explicit alignment. */
+    RTRCPTR                         alignment6;
     /** @} */
 
@@ -3829 +3876 @@
     /** @name Statistics
      * @{ */
+    /** RC: Pointer to the statistics. */
+    RCPTRTYPE(PGMCPUSTATS *)        pStatsRC;
+    /** RC: Which statistic this \#PF should be attributed to. */
+    RCPTRTYPE(PSTAMPROFILE)         pStatTrap0eAttributionRC;
     /** R0: Pointer to the statistics. */
     R0PTRTYPE(PGMCPUSTATS *)        pStatsR0;