Changeset 26218 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 3, 2010 9:24:13 PM (15 years ago)

Author:

vboxsync

Message:

*.kmk: Started renaming templated from all caps to CamelCase. At the same time preparing to make warnings errors (VBOX_WITH_WARNINGS_AS_ERRORS=1 to LocalConfig.kmk)

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (4 diffs)
• VMMAll/PGMAllBth.h (modified) (3 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -32 +32 @@
 LIBRARIES += VMMR3
 
-VMMR3_TEMPLATE  = VBOXR3
+VMMR3_TEMPLATE  = VBoxR3Dll
 
 VMMR3_DEFS      = IN_VMM_R3 IN_DIS IN_GMM_R3 IN_DBG
@@ -208 +208 @@
 #
 DLLS += VBoxVMM
-VBoxVMM_TEMPLATE = VBOXR3
+VBoxVMM_TEMPLATE = VBoxR3Dll
 VBoxVMM_DEFS = $(VMMR3_DEFS)
 VBoxVMM_DEFS.$(KBUILD_TARGET) = $(VMMR3_DEFS.$(KBUILD_TARGET))
@@ -297 +297 @@
  #
  LIBRARIES += VMMR0Imp
- VMMR0Imp_TEMPLATE = VBOXR0
+ VMMR0Imp_TEMPLATE = VBoxR0
  VMMR0Imp_SOURCES  = $(PATH_VMMR0Imp)/VMMR0.def
  VMMR0Imp_CLEAN    = $(PATH_VMMR0Imp)/VMMR0.def
@@ -437 +437 @@
 #
 SYSMODS += VMMR0
-VMMR0_TEMPLATE  = VBOXR0
+VMMR0_TEMPLATE  = VBoxR0
 VMMR0_SYSSUFF   = .r0
 

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

@@ -1052 +1052 @@
     }
 
-    /* Fetch the pgm pool shadow descriptor. */ 
-    PPGMPOOLPAGE pShwPde = pgmPoolGetPage(pPool, pPdptDst->a[iPdpt].u & SHW_PDPE_PG_MASK); 
-    Assert(pShwPde); 
+    /* Fetch the pgm pool shadow descriptor. */
+    PPGMPOOLPAGE pShwPde = pgmPoolGetPage(pPool, pPdptDst->a[iPdpt].u & SHW_PDPE_PG_MASK);
+    Assert(pShwPde);
 
 # endif /* PGM_SHW_TYPE == PGM_TYPE_AMD64 */
@@ -2195 +2195 @@
     Log(("CheckPageFault: real page fault at %RGv (%d)\n", GCPtrPage, uPageFaultLevel));
 
-    if (
+    if (    1
 #  if PGM_GST_TYPE == PGM_TYPE_AMD64
-            pPml4eSrc->n.u1Present &&
+         && pPml4eSrc->n.u1Present
 #  endif
 #  if PGM_GST_TYPE == PGM_TYPE_AMD64 || PGM_GST_TYPE == PGM_TYPE_PAE
-            pPdpeSrc->n.u1Present  &&
+         && pPdpeSrc->n.u1Present
 #  endif
-            pPdeSrc->n.u1Present)
+         && pPdeSrc->n.u1Present)
     {
         /* Check the present bit as the shadow tables can cause different error codes by being out of sync. */
@@ -2218 +2218 @@
              * Map the guest page table.
              */
-            PGSTPT pPTSrc;
-            rc = PGM_GCPHYS_2_PTR(pVM, pPdeSrc->u & GST_PDE_PG_MASK, &pPTSrc);
+            PGSTPT pPTSrc2;
+            rc = PGM_GCPHYS_2_PTR(pVM, pPdeSrc->u & GST_PDE_PG_MASK, &pPTSrc2);
             if (RT_SUCCESS(rc))
             {
-                PGSTPTE         pPteSrc = &pPTSrc->a[(GCPtrPage >> GST_PT_SHIFT) & GST_PT_MASK];
-                const GSTPTE    PteSrc = *pPteSrc;
+                PGSTPTE pPteSrc = &pPTSrc2->a[(GCPtrPage >> GST_PT_SHIFT) & GST_PT_MASK];
                 if (pPteSrc->n.u1Present)
                     TRPMSetErrorCode(pVCpu, uErr | X86_TRAP_PF_P); /* page-level protection violation */