Changeset 7719 in vbox

Timestamp:

Apr 3, 2008 12:03:36 PM (17 years ago)

Author:

vboxsync

Message:

pgmGstGetPaePDPtr.

Location:

trunk/src/VBox/VMM

Files:

• CFGM.cpp (modified) (2 diffs)
• PGMInternal.h (modified) (3 diffs)
• VMMAll/PGMAllBth.h (modified) (6 diffs)

trunk/src/VBox/VMM/CFGM.cpp

@@ -773 +773 @@
     rc = CFGMR3InsertBytes(pCfg,    "UUID", &Uuid, sizeof(Uuid));
     UPDATERC();
-    /* Bios logo. */
-    rc = CFGMR3InsertInteger(pCfg,  "FadeIn",               1);
-    UPDATERC();
-    rc = CFGMR3InsertInteger(pCfg,  "FadeOut",              1);
-    UPDATERC();
-    rc = CFGMR3InsertInteger(pCfg,  "LogoTime",             0);
-    UPDATERC();
-    rc = CFGMR3InsertString(pCfg,   "LogoFile",             "");
-    UPDATERC();
 
     /*
@@ -886 +877 @@
     rc = CFGMR3InsertInteger(pCfg,  "VRamSize",             4 * _1M);
     UPDATERC();
+
+    /* Bios logo. */
+    rc = CFGMR3InsertInteger(pCfg,  "FadeIn",               1);
+    UPDATERC();
+    rc = CFGMR3InsertInteger(pCfg,  "FadeOut",              1);
+    UPDATERC();
+    rc = CFGMR3InsertInteger(pCfg,  "LogoTime",             0);
+    UPDATERC();
+    rc = CFGMR3InsertString(pCfg,   "LogoFile",             "");
+    UPDATERC();
+
 #if 0
     rc = CFGMR3InsertNode(pInst,    "LUN#0", &pLunL0);

trunk/src/VBox/VMM/PGMInternal.h

@@ -918 +918 @@
 #if GC_ARCH_BITS == 32
     /** Pointer alignment. */
-    RTGCPTR                             GCPtrAlignment; 
+    RTGCPTR                             GCPtrAlignment;
 #endif
     /** Start of the range. Page aligned. */
@@ -3268 +3268 @@
 
 /**
- * Gets the page directory for the specified address and returns the index into the page directory
+ * Gets the page directory pointer table entry for the specified address
+ * and returns the index into the page directory
  *
  * @returns Pointer to the page directory in question.
@@ -3276 +3277 @@
  * @param   piPD        Receives the index into the returned page directory
  */
-DECLINLINE(PX86PDPAE) pgmGstGetPaePDPt(PPGM pPGM, RTGCUINTPTR GCPtr, unsigned *piPD)
+DECLINLINE(PX86PDPAE) pgmGstGetPaePDPtr(PPGM pPGM, RTGCUINTPTR GCPtr, unsigned *piPD)
 {
     const unsigned iPdPt = GCPtr >> X86_PDPT_SHIFT;

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

@@ -94 +94 @@
 #  else /* PAE */
     unsigned        iPDSrc;
-    PGSTPD          pPDSrc = pgmGstGetPaePDPt(&pVM->pgm.s, (RTGCUINTPTR)pvFault, &iPDSrc);
+    PGSTPD          pPDSrc = pgmGstGetPaePDPtr(&pVM->pgm.s, (RTGCUINTPTR)pvFault, &iPDSrc);
 #  endif
 # else
@@ -523 +523 @@
 
             /* Check to see if we need to emulate the instruction as X86_CR0_WP has been cleared. */
-            if (    CPUMGetGuestCPL(pVM, pRegFrame) == 0                
+            if (    CPUMGetGuestCPL(pVM, pRegFrame) == 0
                 &&  ((CPUMGetGuestCR0(pVM) & (X86_CR0_WP|X86_CR0_PG)) == X86_CR0_PG)
                 &&  (uErr & X86_TRAP_PF_RW))
@@ -822 +822 @@
 #  else /* PAE */
     unsigned        iPDSrc;
-    PX86PDPAE       pPDSrc      = pgmGstGetPaePDPt(&pVM->pgm.s, GCPtrPage, &iPDSrc);
+    PX86PDPAE       pPDSrc      = pgmGstGetPaePDPtr(&pVM->pgm.s, GCPtrPage, &iPDSrc);
     GSTPDE          PdeSrc      = pPDSrc->a[iPDSrc];
 #  endif
@@ -2305 +2305 @@
 #  else /* PAE */
     unsigned        iPDSrc;
-    PGSTPD          pPDSrc = pgmGstGetPaePDPt(&pVM->pgm.s, GCPtrPage, &iPDSrc);
+    PGSTPD          pPDSrc = pgmGstGetPaePDPtr(&pVM->pgm.s, GCPtrPage, &iPDSrc);
 #  endif
     const GSTPDE    PdeSrc = pPDSrc->a[iPDSrc];
@@ -2395 +2395 @@
 #  else /* PAE */
     unsigned        iPDSrc;
-    PGSTPD          pPDSrc = pgmGstGetPaePDPt(&pVM->pgm.s, GCPtrPage, &iPDSrc);
+    PGSTPD          pPDSrc = pgmGstGetPaePDPtr(&pVM->pgm.s, GCPtrPage, &iPDSrc);
 #  endif
 # else
@@ -2609 +2609 @@
 #   endif
         PX86PDEPAE      pPDEDst   = &pPDPAE->a[0];
-        PGSTPD          pPDSrc    = pgmGstGetPaePDPt(&pVM->pgm.s, iPDPTE << X86_PDPT_SHIFT, &iPDSrc);
+        PGSTPD          pPDSrc    = pgmGstGetPaePDPtr(&pVM->pgm.s, iPDPTE << X86_PDPT_SHIFT, &iPDSrc);
 
         if (pPDSrc == NULL)