Changeset 14346 in vbox

Timestamp:

Nov 19, 2008 11:25:35 AM (16 years ago)

Author:

vboxsync

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

39558

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>

Location:

trunk

Files:

trunk/include/VBox/pgm.h

r14301	r14346
348	348	R3PTRTYPE(const char *) pszDesc);
349	349	VMMDECL(int) PGMHandlerPhysicalModify(PVM pVM, RTGCPHYS GCPhysCurrent, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast);
	350	VMMDECL(bool) PGMHandlerIsAddressMonitored(PVM pVM, RTGCPTR GCPtr);
350	351	VMMDECL(int) PGMHandlerPhysicalDeregister(PVM pVM, RTGCPHYS GCPhys);
351	352	VMMDECL(int) PGMHandlerPhysicalChangeCallbacks(PVM pVM, RTGCPHYS GCPhys,

-              r13936
+              r14346
 /**
+ * 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.
+ *

r14132	r14346
40	40	#
41	41	$(REM_MOD)_DEFS = IN_REM_R3 REM_INCLUDE_CPU_H
42		$(REM_MOD)_DEFS += REM_PHYS_ADDR_IN_TLB
	42	#$(REM_MOD)_DEFS += REM_PHYS_ADDR_IN_TLB
43	43	#$(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.
44	44	$(REM_MOD)_DEFS.linux = _GNU_SOURCE

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

r14241	r14346
385	385	# if !defined(REM_PHYS_ADDR_IN_TLB)
386	386	target_ulong remR3HCVirt2GCPhys(CPUState env1, void addr);
	387	bool remR3IsMonitored(CPUState *env, RTGCPTR GCPtr);
387	388	# endif
388	389	# endif

-              r14277
+              r14346
+        }
+    }
+#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);

Note: See TracChangeset for help on using the changeset viewer.