Changeset 41760 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

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

Author:

vboxsync

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/Devices/PC/BIOS-new/MakeDebianBiosAssembly.cpp (modified) (1 diff)

trunk/src/VBox/Devices/PC/BIOS-new/MakeDebianBiosAssembly.cpp

@@ -908 +908 @@
  * @remarks @a uSrcAddr is the flat address.
  */
-static DECLCALLBACK(int) disReadOpcodeBytes(PDISCPUSTATE pDisState, uint8_t *pbDst, RTUINTPTR uSrcAddr, uint32_t cbToRead)
-{
-    if (uSrcAddr + cbToRead >= VBOX_BIOS_BASE + _64K)
-    {
-        RT_BZERO(pbDst, cbToRead);
-        if (uSrcAddr >= VBOX_BIOS_BASE + _64K)
+static DECLCALLBACK(int) disReadOpcodeBytes(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
+{
+    RTUINTPTR   offBios  = pDis->uInstrAddr + offInstr - VBOX_BIOS_BASE;
+    size_t      cbToRead = cbMaxRead;
+    if (offBios + cbToRead > _64K)
+    {
+        if (offBios >= _64K)
             cbToRead = 0;
         else
-            cbToRead = VBOX_BIOS_BASE + _64K - uSrcAddr;
-    }
-    memcpy(pbDst, &g_pbImg[uSrcAddr - VBOX_BIOS_BASE], cbToRead);
-    NOREF(pDisState);
+            cbToRead = _64K - offBios;
+    }
+    memcpy(&pDis->abInstr[offInstr], &g_pbImg[offBios], cbToRead);
+    pDis->cbCachedInstr = offInstr + cbToRead;
     return VINF_SUCCESS;
 }