Changeset 13930 in vbox

Timestamp:

Nov 6, 2008 6:43:35 PM (16 years ago)

Author:

vboxsync

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

38953

Message:

PGMMap.cpp: Fixed sign extension issue in pgmR3SyncPTRResolveConflictPAE.

File:

• trunk/src/VBox/VMM/PGMMap.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGMMap.cpp

@@ -970 +970 @@
     {
         unsigned  iPDSrc;
-        PX86PDPAE pPDSrc = pgmGstGetPaePDPtr(&pVM->pgm.s, iPDPTE << X86_PDPT_SHIFT, &iPDSrc);
+        PX86PDPAE pPDSrc = pgmGstGetPaePDPtr(&pVM->pgm.s, (RTGCPTR32)iPDPTE << X86_PDPT_SHIFT, &iPDSrc, NULL);
 
         /*
@@ -1014 +1014 @@
              * Ask for the mapping.
              */
-            RTGCPTR GCPtrNewMapping = (iPDPTE << X86_PDPT_SHIFT) + (iPDNew << X86_PD_PAE_SHIFT);
+            RTGCPTR GCPtrNewMapping = ((RTGCPTR32)iPDPTE << X86_PDPT_SHIFT) + (iPDNew << X86_PD_PAE_SHIFT);
 
             if (pMapping->pfnRelocate(pVM, GCPtrOldMapping, GCPtrNewMapping, PGMRELOCATECALL_SUGGEST, pMapping->pvUser))
@@ -1047 +1047 @@
         return false;
 
-    Assert(PGMGetGuestMode(pVM) <= PGMMODE_PAE_NX);
+    PGMMODE const enmGuestMode = PGMGetGuestMode(pVM);
+    Assert(enmGuestMode <= PGMMODE_PAE_NX);
 
     /*
      * Iterate mappings.
      */
-    if (PGMGetGuestMode(pVM) == PGMMODE_32_BIT)
+    if (enmGuestMode == PGMMODE_32_BIT)
     {
         /*
@@ -1078 +1079 @@
         }
     }
-    else if (   PGMGetGuestMode(pVM) == PGMMODE_PAE
-             || PGMGetGuestMode(pVM) == PGMMODE_PAE_NX)
+    else if (   enmGuestMode == PGMMODE_PAE
+             || enmGuestMode == PGMMODE_PAE_NX)
     {
         for (PPGMMAPPING pCur = pVM->pgm.s.pMappingsR3; pCur; pCur = pCur->pNextR3)