Changeset 41658 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 11, 2012 10:21:44 PM (13 years ago)

Author:

vboxsync

Message:

DIS,VMM,REM,IPRT: Disassembler API adjustments.

File:

• trunk/src/VBox/Devices/PC/BIOS-new/MakeDebianBiosAssembly.cpp (modified) (1 diff)

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

@@ -904 +904 @@
 
 /**
- * Disassembler callback for reading opcode bytes.
- *
- * @returns VINF_SUCCESS.
- * @param   uFlatAddr           The address to read at.
- * @param   pbDst               Where to store them.
- * @param   cbToRead            How many to read.
- * @param   pvUser              Unused.
- */
-static DECLCALLBACK(int) disReadOpcodeBytes(RTUINTPTR uFlatAddr, uint8_t *pbDst, unsigned cbToRead, void *pvUser)
-{
-    if (uFlatAddr + cbToRead >= VBOX_BIOS_BASE + _64K)
+ * @callback_method_impl{FNDISREADBYTES}
+ *
+ * @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 (uFlatAddr >= VBOX_BIOS_BASE + _64K)
+        if (uSrcAddr >= VBOX_BIOS_BASE + _64K)
             cbToRead = 0;
         else
-            cbToRead = VBOX_BIOS_BASE + _64K - uFlatAddr;
-    }
-    memcpy(pbDst, &g_pbImg[uFlatAddr - VBOX_BIOS_BASE], cbToRead);
-    NOREF(pvUser);
+            cbToRead = VBOX_BIOS_BASE + _64K - uSrcAddr;
+    }
+    memcpy(pbDst, &g_pbImg[uSrcAddr - VBOX_BIOS_BASE], cbToRead);
+    NOREF(pDisState);
     return VINF_SUCCESS;
 }