Changeset 14974 in vbox

Timestamp:

Dec 4, 2008 12:45:43 PM (16 years ago)

Author:

vboxsync

Message:

reenabled VA in TLB code

Location:

trunk/src

Files:

• VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (1 diff)
• recompiler_new/Makefile.kmk (modified) (1 diff)
• recompiler_new/VBoxRecompiler.c (modified) (2 diffs)
• recompiler_new/exec.c (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -932 +932 @@
 VMMDECL(int) PGMPhysGCPhys2R3PtrEx(PVM pVM, RTGCPHYS GCPhys, RTGCPTR GCPtr, uint32_t flags, PRTR3PTR pR3Ptr)
 {
-  RTR3PTR va;
   int rc;
 
-  if (flags & PGMPHYS_TRANSLATION_FLAG_CHECK_PHYS_MONITORED)
+  rc = PGMPhysGCPhys2R3Ptr(pVM, GCPhys, 1, pR3Ptr);
+
+  if (RT_SUCCESS(rc) && (flags & PGMPHYS_TRANSLATION_FLAG_CHECK_PHYS_MONITORED))
   {
     /* Check if there's a physical handler for PA */
       if (PGMHandlerPhysicalIsRegistered(pVM, GCPhys))
-        return VERR_PGM_PHYS_PAGE_RESERVED;
+        rc = VERR_PGM_PHYS_PAGE_RESERVED;
   }
 
-  if (flags & PGMPHYS_TRANSLATION_FLAG_CHECK_VIRT_MONITORED)
+  if (RT_SUCCESS(rc) && (flags & PGMPHYS_TRANSLATION_FLAG_CHECK_VIRT_MONITORED))
   {
     /* Check if there's a virtual handler for VA */
     if (PGMHandlerVirtualIsRegistered(pVM, GCPtr))
-        return VERR_PGM_PHYS_PAGE_RESERVED;
+        rc = VERR_PGM_PHYS_PAGE_RESERVED;
   }
-
-  rc = PGMPhysGCPhys2R3Ptr(pVM, GCPhys, 1, &va);
-  
-  if (RT_FAILURE(rc))
-      return rc;
-
-  *pR3Ptr = va;
 
   return rc;

trunk/src/recompiler_new/Makefile.kmk

@@ -70 +70 @@
 #
 $(REM_MOD)_DEFS             = IN_REM_R3 REM_INCLUDE_CPU_H
-$(REM_MOD)_DEFS            += REM_PHYS_ADDR_IN_TLB
+#$(REM_MOD)_DEFS            += REM_PHYS_ADDR_IN_TLB
 $(REM_MOD)_DEFS            += VBOX_WITH_NEW_RECOMPILER
 #$(REM_MOD)_DEFS           += DEBUG_ALL_LOGGING DEBUG_DISAS DEBUG_PCALL DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -638 +638 @@
     }
     else
-    {
-        AssertMsgFailed(("Damn, this shouldn't happen! cpu_exec returned %d while singlestepping\n", rc));
+    {        
         switch (rc)
         {
@@ -1404 +1403 @@
     if (rc == VERR_PGM_PHYS_PAGE_RESERVED)
     {
-      return (void*)-1;
+        rv = (void*)((uintptr_t)rv | 1);
+        rc = 0;
     }
     Assert (RT_SUCCESS(rc));

trunk/src/recompiler_new/exec.c

@@ -1972 +1972 @@
 {
     unsigned long addr;
+
+#ifdef VBOX
+    if (start & 1)
+        return;
+#endif
     if ((tlb_entry->addr_write & ~TARGET_PAGE_MASK) == IO_MEM_RAM) {
         addr = (tlb_entry->addr_write & TARGET_PAGE_MASK) + tlb_entry->addend;
@@ -2193 +2198 @@
 
     code_address = address;
+
+#ifdef VBOX
+#  if !defined(REM_PHYS_ADDR_IN_TLB)
+    if (addend & 0x1)
+    {
+        addend &= ~(target_ulong)0x1;
+        if ((pd & ~TARGET_PAGE_MASK) == IO_MEM_RAM)
+        {
+            address |= TLB_MMIO;
+            iotlb = (pd & ~TARGET_PAGE_MASK) + paddr +env->pVM->rem.s.iHandlerMemType;
+        }
+    }
+#  endif
+#endif
+
     /* Make accesses to pages with watchpoints go via the
        watchpoint trap routines.  */
@@ -2203 +2223 @@
         }
     }
-
-#ifdef VBOX
-#  if !defined(REM_PHYS_ADDR_IN_TLB)
-    if (addend == (target_phys_addr_t)-1)
-    {
-         address |= TLB_MMIO;
-         iotlb = (pd & ~TARGET_PAGE_MASK) + paddr +env->pVM->rem.s.iHandlerMemType;
-    }
-#  endif
-#endif
 
     index = (vaddr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);