Changeset 41393 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

May 22, 2012 2:23:13 PM (13 years ago)

Author:

vboxsync

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

78102

Message:

PGM: Initialize the A20 mask correctly.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PGM.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (1 diff)
• PGMSavedState.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -1251 +1251 @@
 
         pPGM->fA20Enabled      = true;
+        pPGM->GCPhysA20Mask    = ~(RTGCPHYS)(!pPGM->fA20Enabled << 20);
     }
 

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -3391 +3391 @@
     Log5(("pgmR3PhysRomWriteHandler: %d %c %#08RGp %#04zx\n", pRomPage->enmProt, enmAccessType == PGMACCESSTYPE_READ ? 'R' : 'W', GCPhys, cbBuf));
     NOREF(pvPhys);
+RTLogPrintf("pgmPhysRomWriteHandler: enmAccessType=%d GCPhys=%RGp\n", (uint32_t)enmAccessType, GCPhys);
 
     if (enmAccessType == PGMACCESSTYPE_READ)

trunk/src/VBox/VMM/VMMR3/PGMSavedState.cpp

@@ -3017 +3017 @@
 
     /*
+     * Fix the A20 mask.
+     */
+    for (VMCPUID i = 0; i < pVM->cCpus; i++)
+        pVM->aCpus[i].pgm.s.GCPhysA20Mask = ~(RTGCPHYS)(!pVM->aCpus[i].pgm.s.fA20Enabled << 20);
+
+    /*
      * The guest mappings - skipped now, see re-fixation in the caller.
      */