Changeset 86478 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 7, 2020 10:00:32 PM (4 years ago)

Author:

vboxsync

Message:

VMM/PGM: Working on eliminating page table bitfield use. [debug build fix] bugref:9841 bugref:9746

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (7 diffs)

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

@@ -1250 +1250 @@
                     PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], PdeSrc, PteSrc, pShwPage, iPTDst);
                     Log2(("SyncPage: 4K  %RGv PteSrc:{P=%d RW=%d U=%d raw=%08llx} PteDst=%08llx %s\n",
-                            GCPtrPage, PteSrc.n.u1Present,
-                            PteSrc.n.u1Write & PdeSrc.n.u1Write,
-                            PteSrc.n.u1User  & PdeSrc.n.u1User,
+                            GCPtrPage, PteSrc.u & X86_PTE_P,
+                            (PteSrc.u & PdeSrc.u & X86_PTE_RW),
+                            (PteSrc.u & PdeSrc.u & X86_PTE_US),
                             (uint64_t)PteSrc.u,
                             SHW_PTE_LOG64(pPTDst->a[iPTDst]),
@@ -1934 +1934 @@
                                 PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], PdeSrc, *pPteSrc, pShwPage, iPTDst);
                                 Log2(("SyncPage: 4K+ %RGv PteSrc:{P=%d RW=%d U=%d raw=%08llx} PteDst=%08llx%s\n",
-                                      GCPtrCurPage, pPteSrc->n.u1Present,
-                                      pPteSrc->n.u1Write & PdeSrc.n.u1Write,
-                                      pPteSrc->n.u1User  & PdeSrc.n.u1User,
+                                      GCPtrCurPage, pPteSrc->u & X86_PTE_P,
+                                      !!(pPteSrc->u & PdeSrc.u & X86_PTE_RW),
+                                      !!(pPteSrc->u & PdeSrc.u & X86_PTE_US),
                                       (uint64_t)pPteSrc->u,
                                       SHW_PTE_LOG64(pPTDst->a[iPTDst]),
@@ -1951 +1951 @@
                         PGM_BTH_NAME(SyncPageWorker)(pVCpu, &pPTDst->a[iPTDst], PdeSrc, PteSrc, pShwPage, iPTDst);
                         Log2(("SyncPage: 4K  %RGv PteSrc:{P=%d RW=%d U=%d raw=%08llx} PteDst=%08llx %s\n",
-                              GCPtrPage, PteSrc.n.u1Present,
-                              PteSrc.n.u1Write & PdeSrc.n.u1Write,
-                              PteSrc.n.u1User  & PdeSrc.n.u1User,
+                              GCPtrPage, PteSrc.u & X86_PTE_P,
+                              !!(PteSrc.u & PdeSrc.u & X86_PTE_RW),
+                              !!(PteSrc.u & PdeSrc.u & X86_PTE_US),
                               (uint64_t)PteSrc.u,
                               SHW_PTE_LOG64(pPTDst->a[iPTDst]),
@@ -2051 +2051 @@
                     SHW_PDE_ATOMIC_SET2(*pPdeDst, PdeDst);
                     Log2(("SyncPage: BIG %RGv PdeSrc:{P=%d RW=%d U=%d raw=%08llx} GCPhys=%RGp%s\n",
-                          GCPtrPage, PdeSrc.n.u1Present, PdeSrc.n.u1Write, PdeSrc.n.u1User, (uint64_t)PdeSrc.u, GCPhys,
-                          PdeDst.u & PGM_PDFLAGS_TRACK_DIRTY ? " Track-Dirty" : ""));
+                          GCPtrPage, PdeSrc.u & X86_PDE_P, !!(PdeSrc.u & X86_PDE_RW), !!(PdeSrc.u & X86_PDE_US),
+                          (uint64_t)PdeSrc.u, GCPhys, PdeDst.u & PGM_PDFLAGS_TRACK_DIRTY ? " Track-Dirty" : ""));
                 }
                 else
@@ -2683 +2683 @@
              */
             Log2(("SyncPT:   4K  %RGv PdeSrc:{P=%d RW=%d U=%d raw=%08llx}\n",
-                  GCPtrPage, PdeSrc.b.u1Present, PdeSrc.b.u1Write, PdeSrc.b.u1User, (uint64_t)PdeSrc.u));
+                  GCPtrPage, PdeSrc.u & X86_PTE_P, !!(PdeSrc.u & X86_PTE_RW), !!(PdeSrc.u & X86_PDE_US), (uint64_t)PdeSrc.u));
             PGSTPT pPTSrc;
             rc = PGM_GCPHYS_2_PTR(pVM, GST_GET_PDE_GCPHYS(PdeSrc), &pPTSrc);
@@ -2740 +2740 @@
                         Log2(("SyncPT:   4K+ %RGv PteSrc:{P=%d RW=%d U=%d raw=%08llx}%s dst.raw=%08llx iPTSrc=%x PdeSrc.u=%x physpte=%RGp\n",
                               GCPtrCur,
-                              PteSrc.n.u1Present,
-                              PteSrc.n.u1Write & PdeSrc.n.u1Write,
-                              PteSrc.n.u1User  & PdeSrc.n.u1User,
+                              PteSrc.u & X86_PTE_P,
+                              !!(PteSrc.u & PdeSrc.u & X86_PTE_RW),
+                              !!(PteSrc.u & PdeSrc.u & X86_PTE_US),
                               (uint64_t)PteSrc.u,
                               SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : "", SHW_PTE_LOG64(pPTDst->a[iPTDst]), iPTSrc, PdeSrc.au32[0],
@@ -2801 +2801 @@
             const RTGCPTR   GCPtr  = (GCPtrPage >> SHW_PD_SHIFT) << SHW_PD_SHIFT; NOREF(GCPtr);
             Log2(("SyncPT:   BIG %RGv PdeSrc:{P=%d RW=%d U=%d raw=%08llx} Shw=%RGv GCPhys=%RGp %s\n",
-                  GCPtrPage, PdeSrc.b.u1Present, PdeSrc.b.u1Write, PdeSrc.b.u1User, (uint64_t)PdeSrc.u, GCPtr,
+                  GCPtrPage, PdeSrc.u & X86_PDE_P, !!(PdeSrc.u & X86_PDE_RW), !!(PdeSrc.u & X86_PDE_US), (uint64_t)PdeSrc.u, GCPtr,
                   GCPhys, PdeDst.u & PGM_PDFLAGS_TRACK_DIRTY ? " Track-Dirty" : ""));
             PPGMRAMRANGE    pRam   = pgmPhysGetRangeAtOrAbove(pVM, GCPhys);