Changeset 41760 in vbox for trunk/src/VBox/VMM/VMMAll/EMAll.cpp

Timestamp:

Jun 15, 2012 3:56:20 PM (13 years ago)

Author:

vboxsync

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

78577

Message:

DIS: Chagned FNDISREADBYTES to permit reading more bytes that the immeidate request. Not using the read-ahead feature in any important code path yet, that's comming next, bit by bit.

File:

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

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

@@ -284 +284 @@
  * @callback_method_impl{FNDISREADBYTES}
  */
-static DECLCALLBACK(int) emReadBytes(PDISCPUSTATE pDisState, uint8_t *pbDst, RTUINTPTR uSrcAddr, uint32_t cbToRead)
-{
-    PEMDISSTATE   pState = (PEMDISSTATE)pDisState->pvUser;
+static DECLCALLBACK(int) emReadBytes(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
+{
+    PEMDISSTATE   pState = (PEMDISSTATE)pDis->pvUser;
 # ifndef IN_RING0
     PVM           pVM    = pState->pVM;
 # endif
     PVMCPU        pVCpu  = pState->pVCpu;
+    /** @todo Rewrite this to make full use of the abInstr buffer and drop our extra
+     *        caching buffer.  Just playing safe at first... */
+    uint8_t      *pbDst    = &pDis->abInstr[offInstr];
+    RTUINTPTR     uSrcAddr = pDis->uInstrAddr + offInstr;
+    size_t        cbToRead = cbMinRead;
 
 # ifdef IN_RING0
-    int rc;
+    int           rc;
 
     if (    pState->GCPtr
@@ -303 +308 @@
         for (unsigned i = 0; i < cbToRead; i++)
             pbDst[i] = pState->aOpcode[offset + i];
+        pDis->cbCachedInstr = offInstr + cbToRead;
         return VINF_SUCCESS;
     }
@@ -308 +314 @@
     rc = PGMPhysSimpleReadGCPtr(pVCpu, pbDst, uSrcAddr, cbToRead);
     AssertMsgRC(rc, ("PGMPhysSimpleReadGCPtr failed for uSrcAddr=%RTptr cbToRead=%x rc=%d\n", uSrcAddr, cbToRead, rc));
+
 # elif defined(IN_RING3)
     if (!PATMIsPatchGCAddr(pVM, uSrcAddr))
@@ -332 +339 @@
 
 # endif /* IN_RING3 */
+    pDis->cbCachedInstr = offInstr + cbToRead;
     return VINF_SUCCESS;
 }