Changeset 41668 in vbox for trunk/include

Timestamp:

Jun 12, 2012 1:15:51 PM (13 years ago)

Author:

vboxsync

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

78475

Message:

DIS,DIS-users: Drop the operand/parameter formatting during instruction parsing. The desired formatter can do this afterwards if desired. Should save time + size. (DISCPUSTATE is now 256 bytes here on 64-bit linux, was ~406 yesterday.)

File:

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

trunk/include/VBox/dis.h

@@ -31 +31 @@
 #include <VBox/disopcode.h>
 
-#if defined(__L4ENV__)
-# include <setjmp.h>
-#endif
 
 RT_C_DECLS_BEGIN
@@ -412 +409 @@
     /** Parameter size. */
     uint8_t         cb;
-
-#ifndef DIS_SEPARATE_FORMATTER
-    char            szParam[32];
-#endif
 } OP_PARAMETER;
 /** Pointer to opcode parameter. */
@@ -454 +447 @@
 
     /** Per instruction prefix settings. */
-    uint32_t        prefix;
+    uint32_t        prefix;  /**< @todo change to uint8_t */
     /** segment prefix value. */
     DIS_SELREG      enmPrefixSeg;
     /** rex prefix value (64 bits only */
-    uint32_t        prefix_rex;
+    uint32_t        prefix_rex; /**< @todo change to uint8_t */
     /** addressing mode (16 or 32 bits). (CPUMODE_*) */
     DISCPUMODE      addrmode;
@@ -501 +494 @@
     /** The address of the instruction. */
     RTUINTPTR       uInstrAddr;
-    /** The offsetted address of the instruction. */
-    RTUINTPTR       opaddr;
     /** The size of the prefix bytes. */
     uint8_t         cbPrefix;
@@ -559 +550 @@
 
 
-DISDECL(int) DISInstr(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PDISCPUSTATE pCpu, uint32_t *pcbSize, char *pszOutput);
-DISDECL(int) DISInstrWithOff(PDISCPUSTATE pCpu, RTUINTPTR uInstrAddr, RTUINTPTR offRealAddr, uint32_t *pcbSize, char *pszOutput);
+DISDECL(int) DISInstr(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput);
+DISDECL(int) DISInstrWithOff(PDISCPUSTATE pCpu, RTUINTPTR uInstrAddr, RTUINTPTR offRealAddr, uint32_t *pcbInstr, char *pszOutput);
 DISDECL(int) DISInstrWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser,
-                                PDISCPUSTATE pCpu, uint32_t *pcbSize, char *pszOutput);
+                                PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput);
 DISDECL(int) DISInstrEx(RTUINTPTR uInstrAddr, RTUINTPTR offRealAddr, DISCPUMODE enmCpuMode,
                         PFNDISREADBYTES pfnReadBytes, void *pvUser, uint32_t uFilter,
-                        PDISCPUSTATE pCpu, uint32_t *pcbSize, char *pszOutput);
-
-DISDECL(int) DISCoreOne(PDISCPUSTATE pCpu, RTUINTPTR InstructionAddr, uint32_t *pcbInstruction);
-DISDECL(int) DISCoreOneEx(RTUINTPTR InstructionAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser,
-                          PDISCPUSTATE pCpu, uint32_t *pcbInstruction);
+                        PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput);
+
+DISDECL(int) DISCoreOne(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PDISCPUSTATE pCpu, uint32_t *pcbInstr);
+DISDECL(int) DISCoreOneWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser,
+                                  PDISCPUSTATE pCpu, uint32_t *pcbInstr);
+DISDECL(int) DISCoreOneExEx(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t uFilter,
+                            PFNDISREADBYTES pfnReadBytes, void *pvUser,
+                            PDISCPUSTATE pCpu, uint32_t *pcbInstr);
 
 DISDECL(int)        DISGetParamSize(PDISCPUSTATE pCpu, POP_PARAMETER pParam);