Changeset 41731 in vbox for trunk/src/VBox/Disassembler

Timestamp:

Jun 14, 2012 11:41:13 PM (13 years ago)

Author:

vboxsync

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

78539

Message:

DIS: Split up apvUserData, dropping the 3rd entry. 2nd entry (now pvUser2) is only used by CSAM. Reduces the DISCPUSTATE by another 8 bytes.

Location:

trunk/src/VBox/Disassembler

Files:

• Disasm.cpp (modified) (1 diff)
• DisasmCore.cpp (modified) (5 diffs)

trunk/src/VBox/Disassembler/Disasm.cpp

@@ -58 +58 @@
  * @param   pfnCallback     The byte fetcher callback.
  * @param   pvUser          The user argument (found in
- *                          DISCPUSTATE::apvUserData[0]).
+ *                          DISCPUSTATE::pvUser).
  * @param   pCpu            Where to return the disassembled instruction.
  * @param   pcbInstr        Where to store the size of the instruction. NULL is

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -227 +227 @@
  * @param   enmCpuMode      The CPU mode. DISCPUMODE_32BIT, DISCPUMODE_16BIT, or DISCPUMODE_64BIT.
  * @param   pfnReadBytes    Callback for reading instruction bytes.
- * @param   pvUser          User argument for the instruction reader. (Ends up in apvUserData[0].)
+ * @param   pvUser          User argument for the instruction reader. (Ends up in pvUser.)
  * @param   pCpu            Pointer to cpu structure. Will be initialized.
  * @param   pcbInstr        Where to store the size of the instruction.
@@ -249 +249 @@
  * @param   enmCpuMode      The CPU mode. DISCPUMODE_32BIT, DISCPUMODE_16BIT, or DISCPUMODE_64BIT.
  * @param   pfnReadBytes    Callback for reading instruction bytes.
- * @param   pvUser          User argument for the instruction reader. (Ends up in apvUserData[0].)
+ * @param   pvUser          User argument for the instruction reader. (Ends up in pvUser.)
  * @param   pCpu            Pointer to cpu structure. Will be initialized.
  * @param   pcbInstr        Where to store the size of the instruction.
@@ -271 +271 @@
  * @param   pfnReadBytes    Callback for reading instruction bytes.
  * @param   fFilter         Instruction type filter.
- * @param   pvUser          User argument for the instruction reader. (Ends up in apvUserData[0].)
+ * @param   pvUser          User argument for the instruction reader. (Ends up in pvUser.)
  * @param   pCpu            Pointer to CPU structure. With the exception of
- *                          DISCPUSTATE::apvUserData[1] and
- *                          DISCPUSTATE::apvUserData[2], the structure will be
+ *                          DISCPUSTATE::pvUser2, the structure will be
  *                          completely initialized by this API, i.e. no input is
  *                          taken from it.
@@ -288 +287 @@
     /*
      * Initialize the CPU state.
-     * Note! The RT_BZERO make ASSUMPTIONS about the placement of apvUserData.
+     * Note! The RT_BZERO make ASSUMPTIONS about the placement of pvUser2.
      */
-    RT_BZERO(pCpu, RT_OFFSETOF(DISCPUSTATE, apvUserData));
+    RT_BZERO(pCpu, RT_OFFSETOF(DISCPUSTATE, pvUser2));
 
     pCpu->mode              = enmCpuMode;
@@ -312 +311 @@
     pCpu->rc                = VINF_SUCCESS;
     pCpu->pfnReadBytes      = pfnReadBytes ? pfnReadBytes : disReadBytesDefault;
-    pCpu->apvUserData[0]    = pvUser;
+    pCpu->pvUser    = pvUser;
 
     return disInstrWorker(pCpu, uInstrAddr, paOneByteMap, pcbInstr);