Changeset 25550 in vbox for trunk

Timestamp:

Dec 21, 2009 5:18:47 PM (15 years ago)

Author:

vboxsync

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

56226

Message:

Raw mode: deal with invalidated tlb entries during disassembly (long overdue)

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (4 diffs)

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

@@ -107 +107 @@
 
 
-#ifndef IN_RC
-
 /**
  * Read callback for disassembly function; supports reading bytes that cross a page boundary
@@ -145 +143 @@
     rc = PGMPhysSimpleReadGCPtr(pVCpu, pDest, pSrc, cb);
     AssertMsgRC(rc, ("PGMPhysSimpleReadGCPtr failed for pSrc=%RGv cb=%x rc=%d\n", pSrc, cb, rc));
-# else /* IN_RING3 */
+# elif defined(IN_RING3)
     if (!PATMIsPatchGCAddr(pVM, pSrc))
     {
@@ -152 +150 @@
     }
     else
-    {
-        for (unsigned i = 0; i < cb; i++)
+        memcpy(pDest, PATMR3GCPtrToHCPtr(pVM, pSrc), cb);
+
+# elif defined(IN_RC)
+    if (!PATMIsPatchGCAddr(pVM, (RTRCPTR)pSrc))
+    {
+        int rc = MMGCRamRead(pVM, pDest, (void *)pSrc, cb);
+        if (rc == VERR_ACCESS_DENIED)
         {
-            uint8_t opcode;
-            if (RT_SUCCESS(PATMR3QueryOpcode(pVM, (RTGCPTR)pSrc + i, &opcode)))
-                *(pDest+i) = opcode;
-
+            /* Recently flushed; access the data manually. */
+            rc = PGMPhysSimpleReadGCPtr(pVCpu, pDest, pSrc, cb);
+            AssertRC(rc);
         }
     }
+    else /* the hypervisor region is always present. */
+        memcpy(pDest, (RTRCPTR)pSrc, cb);
+
 # endif /* IN_RING3 */
     return VINF_SUCCESS;
 }
 
+
+#ifndef IN_RC
 DECLINLINE(int) emDisCoreOne(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, RTGCUINTPTR InstrGC, uint32_t *pOpsize)
 {
@@ -195 +202 @@
 DECLINLINE(int) emDisCoreOne(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, RTGCUINTPTR InstrGC, uint32_t *pOpsize)
 {
-    NOREF(pVCpu);
-    NOREF(pVM);
-    return DISCoreOne(pDis, InstrGC, pOpsize);
+    EMDISSTATE State;
+
+    State.pVM   = pVM;
+    State.pVCpu = pVCpu;
+    State.GCPtr = InstrGC;
+
+    return DISCoreOneEx(InstrGC, pDis->mode, EMReadBytes, &State, pDis, pOpsize);
 }