Changeset 108134 in vbox

Timestamp:

Feb 10, 2025 11:43:35 AM (2 months ago)

Author:

vboxsync

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

167435

Message:

VMM/PGM: Merge and deduplicate code targeting x86 & amd64 in PGM.cpp. Don't bother compiling pool stuff on arm and darwin.amd64. jiraref:VBP-1531

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (3 diffs)
• VMMAll/PGMAllBth.h (modified) (1 diff)
• VMMR3/PGM-armv8.cpp (deleted)
• include/PGMInternal.h (modified) (5 diffs)
• testcase/tstVMStructSize.cpp (modified) (1 diff)

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

@@ -65 +65 @@
 #ifdef VBOX_VMM_TARGET_X86
 DECLINLINE(int) pgmShwGetLongModePDPtr(PVMCPUCC pVCpu, RTGCPTR64 GCPtr, PX86PML4E *ppPml4e, PX86PDPT *ppPdpt, PX86PDPAE *ppPD);
+# ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
 DECLINLINE(int) pgmShwGetPaePoolPagePD(PVMCPUCC pVCpu, RTGCPTR GCPtr, PPGMPOOLPAGE *ppShwPde);
+# endif
 DECLINLINE(int) pgmGstMapCr3(PVMCPUCC pVCpu, RTGCPHYS GCPhysCr3, PRTHCPTR pHCPtrGuestCr3);
 # ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
@@ -4048 +4050 @@
         }
 
+# ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
         if (IS_PART_INCLUDED(6))
         {
@@ -4055 +4058 @@
             cch += RTStrFormatNumber(&szTmp[cch], PGM_PAGE_GET_TD_IDX_NA(pPage), 16, 4, 0, RTSTR_F_ZEROPAD | RTSTR_F_16BIT);
         }
+# endif
 # undef IS_PART_INCLUDED
 

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -4217 +4217 @@
     return 0;
 #else
-    unsigned cErrors = 0;
-    PVMCC    pVM     = pVCpu->CTX_SUFF(pVM);
-    PPGMPOOL pPool   = pVM->pgm.s.CTX_SUFF(pPool); NOREF(pPool);
+    unsigned       cErrors = 0;
+    PVMCC const    pVM     = pVCpu->CTX_SUFF(pVM); RT_NOREF(pVM);
+# ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
+    PPGMPOOL const pPool   = pVM->pgm.s.CTX_SUFF(pPool); NOREF(pPool);
+# endif
 
 # if PGM_GST_TYPE == PGM_TYPE_PAE

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

@@ -1909 +1909 @@
 /** @} */
 
+
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE /* No pool in NEM-only mode! */
 
 /** @name PGM Pool Indexes.
@@ -2509 +2511 @@
 /** @} */
 
+#endif /* !VBOX_WITH_ONLY_PGM_NEM_MODE - No pool in NEM-only mode! */
+
 
 
@@ -3147 +3151 @@
     /** RAM range TLB for R3. */
     R3PTRTYPE(PPGMRAMRANGE)         apRamRangesTlb[PGM_RAMRANGE_TLB_ENTRIES];
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     /** Shadow Page Pool - R3 Ptr. */
     R3PTRTYPE(PPGMPOOL)             pPoolR3;
-
+#else
+    RTR3PTR                         ReservedPoolR3;
+#endif
+
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     /** Shadow Page Pool - R0 Ptr. */
     R0PTRTYPE(PPGMPOOL)             pPoolR0;
+#else
+    RTR0PTR                         ReservedPoolR0;
+#endif
 
     /** Hack: Number of deprecated page mapping locks taken by the current lock
@@ -3859 +3871 @@
     /** @} */
 
+# ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     /** @name PGM Pool related stuff.
      * @{ */
@@ -3868 +3881 @@
     RTR0MEMOBJ                      ahPoolMapObjs[(PGMPOOL_IDX_LAST + PGMPOOL_CFG_MAX_GROW - 1) / PGMPOOL_CFG_MAX_GROW];
     /** @} */
+# endif
 
     /** Physical access handler types for ring-0.

trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

@@ -322 +322 @@
     CHECK_MEMBER_ALIGNMENT(PGMCPU, Dis, 8);
     CHECK_MEMBER_ALIGNMENT(PGMCPU, cPoolAccessHandler, 8);
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     CHECK_MEMBER_ALIGNMENT(PGMPOOLPAGE, idx, sizeof(uint16_t));
     CHECK_MEMBER_ALIGNMENT(PGMPOOLPAGE, pvPageR3, sizeof(RTHCPTR));
     CHECK_MEMBER_ALIGNMENT(PGMPOOLPAGE, GCPhys, sizeof(RTGCPHYS));
+#endif
     CHECK_SIZE(PGMPAGE, 16);
     CHECK_MEMBER_ALIGNMENT(PGMRAMRANGE, aPages, 16);