Changeset 4953 in vbox for trunk/include/VBox/dis.h

Timestamp:

Sep 21, 2007 2:08:19 PM (18 years ago)

Author:

vboxsync

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

24710

Message:

Cleaned up disassembler

File:

• trunk/include/VBox/dis.h (modified) (10 diffs)

trunk/include/VBox/dis.h

@@ -33 +33 @@
  * @{
  */
-#define CPUMODE_16BIT                   1
-#define CPUMODE_32BIT                   2
+typedef enum
+{
+    CPUMODE_16BIT = 1,
+    CPUMODE_32BIT = 2,
+    CPUMODE_64BIT = 3
+} DISCPUMODE;
 /** @} */
 
@@ -313 +317 @@
 typedef const struct _OPCODE *PCOPCODE;
 
-typedef DECLCALLBACK(int32_t) FN_DIS_READBYTES(RTUINTPTR pSrc, uint8_t *pDest, uint32_t size, RTUINTPTR dwUserdata);
+typedef DECLCALLBACK(int) FN_DIS_READBYTES(RTUINTPTR pSrc, uint8_t *pDest, uint32_t size, void *pvUserdata);
 typedef FN_DIS_READBYTES *PFN_DIS_READBYTES;
 
@@ -323 +327 @@
 /** Parser callback.
  * @remark no DECLCALLBACK() here because it's considered to be internal (really, I'm too lazy to update all the functions). */
-typedef int FNDISPARSE(RTUINTPTR pu8CodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu);
+typedef unsigned FNDISPARSE(RTUINTPTR pu8CodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu);
 typedef FNDISPARSE *PFNDISPARSE;
 
@@ -370 +374 @@
     PCOPCODE        pCurInstr;
 
-    RTUINTPTR       dwUserData[3];
+    void           *apvUserData[3];
 
     /** Optional read function */
@@ -402 +406 @@
  * Disassembles a code block.
  *
- * @returns Success indicator.
+ * @returns VBox error code
  * @param   pCpu            Pointer to cpu structure which have DISCPUSTATE::mode
  *                          set correctly.
@@ -419 +423 @@
  *          This means *pcbSize >= cbMax sometimes.
  */
-DISDECL(bool) DISBlock(PDISCPUSTATE pCpu, RTUINTPTR pvCodeBlock, int32_t cbMax, uint32_t *pSize);
+DISDECL(int) DISBlock(PDISCPUSTATE pCpu, RTUINTPTR pvCodeBlock, unsigned cbMax, unsigned *pSize);
 
 /**
  * Disassembles one instruction
  *
- * @returns Success indicator.
+ * @returns VBox error code
  * @param   pCpu            Pointer to cpu structure which have DISCPUSTATE::mode
  *                          set correctly.
@@ -435 +439 @@
  * @todo    Define output callback.
  */
-DISDECL(bool) DISInstr(PDISCPUSTATE pCpu, RTUINTPTR pu8Instruction, uint32_t u32EipOffset, uint32_t *pcbSize, char *pszOutput);
+DISDECL(int) DISInstr(PDISCPUSTATE pCpu, RTUINTPTR pu8Instruction, unsigned u32EipOffset, unsigned *pcbSize, char *pszOutput);
 
 /**
  * Disassembles one instruction
  *
- * @returns Success indicator.
+ * @returns VBox error code
  * @param   pCpu            Pointer to cpu structure which have DISCPUSTATE::mode
  *                          set correctly.
@@ -452 +456 @@
  * @todo    Define output callback.
  */
-DISDECL(bool) DISInstrEx(PDISCPUSTATE pCpu, RTUINTPTR pu8Instruction, uint32_t u32EipOffset, uint32_t *pcbSize,
-                         char *pszOutput, uint32_t uFilter);
+DISDECL(int) DISInstrEx(PDISCPUSTATE pCpu, RTUINTPTR pu8Instruction, uint32_t u32EipOffset, uint32_t *pcbSize,
+                         char *pszOutput, unsigned uFilter);
 
 /**
@@ -459 +463 @@
  * The result is found in pCpu.
  *
- * @returns Success indicator.
+ * @returns VBox error code
  * @param   pCpu            Pointer to cpu structure which has DISCPUSTATE::mode set correctly.
  * @param   InstructionAddr Pointer to the instruction to parse.
@@ -465 +469 @@
  *                          NULL is allowed.
  */
-DISDECL(bool) DISCoreOne(PDISCPUSTATE pCpu, RTUINTPTR InstructionAddr, unsigned *pcbInstruction);
+DISDECL(int) DISCoreOne(PDISCPUSTATE pCpu, RTUINTPTR InstructionAddr, unsigned *pcbInstruction);
 
 /**