Changeset 91249 in vbox

Timestamp:

Sep 15, 2021 12:37:46 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Kicked out unused structure offset members. bugref:9517

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PGM.cpp (modified) (3 diffs)
• include/PGMInternal.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -760 +760 @@
      * Init the structure.
      */
-    pVM->pgm.s.offVM       = RT_UOFFSETOF(VM, pgm.s);
-    pVM->pgm.s.offVCpuPGM  = RT_UOFFSETOF(VMCPU, pgm.s);
     /*pVM->pgm.s.fRestoreRomPagesAtReset = false;*/
 
@@ -783 +781 @@
         PVMCPU pVCpu = pVM->apCpusR3[idCpu];
         PPGMCPU pPGM = &pVCpu->pgm.s;
-
-        pPGM->offVM      = (uintptr_t)&pVCpu->pgm.s - (uintptr_t)pVM;
-        pPGM->offVCpu    = RT_UOFFSETOF(VMCPU, pgm.s);
-        pPGM->offPGM     = (uintptr_t)&pVCpu->pgm.s - (uintptr_t)&pVM->pgm.s;
 
         pPGM->enmShadowMode     = PGMMODE_INVALID;
@@ -2725 +2719 @@
 VMMR3DECL(int) PGMR3CheckIntegrity(PVM pVM)
 {
-    AssertReleaseReturn(pVM->pgm.s.offVM, VERR_INTERNAL_ERROR);
-
     /*
      * Check the trees.

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

@@ -2911 +2911 @@
 
 /**
- * Converts a PGM pointer into a VM pointer.
- * @returns Pointer to the VM structure the PGM is part of.
- * @param   pPGM   Pointer to PGM instance data.
- */
-#define PGM2VM(pPGM)  ( (PVM)((char*)pPGM - pPGM->offVM) )
-
-/**
  * PGM Data (part of VM)
  */
 typedef struct PGM
 {
-    /** Offset to the VM structure. */
-    int32_t                         offVM;
-    /** Offset of the PGMCPU structure relative to VMCPU. */
-    int32_t                         offVCpuPGM;
-
     /** @cfgm{/RamPreAlloc, boolean, false}
      * Indicates whether the base RAM should all be allocated before starting
@@ -3103 +3091 @@
     uint32_t                        cDeprecatedPageLocks;
     /** Alignment padding. */
-    uint32_t                        au32Alignment2[1];
+    uint32_t                        au32Alignment2[1+2];
 
 
@@ -3307 +3295 @@
 
 #ifdef VBOX_WITH_STATISTICS
+/**
+ * Per CPU statistis for PGM (used to be on the heap).
+ */
 typedef struct PGMCPUSTATS
 {
@@ -3496 +3487 @@
 
 /**
- * Converts a PGMCPU pointer into a VM pointer.
- * @returns Pointer to the VM structure the PGM is part of.
- * @param   pPGM    Pointer to PGMCPU instance data.
- */
-#define PGMCPU2VM(pPGM)         ( (PVM)((char*)(pPGM) - (pPGM)->offVM) )
-
-/**
- * Converts a PGMCPU pointer into a PGM pointer.
- * @returns Pointer to the VM structure the PGM is part of.
- * @param   pPGMCpu Pointer to PGMCPU instance data.
- */
-#define PGMCPU2PGM(pPGMCpu)     ( (PPGM)((char *)(pPGMCpu) - (pPGMCpu)->offPGM) )
-
-/**
  * PGMCPU Data (part of VMCPU).
  */
 typedef struct PGMCPU
 {
-    /** Offset to the VM structure. */
-    int32_t                         offVM;
-    /** Offset to the VMCPU structure. */
-    int32_t                         offVCpu;
-    /** Offset of the PGM structure relative to VMCPU. */
-    int32_t                         offPGM;
-    uint32_t                        uPadding0;      /**< structure size alignment. */
-
     /** A20 gate mask.
      * Our current approach to A20 emulation is to let REM do it and don't bother