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

Timestamp:

Jun 12, 2012 8:16:31 PM (12 years ago)

Author:

vboxsync

Message:

DISCoreOne* -> DISCore*.

Location:

trunk/src/VBox/Disassembler

Files:

• Disasm.cpp (modified) (1 diff)
• DisasmCore.cpp (modified) (7 diffs)
• DisasmTestCore.cpp (modified) (1 diff)

trunk/src/VBox/Disassembler/Disasm.cpp

@@ -96 +96 @@
                              PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput)
 {
-    int rc = DISCoreOneExEx(uInstrAddr, enmCpuMode, uFilter, pfnReadBytes, pvUser, pCpu, pcbInstr);
+    int rc = DISInstEx(uInstrAddr, enmCpuMode, uFilter, pfnReadBytes, pvUser, pCpu, pcbInstr);
     if (RT_SUCCESS(rc) && pszOutput && cbOutput)
     {

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -212 +212 @@
  *
  * @returns VBox status code.
- * @param   uInstrAddr      Address of the instruction to decode.  This is a
+ * @param   pvInstr         Address of the instruction to decode.  This is a
  *                          real address in the current context that can be
- *                          derefferenced.  (Consider DISCoreOneWithReader if
- *                          this isn't the case.)
+ *                          accessed without faulting.  (Consider
+ *                          DISInstrWithReader if this isn't the case.)
  * @param   enmCpuMode      The CPU mode. CPUMODE_32BIT, CPUMODE_16BIT, or CPUMODE_64BIT.
  * @param   pfnReadBytes    Callback for reading instruction bytes.
@@ -224 +224 @@
  *                          PDISCPUSTATE::opsize.
  */
-DISDECL(int) DISCoreOne(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PDISCPUSTATE pCpu, uint32_t *pcbInstr)
-{
-    return DISCoreOneExEx(uInstrAddr, enmCpuMode, OPTYPE_ALL, NULL /*pfnReadBytes*/, NULL /*pvUser*/, pCpu, pcbInstr);
+DISDECL(int) DISInstr(const void *pvInstr, DISCPUMODE enmCpuMode, PDISCPUSTATE pCpu, uint32_t *pcbInstr)
+{
+    return DISInstEx((uintptr_t)pvInstr, enmCpuMode, OPTYPE_ALL, NULL /*pfnReadBytes*/, NULL /*pvUser*/, pCpu, pcbInstr);
 }
 
@@ -246 +246 @@
  *                          PDISCPUSTATE::opsize.
  */
-DISDECL(int) DISCoreOneWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser,
-                                  PDISCPUSTATE pCpu, uint32_t *pcbInstr)
-{
-    return DISCoreOneExEx(uInstrAddr, enmCpuMode, OPTYPE_ALL, pfnReadBytes, pvUser, pCpu, pcbInstr);
+DISDECL(int) DISInstrWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser,
+                                PDISCPUSTATE pCpu, uint32_t *pcbInstr)
+{
+    return DISInstEx(uInstrAddr, enmCpuMode, OPTYPE_ALL, pfnReadBytes, pvUser, pCpu, pcbInstr);
 }
 
 
 /**
- * Parses one guest instruction.
- *
- * The result is found in pCpu and pcbInstr.
+ * Disassembles on instruction, details in @a pCpu and length in @a pcbInstr.
  *
  * @returns VBox status code.
@@ -263 +261 @@
  * @param   enmCpuMode      The CPU mode. CPUMODE_32BIT, CPUMODE_16BIT, or CPUMODE_64BIT.
  * @param   pfnReadBytes    Callback for reading instruction bytes.
- * @param   uFilter         Instruction type filter.
+ * @param   fFilter         Instruction type filter.
  * @param   pvUser          User argument for the instruction reader. (Ends up in apvUserData[0].)
- * @param   pCpu            Pointer to cpu structure. Will be initialized.
- * @param   pcbInstr        Where to store the size of the instruction.
- *                          NULL is allowed.  This is also stored in
- *                          PDISCPUSTATE::opsize.
+ * @param   pCpu            Pointer to CPU structure. With the exception of
+ *                          DISCPUSTATE::apvUserData[1] and
+ *                          DISCPUSTATE::apvUserData[2], the structure will be
+ *                          completely initialized by this API, i.e. no input is
+ *                          taken from it.
+ * @param   pcbInstr        Where to store the size of the instruction.  (This
+ *                          is also stored in PDISCPUSTATE::opsize.)  Optional.
  */
-DISDECL(int) DISCoreOneExEx(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t uFilter,
-                            PFNDISREADBYTES pfnReadBytes, void *pvUser,
-                            PDISCPUSTATE pCpu, uint32_t *pcbInstr)
+DISDECL(int) DISInstEx(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t fFilter,
+                       PFNDISREADBYTES pfnReadBytes, void *pvUser,
+                       PDISCPUSTATE pCpu, uint32_t *pcbInstr)
 {
     const OPCODE *paOneByteMap;
@@ -299 +300 @@
     pCpu->uInstrAddr        = uInstrAddr;
     pCpu->pfnDisasmFnTable  = g_apfnFullDisasm;
-    pCpu->uFilter           = uFilter;
+    pCpu->fFilter           = fFilter;
     pCpu->rc                = VINF_SUCCESS;
     pCpu->pfnReadBytes      = pfnReadBytes ? pfnReadBytes : disReadBytesDefault;
@@ -451 +452 @@
     /*
      * Apply filter to instruction type to determine if a full disassembly is required.
-     * @note Multibyte opcodes are always marked harmless until the final byte.
+     * Note! Multibyte opcodes are always marked harmless until the final byte.
      */
-    if ((pOp->optype & pCpu->uFilter) == 0)
+    if ((pOp->optype & pCpu->fFilter) == 0)
     {
         fFiltered = true;
@@ -541 +542 @@
      * @note Multibyte opcodes are always marked harmless until the final byte.
      */
-    if ((fpop->optype & pCpu->uFilter) == 0)
+    if ((fpop->optype & pCpu->fFilter) == 0)
         pCpu->pfnDisasmFnTable = g_apfnCalcSize;
     else

trunk/src/VBox/Disassembler/DisasmTestCore.cpp

@@ -39 +39 @@
         unsigned    cb;
         DISCPUSTATE cpu;
-        if (DISCoreOne((uintptr_t)&DISCoreOne, CPUMODE_32BIT, &cpu, &cb))
+        if (DISInstr((void *)(uintptr_t)&DISInstr, CPUMODE_32BIT, &cpu, &cb))
             printf("ok %d\n", cpu.addrmode);
         else