Changeset 41436 in vbox for trunk/src

Timestamp:

May 24, 2012 2:47:09 PM (13 years ago)

Author:

vboxsync

Message:

REM,EM: A20 fixes.

Location:

trunk/src

Files:

• VBox/VMM/VMMR3/EM.cpp (modified) (1 diff)
• recompiler/VBoxRecompiler.c (modified) (5 diffs)
• recompiler/exec-all.h (modified) (1 diff)
• recompiler/target-i386/helper.c (modified) (2 diffs)

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

@@ -1313 +1313 @@
     }
 
-    Assert(PGMPhysIsA20Enabled(pVCpu));
+    /*Assert(PGMPhysIsA20Enabled(pVCpu));*/
     return EMSTATE_RAW;
 #endif /* !IEM_VERIFICATION_MODE */

trunk/src/recompiler/VBoxRecompiler.c

@@ -127 +127 @@
 static STAMPROFILEADV gStatMemWrite;
 static STAMPROFILE    gStatGCPhys2HCVirt;
-static STAMPROFILE    gStatHCVirt2GCPhys;
 static STAMCOUNTER    gStatCpuGetTSC;
 static STAMCOUNTER    gStatRefuseTFInhibit;
@@ -377 +376 @@
     STAM_REG(pVM, &gStatMemRead,            STAMTYPE_PROFILE, "/PROF/REM/MemRead",    STAMUNIT_TICKS_PER_CALL, "Profiling memory access.");
     STAM_REG(pVM, &gStatMemWrite,           STAMTYPE_PROFILE, "/PROF/REM/MemWrite",   STAMUNIT_TICKS_PER_CALL, "Profiling memory access.");
-    STAM_REG(pVM, &gStatHCVirt2GCPhys,      STAMTYPE_PROFILE, "/PROF/REM/HCVirt2GCPhys", STAMUNIT_TICKS_PER_CALL, "Profiling memory conversion.");
-    STAM_REG(pVM, &gStatGCPhys2HCVirt,      STAMTYPE_PROFILE, "/PROF/REM/GCPhys2HCVirt", STAMUNIT_TICKS_PER_CALL, "Profiling memory conversion.");
+    STAM_REG(pVM, &gStatGCPhys2HCVirt,      STAMTYPE_PROFILE, "/PROF/REM/GCPhys2HCVirt", STAMUNIT_TICKS_PER_CALL, "Profiling memory conversion (PGMR3PhysTlbGCPhys2Ptr).");
 
     STAM_REG(pVM, &gStatCpuGetTSC,          STAMTYPE_COUNTER, "/REM/CpuGetTSC",         STAMUNIT_OCCURENCES,     "cpu_get_tsc calls");
@@ -556 +554 @@
     STAM_DEREG(pVM, &gStatMemRead);
     STAM_DEREG(pVM, &gStatMemWrite);
-    STAM_DEREG(pVM, &gStatHCVirt2GCPhys);
     STAM_DEREG(pVM, &gStatGCPhys2HCVirt);
 
@@ -1651 +1648 @@
     }
 
-    Assert(env->pVCpu && PGMPhysIsA20Enabled(env->pVCpu));
+/*    Assert(env->pVCpu && PGMPhysIsA20Enabled(env->pVCpu));*/
     *piException = EXCP_EXECUTE_RAW;
     return true;
@@ -1733 +1730 @@
     int rc;
 
+
     /* Address must be aligned enough to fiddle with lower bits */
     Assert((physAddr & 0x3) == 0);
-
+    /*AssertMsg((env1->a20_mask & physAddr) == physAddr, ("%llx\n", (uint64_t)physAddr));*/
+
+    STAM_PROFILE_START(&gStatGCPhys2HCVirt, a);
     rc = PGMR3PhysTlbGCPhys2Ptr(env1->pVM, physAddr, true /*fWritable*/, &pv);
+    STAM_PROFILE_STOP(&gStatGCPhys2HCVirt, a);
     Assert(   rc == VINF_SUCCESS
            || rc == VINF_PGM_PHYS_TLB_CATCH_WRITE

trunk/src/recompiler/exec-all.h

@@ -349 +349 @@
 {
     int mmu_idx, page_index, pd;
+# ifndef VBOX
     void *p;
+# endif
 
     page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);

trunk/src/recompiler/target-i386/helper.c

@@ -829 +829 @@
     }
  do_mapping:
+#ifndef VBOX
     pte = pte & env->a20_mask;
+#endif
 
     /* Even if 4MB pages, we map only one 4KB page in the cache to
@@ -835 +837 @@
     page_offset = (addr & TARGET_PAGE_MASK) & (page_size - 1);
     paddr = (pte & TARGET_PAGE_MASK) + page_offset;
+#ifdef VBOX
+    paddr &= env->a20_mask;
+#endif
     vaddr = virt_addr + page_offset;