Changeset 7715 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

Timestamp:

Apr 3, 2008 9:03:01 AM (17 years ago)

Author:

vboxsync

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

29247

Message:

Renamed PDPTR to PDPT.
Added preliminary code for executing code with X86_CR0_WP cleared (disabled).

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (9 diffs)

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

@@ -388 +388 @@
 #elif PGM_GST_TYPE == PGM_TYPE_PAE
             const unsigned off = GCPhysCR3 & X86_CR3_PAE_PAGE_MASK;
-            pVM->pgm.s.pGstPaePDPTRHC = (R3R0PTRTYPE(PX86PDPTR))((RTHCUINTPTR)HCPtrGuestCR3 | off);
-            pVM->pgm.s.pGstPaePDPTRGC = (GCPTRTYPE(PX86PDPTR))((RTGCUINTPTR)pVM->pgm.s.GCPtrCR3Mapping | off);
+            pVM->pgm.s.pGstPaePDPTHC = (R3R0PTRTYPE(PX86PDPT))((RTHCUINTPTR)HCPtrGuestCR3 | off);
+            pVM->pgm.s.pGstPaePDPTGC = (GCPTRTYPE(PX86PDPT))((RTGCUINTPTR)pVM->pgm.s.GCPtrCR3Mapping | off);
 
             /*
@@ -397 +397 @@
             for (unsigned i = 0; i < 4; i++, GCPtr += PAGE_SIZE)
             {
-                if (pVM->pgm.s.CTXSUFF(pGstPaePDPTR)->a[i].n.u1Present)
+                if (pVM->pgm.s.CTXSUFF(pGstPaePDPT)->a[i].n.u1Present)
                 {
                     RTHCPTR     HCPtr;
                     RTHCPHYS    HCPhys;
-                    RTGCPHYS    GCPhys = pVM->pgm.s.CTXSUFF(pGstPaePDPTR)->a[i].u & X86_PDPE_PG_MASK;
+                    RTGCPHYS    GCPhys = pVM->pgm.s.CTXSUFF(pGstPaePDPT)->a[i].u & X86_PDPE_PG_MASK;
                     int rc2 = pgmRamGCPhys2HCPtrAndHCPhysWithFlags(&pVM->pgm.s, GCPhys, &HCPtr, &HCPhys);
                     if (VBOX_SUCCESS(rc2))
@@ -452 +452 @@
 
 #elif PGM_GST_TYPE == PGM_TYPE_PAE
-    pVM->pgm.s.pGstPaePDPTRHC = 0;
-    pVM->pgm.s.pGstPaePDPTRGC = 0;
+    pVM->pgm.s.pGstPaePDPTHC = 0;
+    pVM->pgm.s.pGstPaePDPTGC = 0;
     /** PAE todo: pVM->pgm.s.apGstPaePDsHC? -> unmap?? */
     AssertFailed();
@@ -529 +529 @@
     for (unsigned i = 0; i < 4; i++)
     {
-        if (CTXSUFF(pVM->pgm.s.pGstPaePDPTR)->a[i].n.u1Present)
-        {
-            RTGCPHYS GCPhys = CTXSUFF(pVM->pgm.s.pGstPaePDPTR)->a[i].u & X86_PDPE_PG_MASK;
+        if (CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[i].n.u1Present)
+        {
+            RTGCPHYS GCPhys = CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[i].u & X86_PDPE_PG_MASK;
 # ifndef PGMPOOL_WITH_MIXED_PT_CR3
             if (pVM->pgm.s.aGCPhysGstPaePDsMonitored[i] != GCPhys)
@@ -970 +970 @@
         for (unsigned i = 0; i < 4; i++)
         {
-            if (    CTXSUFF(pVM->pgm.s.pGstPaePDPTR)->a[i].n.u1Present
-                &&  (   CTXSUFF(pVM->pgm.s.pGstPaePDPTR)->a[i].u & X86_PDPE_PG_MASK)
+            if (    CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[i].n.u1Present
+                &&  (   CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[i].u & X86_PDPE_PG_MASK)
                      != pVM->pgm.s.aGCPhysGstPaePDsMonitored[i])
             {
@@ -986 +986 @@
                 pVM->pgm.s.fSyncFlags |= PGM_SYNC_MONITOR_CR3;
                 Log(("pgmXXGstPaeWriteHandlerCR3: detected updated PDPE; [%d] = %#llx, Old GCPhys=%VGp\n",
-                     i, CTXSUFF(pVM->pgm.s.pGstPaePDPTR)->a[i].u, pVM->pgm.s.aGCPhysGstPaePDsMonitored[i]));
+                     i, CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[i].u, pVM->pgm.s.aGCPhysGstPaePDsMonitored[i]));
             }
         }
@@ -1035 +1035 @@
         RTGCUINTPTR i;
         for (i = 0; i < 4; i++)
-            if (CTXSUFF(pVM->pgm.s.pGstPaePDPTR)->a[i].u == (GCPhysFault & X86_PTE_PAE_PG_MASK))
+            if (CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[i].u == (GCPhysFault & X86_PTE_PAE_PG_MASK))
             {
-                PX86PDPAE           pPDSrc = pgmGstGetPaePD(&pVM->pgm.s, i << X86_PDPTR_SHIFT);
+                PX86PDPAE           pPDSrc = pgmGstGetPaePD(&pVM->pgm.s, i << X86_PDPT_SHIFT);
                 const RTGCUINTPTR offPD  = GCPhysFault & PAGE_OFFSET_MASK;
                 const unsigned      iPD1   = offPD / sizeof(X86PDEPAE);
@@ -1048 +1048 @@
 #ifdef DEBUG
                 Log(("pgmXXGstPaeWriteHandlerPD: emulated change to i=%d iPD1=%#05x (%VGv)\n",
-                     i, iPD1, (i << X86_PDPTR_SHIFT) | (iPD1 << X86_PD_PAE_SHIFT)));
+                     i, iPD1, (i << X86_PDPT_SHIFT) | (iPD1 << X86_PD_PAE_SHIFT)));
                 if (iPD1 != iPD2)
                     Log(("pgmXXGstPaeWriteHandlerPD: emulated change to i=%d iPD2=%#05x (%VGv)\n",
-                         i, iPD2, (i << X86_PDPTR_SHIFT) | (iPD2 << X86_PD_PAE_SHIFT)));
+                         i, iPD2, (i << X86_PDPT_SHIFT) | (iPD2 << X86_PD_PAE_SHIFT)));
 #endif
 
@@ -1057 +1057 @@
                 {
                     if (    (   pPDSrc->a[iPD1].n.u1Present
-                             && pgmGetMapping(pVM, (RTGCPTR)((i << X86_PDPTR_SHIFT) | (iPD1 << X86_PD_PAE_SHIFT))) )
+                             && pgmGetMapping(pVM, (RTGCPTR)((i << X86_PDPT_SHIFT) | (iPD1 << X86_PD_PAE_SHIFT))) )
                         ||  (   iPD1 != iPD2
                              && pPDSrc->a[iPD2].n.u1Present
-                             && pgmGetMapping(pVM, (RTGCPTR)((i << X86_PDPTR_SHIFT) | (iPD2 << X86_PD_PAE_SHIFT))) )
+                             && pgmGetMapping(pVM, (RTGCPTR)((i << X86_PDPT_SHIFT) | (iPD2 << X86_PD_PAE_SHIFT))) )
                        )
                     {