Changeset 14346

Timestamp:

11/19/08 12:25:35 (2 months ago)

Author:

vboxsync

Message:

Implemented check for monitored page accesses, fixing TSS out of sync problem with VA in TLB. Enabled VA in TLB by default in new REM>

Files:

• trunk/include/VBox/pgm.h (modified) (1 diff)
• trunk/src/VBox/VMM/PGMHandler.cpp (modified) (1 diff)
• trunk/src/recompiler_new/Makefile.kmk (modified) (1 diff)
• trunk/src/recompiler_new/VBoxRecompiler.c (modified) (1 diff)
• trunk/src/recompiler_new/exec-all.h (modified) (1 diff)
• trunk/src/recompiler_new/exec.c (modified) (1 diff)

trunk/include/VBox/pgm.h

@@ -348 +348 @@
-                                                 R3PTRTYPE(const char *) pszDesc);
-VMMDECL(int)        PGMHandlerPhysicalModify(PVM pVM, RTGCPHYS GCPhysCurrent, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast);
+VMMDECL(bool)       PGMHandlerIsAddressMonitored(PVM pVM, RTGCPTR GCPtr);
-VMMDECL(int)        PGMHandlerPhysicalDeregister(PVM pVM, RTGCPHYS GCPhys);
-VMMDECL(int)        PGMHandlerPhysicalChangeCallbacks(PVM pVM, RTGCPHYS GCPhys,

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -433 +433 @@
-
-/**
+ * Check if particular guest's VA is being monitored.
+ *
+ * @returns true or false
+ * @param   pVM             VM handle.
+ * @param   GCPtr           Virtual address.
+ */
+VMMDECL(bool) PGMHandlerIsAddressMonitored(PVM pVM, RTGCPTR GCPtr)
+{
+    pgmLock(pVM);
+    PPGMVIRTHANDLER pCur = (PPGMVIRTHANDLER)RTAvlroGCPtrGet(&pVM->pgm.s.pTreesR3->VirtHandlers, GCPtr);
+    pgmUnlock(pVM);
+
+    return pCur != 0;
+}
+
+
+/**
- * Deregister an access handler for a virtual range.
- *

trunk/src/recompiler_new/Makefile.kmk

@@ -40 +40 @@
-#
-$(REM_MOD)_DEFS             = IN_REM_R3 REM_INCLUDE_CPU_H
-
+#
-#$(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.
-$(REM_MOD)_DEFS.linux      = _GNU_SOURCE

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1452 +1452 @@
-}
-
+#ifndef REM_PHYS_ADDR_IN_TLB
+bool remR3IsMonitored(CPUState *env, RTGCPTR GCPtr)
+{
+    return PGMHandlerIsAddressMonitored(env->pVM, GCPtr);
+}
+#endif
-
-/**

trunk/src/recompiler_new/exec-all.h

@@ -385 +385 @@
-#  if !defined(REM_PHYS_ADDR_IN_TLB)
-target_ulong remR3HCVirt2GCPhys(CPUState *env1, void *addr);
+bool         remR3IsMonitored(CPUState *env, RTGCPTR GCPtr);
-#  endif
-# endif

trunk/src/recompiler_new/exec.c

@@ -2201 +2201 @@
-        }
-    }
+
+#ifdef VBOX
+#  if !defined(REM_PHYS_ADDR_IN_TLB)
+    if (remR3IsMonitored(env, vaddr & TARGET_PAGE_MASK))
+    {
+         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);