Index: /trunk/include/VBox/dis.h =================================================================== --- /trunk/include/VBox/dis.h (revision 41789) +++ /trunk/include/VBox/dis.h (revision 41790) @@ -36,5 +36,5 @@ /** - * CPU mode flags (DISCPUSTATE::mode). + * CPU mode flags (DISSTATE::mode). */ typedef enum DISCPUMODE @@ -48,5 +48,5 @@ } DISCPUMODE; -/** @name Prefix byte flags (DISCPUSTATE::fPrefix). +/** @name Prefix byte flags (DISSTATE::fPrefix). * @{ */ @@ -68,5 +68,5 @@ /** @} */ -/** @name 64 bits prefix byte flags (DISCPUSTATE::fRexPrefix). +/** @name 64 bits prefix byte flags (DISSTATE::fRexPrefix). * Requires VBox/disopcode.h. * @{ @@ -499,21 +499,20 @@ * Callback for reading instruction bytes. * - * @returns VBox status code, bytes in DISCPUSTATE::abInstr and byte count in - * DISCPUSTATE::cbCachedInstr. + * @returns VBox status code, bytes in DISSTATE::abInstr and byte count in + * DISSTATE::cbCachedInstr. * @param pDis Pointer to the disassembler state. The user - * argument can be found in DISCPUSTATE::pvUser if - * needed. + * argument can be found in DISSTATE::pvUser if needed. * @param offInstr The offset relative to the start of the instruction. * * To get the source address, add this to - * DISCPUSTATE::uInstrAddr. + * DISSTATE::uInstrAddr. * * To calculate the destination buffer address, use it - * as an index into DISCPUSTATE::abInstr. + * as an index into DISSTATE::abInstr. * * @param cbMinRead The minimum number of bytes to read. * @param cbMaxRead The maximum number of bytes that may be read. */ -typedef DECLCALLBACK(int) FNDISREADBYTES(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead); +typedef DECLCALLBACK(int) FNDISREADBYTES(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead); /** Pointer to a opcode byte reader. */ typedef FNDISREADBYTES *PFNDISREADBYTES; @@ -522,5 +521,5 @@ * @remark no DECLCALLBACK() here because it's considered to be internal and * there is no point in enforcing CDECL. */ -typedef size_t FNDISPARSE(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pCpu); +typedef size_t FNDISPARSE(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis); /** Pointer to a disassembler parser function. */ typedef FNDISPARSE *PFNDISPARSE; @@ -534,5 +533,5 @@ * doesn't make any sense right now because of structure alignment. */ -typedef struct DISCPUSTATE +typedef struct DISSTATE { /* Because of pvUser2, put the less frequently used bits at the top for @@ -639,30 +638,33 @@ uint32_t uPadding5; #endif -} DISCPUSTATE; +} DISSTATE; + +/** @deprecated Use DISSTATE and change Cpu and DisState to Dis. */ +typedef DISSTATE DISCPUSTATE; DISDECL(int) DISInstrToStr(void const *pvInstr, DISCPUMODE enmCpuMode, - PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput); + PDISSTATE pDis, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput); DISDECL(int) DISInstrToStrWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser, - PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput); + PDISSTATE pDis, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput); DISDECL(int) DISInstrToStrEx(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser, uint32_t uFilter, - PDISCPUSTATE pCpu, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput); - -DISDECL(int) DISInstr(void const *pvInstr, DISCPUMODE enmCpuMode, PDISCPUSTATE pCpu, uint32_t *pcbInstr); + PDISSTATE pDis, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput); + +DISDECL(int) DISInstr(void const *pvInstr, DISCPUMODE enmCpuMode, PDISSTATE pDis, uint32_t *pcbInstr); DISDECL(int) DISInstrWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser, - PDISCPUSTATE pCpu, uint32_t *pcbInstr); + PDISSTATE pDis, uint32_t *pcbInstr); DISDECL(int) DISInstEx(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t uFilter, PFNDISREADBYTES pfnReadBytes, void *pvUser, - PDISCPUSTATE pCpu, uint32_t *pcbInstr); + PDISSTATE pDis, uint32_t *pcbInstr); DISDECL(int) DISInstWithPrefetchedBytes(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t fFilter, void const *pvPrefetched, size_t cbPretched, PFNDISREADBYTES pfnReadBytes, void *pvUser, - PDISCPUSTATE pCpu, uint32_t *pcbInstr); - -DISDECL(int) DISGetParamSize(PCDISCPUSTATE pCpu, PCDISOPPARAM pParam); -DISDECL(DISSELREG) DISDetectSegReg(PCDISCPUSTATE pCpu, PCDISOPPARAM pParam); -DISDECL(uint8_t) DISQuerySegPrefixByte(PCDISCPUSTATE pCpu); + PDISSTATE pDis, uint32_t *pcbInstr); + +DISDECL(int) DISGetParamSize(PCDISSTATE pDis, PCDISOPPARAM pParam); +DISDECL(DISSELREG) DISDetectSegReg(PCDISSTATE pDis, PCDISOPPARAM pParam); +DISDECL(uint8_t) DISQuerySegPrefixByte(PCDISSTATE pDis); @@ -716,6 +718,6 @@ DISQPVWHAT_32_BIT_HACK = 0x7fffffff } DISQPVWHICH; -DISDECL(int) DISQueryParamVal(PCPUMCTXCORE pCtx, PCDISCPUSTATE pCpu, PCDISOPPARAM pParam, PDISQPVPARAMVAL pParamVal, DISQPVWHICH parmtype); -DISDECL(int) DISQueryParamRegPtr(PCPUMCTXCORE pCtx, PCDISCPUSTATE pCpu, PCDISOPPARAM pParam, void **ppReg, size_t *pcbSize); +DISDECL(int) DISQueryParamVal(PCPUMCTXCORE pCtx, PCDISSTATE pDis, PCDISOPPARAM pParam, PDISQPVPARAMVAL pParamVal, DISQPVWHICH parmtype); +DISDECL(int) DISQueryParamRegPtr(PCPUMCTXCORE pCtx, PCDISSTATE pDis, PCDISOPPARAM pParam, void **ppReg, size_t *pcbSize); DISDECL(int) DISFetchReg8(PCCPUMCTXCORE pCtx, unsigned reg8, uint8_t *pVal); @@ -747,5 +749,5 @@ * @retval VERR_SYMBOL_NOT_FOUND if no matching symbol was found for the address. * - * @param pCpu Pointer to the disassembler CPU state. + * @param pDis Pointer to the disassembler CPU state. * @param u32Sel The selector value. Use DIS_FMT_SEL_IS_REG, DIS_FMT_SEL_GET_VALUE, * DIS_FMT_SEL_GET_REG to access this. @@ -757,5 +759,5 @@ * @param pvUser The user argument. */ -typedef DECLCALLBACK(int) FNDISGETSYMBOL(PCDISCPUSTATE pCpu, uint32_t u32Sel, RTUINTPTR uAddress, char *pszBuf, size_t cchBuf, RTINTPTR *poff, void *pvUser); +typedef DECLCALLBACK(int) FNDISGETSYMBOL(PCDISSTATE pDis, uint32_t u32Sel, RTUINTPTR uAddress, char *pszBuf, size_t cchBuf, RTINTPTR *poff, void *pvUser); /** Pointer to a FNDISGETSYMBOL(). */ typedef FNDISGETSYMBOL *PFNDISGETSYMBOL; @@ -824,14 +826,15 @@ /** @} */ -DISDECL(size_t) DISFormatYasm( PCDISCPUSTATE pCpu, char *pszBuf, size_t cchBuf); -DISDECL(size_t) DISFormatYasmEx(PCDISCPUSTATE pCpu, char *pszBuf, size_t cchBuf, uint32_t fFlags, PFNDISGETSYMBOL pfnGetSymbol, void *pvUser); -DISDECL(size_t) DISFormatMasm( PCDISCPUSTATE pCpu, char *pszBuf, size_t cchBuf); -DISDECL(size_t) DISFormatMasmEx(PCDISCPUSTATE pCpu, char *pszBuf, size_t cchBuf, uint32_t fFlags, PFNDISGETSYMBOL pfnGetSymbol, void *pvUser); -DISDECL(size_t) DISFormatGas( PCDISCPUSTATE pCpu, char *pszBuf, size_t cchBuf); -DISDECL(size_t) DISFormatGasEx( PCDISCPUSTATE pCpu, char *pszBuf, size_t cchBuf, uint32_t fFlags, PFNDISGETSYMBOL pfnGetSymbol, void *pvUser); - -/** @todo DISAnnotate(PCDISCPUSTATE pCpu, char *pszBuf, size_t cchBuf, register reader, memory reader); */ - -DISDECL(bool) DISFormatYasmIsOddEncoding(PDISCPUSTATE pCpu); +DISDECL(size_t) DISFormatYasm( PCDISSTATE pDis, char *pszBuf, size_t cchBuf); +DISDECL(size_t) DISFormatYasmEx(PCDISSTATE pDis, char *pszBuf, size_t cchBuf, uint32_t fFlags, PFNDISGETSYMBOL pfnGetSymbol, void *pvUser); +DISDECL(size_t) DISFormatMasm( PCDISSTATE pDis, char *pszBuf, size_t cchBuf); +DISDECL(size_t) DISFormatMasmEx(PCDISSTATE pDis, char *pszBuf, size_t cchBuf, uint32_t fFlags, PFNDISGETSYMBOL pfnGetSymbol, void *pvUser); +DISDECL(size_t) DISFormatGas( PCDISSTATE pDis, char *pszBuf, size_t cchBuf); +DISDECL(size_t) DISFormatGasEx( PCDISSTATE pDis, char *pszBuf, size_t cchBuf, uint32_t fFlags, PFNDISGETSYMBOL pfnGetSymbol, void *pvUser); + +/** @todo DISAnnotate(PCDISSTATE pDis, char *pszBuf, size_t cchBuf, register + * reader, memory reader); */ + +DISDECL(bool) DISFormatYasmIsOddEncoding(PDISSTATE pDis); Index: /trunk/include/VBox/types.h =================================================================== --- /trunk/include/VBox/types.h (revision 41789) +++ /trunk/include/VBox/types.h (revision 41790) @@ -1044,8 +1044,13 @@ -/** Pointer to the disassembler CPU state. */ -typedef struct DISCPUSTATE *PDISCPUSTATE; -/** Pointer to a const disassembler CPU state. */ -typedef struct DISCPUSTATE const *PCDISCPUSTATE; +/** Pointer to the disassembler state. */ +typedef struct DISSTATE *PDISSTATE; +/** Pointer to a const disassembler state. */ +typedef struct DISSTATE const *PCDISSTATE; + +/** @deprecated PDISSTATE and change pCpu and pDisState to pDis. */ +typedef PDISSTATE PDISCPUSTATE; +/** @deprecated PCDISSTATE and change pCpu and pDisState to pDis. */ +typedef PCDISSTATE PCDISCPUSTATE; Index: /trunk/src/VBox/Disassembler/Disasm.cpp =================================================================== --- /trunk/src/VBox/Disassembler/Disasm.cpp (revision 41789) +++ /trunk/src/VBox/Disassembler/Disasm.cpp (revision 41790) @@ -43,5 +43,5 @@ * @todo Define output callback. */ -DISDECL(int) DISInstrToStr(void const *pvInstr, DISCPUMODE enmCpuMode, PDISCPUSTATE pDis, uint32_t *pcbInstr, +DISDECL(int) DISInstrToStr(void const *pvInstr, DISCPUMODE enmCpuMode, PDISSTATE pDis, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput) { @@ -58,5 +58,5 @@ * @param pfnCallback The byte fetcher callback. * @param pvUser The user argument (found in - * DISCPUSTATE::pvUser). + * DISSTATE::pvUser). * @param pDis The disassembler state (output). * @param pcbInstr Where to store the size of the instruction. NULL is @@ -68,5 +68,5 @@ */ DISDECL(int) DISInstrToStrWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser, - PDISCPUSTATE pDis, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput) + PDISSTATE pDis, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput) { @@ -93,5 +93,5 @@ DISDECL(int) DISInstrToStrEx(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser, uint32_t uFilter, - PDISCPUSTATE pDis, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput) + PDISSTATE pDis, uint32_t *pcbInstr, char *pszOutput, size_t cbOutput) { int rc = DISInstEx(uInstrAddr, enmCpuMode, uFilter, pfnReadBytes, pvUser, pDis, pcbInstr); Index: /trunk/src/VBox/Disassembler/DisasmCore.cpp =================================================================== --- /trunk/src/VBox/Disassembler/DisasmCore.cpp (revision 41789) +++ /trunk/src/VBox/Disassembler/DisasmCore.cpp (revision 41790) @@ -35,5 +35,5 @@ * Defined Constants And Macros * *******************************************************************************/ -/** This must be less or equal to DISCPUSTATE::abInstr. */ +/** This must be less or equal to DISSTATE::abInstr. */ #define DIS_MAX_INSTR_LENGTH 16 @@ -47,7 +47,7 @@ * Internal Functions * *******************************************************************************/ -static void disasmModRMReg(PDISCPUSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam, int fRegAddr); -static void disasmModRMReg16(PDISCPUSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam); -static void disasmModRMSReg(PDISCPUSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam); +static void disasmModRMReg(PDISSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam, int fRegAddr); +static void disasmModRMReg16(PDISSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam); +static void disasmModRMSReg(PDISSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam); @@ -222,5 +222,5 @@ * @interface_method_impl{FNDISREADBYTES, The default byte reader callber.} */ -static DECLCALLBACK(int) disReadBytesDefault(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead) +static DECLCALLBACK(int) disReadBytesDefault(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead) { #ifdef IN_RING0 @@ -245,10 +245,10 @@ /** - * Read more bytes into the DISCPUSTATE::abInstr buffer, advance - * DISCPUSTATE::cbCachedInstr. + * Read more bytes into the DISSTATE::abInstr buffer, advance + * DISSTATE::cbCachedInstr. * - * Will set DISCPUSTATE::rc on failure, but still advance cbCachedInstr. + * Will set DISSTATE::rc on failure, but still advance cbCachedInstr. * - * The caller shall fend off reads beyond the DISCPUSTATE::abInstr buffer. + * The caller shall fend off reads beyond the DISSTATE::abInstr buffer. * * @param pDis The disassembler state. @@ -257,5 +257,5 @@ * satisfied. */ -DECL_NO_INLINE(static, void) disReadMore(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMin) +DECL_NO_INLINE(static, void) disReadMore(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMin) { Assert(cbMin + offInstr <= sizeof(pDis->abInstr)); @@ -304,5 +304,5 @@ * instruction. */ -DECL_NO_INLINE(static, uint8_t) disReadByteSlow(PDISCPUSTATE pDis, size_t offInstr) +DECL_NO_INLINE(static, uint8_t) disReadByteSlow(PDISSTATE pDis, size_t offInstr) { if (RT_UNLIKELY(offInstr >= DIS_MAX_INSTR_LENGTH)) @@ -325,5 +325,5 @@ * @param uAddress The address. */ -DECLINLINE(uint8_t) disReadByte(PDISCPUSTATE pDis, size_t offInstr) +DECLINLINE(uint8_t) disReadByte(PDISSTATE pDis, size_t offInstr) { if (RT_UNLIKELY(offInstr >= pDis->cbCachedInstr)) @@ -342,5 +342,5 @@ * instruction. */ -DECL_NO_INLINE(static, uint16_t) disReadWordSlow(PDISCPUSTATE pDis, size_t offInstr) +DECL_NO_INLINE(static, uint16_t) disReadWordSlow(PDISSTATE pDis, size_t offInstr) { if (RT_UNLIKELY(offInstr + 2 > DIS_MAX_INSTR_LENGTH)) @@ -370,5 +370,5 @@ * instruction. */ -DECLINLINE(uint16_t) disReadWord(PDISCPUSTATE pDis, size_t offInstr) +DECLINLINE(uint16_t) disReadWord(PDISSTATE pDis, size_t offInstr) { if (RT_UNLIKELY(offInstr + 2 > pDis->cbCachedInstr)) @@ -391,5 +391,5 @@ * instruction. */ -DECL_NO_INLINE(static, uint32_t) disReadDWordSlow(PDISCPUSTATE pDis, size_t offInstr) +DECL_NO_INLINE(static, uint32_t) disReadDWordSlow(PDISSTATE pDis, size_t offInstr) { if (RT_UNLIKELY(offInstr + 4 > DIS_MAX_INSTR_LENGTH)) @@ -427,5 +427,5 @@ * instruction. */ -DECLINLINE(uint32_t) disReadDWord(PDISCPUSTATE pDis, size_t offInstr) +DECLINLINE(uint32_t) disReadDWord(PDISSTATE pDis, size_t offInstr) { if (RT_UNLIKELY(offInstr + 4 > pDis->cbCachedInstr)) @@ -449,5 +449,5 @@ * instruction. */ -DECL_NO_INLINE(static, uint64_t) disReadQWordSlow(PDISCPUSTATE pDis, size_t offInstr) +DECL_NO_INLINE(static, uint64_t) disReadQWordSlow(PDISSTATE pDis, size_t offInstr) { if (RT_UNLIKELY(offInstr + 8 > DIS_MAX_INSTR_LENGTH)) @@ -500,5 +500,5 @@ * @param uAddress The address. */ -DECLINLINE(uint64_t) disReadQWord(PDISCPUSTATE pDis, size_t offInstr) +DECLINLINE(uint64_t) disReadQWord(PDISSTATE pDis, size_t offInstr) { if (RT_UNLIKELY(offInstr + 8 > pDis->cbCachedInstr)) @@ -519,5 +519,5 @@ //***************************************************************************** //***************************************************************************** -static size_t disParseInstruction(size_t offInstr, PCDISOPCODE pOp, PDISCPUSTATE pDis) +static size_t disParseInstruction(size_t offInstr, PCDISOPCODE pOp, PDISSTATE pDis) { size_t size = 0; @@ -591,5 +591,5 @@ /* Floating point opcode parsing */ //***************************************************************************** -static size_t ParseEscFP(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseEscFP(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { int index; @@ -656,5 +656,5 @@ // Scale Index Base //***************************************************************************** -static void UseSIB(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static void UseSIB(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); @@ -705,5 +705,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseSIB(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseSIB(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { unsigned size = sizeof(uint8_t); @@ -738,5 +738,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseSIB_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseSIB_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { unsigned size = sizeof(uint8_t); @@ -771,5 +771,5 @@ // Mod Reg/Opcode R/M //***************************************************************************** -static size_t UseModRM(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t UseModRM(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { unsigned vtype = OP_PARM_VTYPE(pParam->fParam); @@ -948,5 +948,5 @@ // Query the size of the ModRM parameters and fetch the immediate data (if any) //***************************************************************************** -static size_t QueryModRM(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis, size_t *pSibInc) +static size_t QueryModRM(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis, size_t *pSibInc) { size_t sibinc; @@ -1031,5 +1031,5 @@ // Query the size of the ModRM parameters and fetch the immediate data (if any) //***************************************************************************** -static size_t QueryModRM_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis, size_t *pSibInc) +static size_t QueryModRM_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis, size_t *pSibInc) { size_t sibinc; @@ -1106,5 +1106,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseIllegal(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseIllegal(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); NOREF(pDis); @@ -1114,5 +1114,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseModRM(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseModRM(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = sizeof(uint8_t); //ModRM byte @@ -1160,5 +1160,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseModRM_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseModRM_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = sizeof(uint8_t); //ModRM byte @@ -1207,5 +1207,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseModFence(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseModFence(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { ////AssertMsgFailed(("??\n")); @@ -1216,5 +1216,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmByte(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmByte(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(pOp); @@ -1226,5 +1226,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmByte_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmByte_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); NOREF(pDis); @@ -1233,5 +1233,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmByteSX(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmByteSX(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(pOp); @@ -1259,5 +1259,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmByteSX_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmByteSX_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); NOREF(pDis); @@ -1266,5 +1266,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmUshort(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmUshort(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(pOp); @@ -1276,5 +1276,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmUshort_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmUshort_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); NOREF(pDis); @@ -1283,5 +1283,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmUlong(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmUlong(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(pOp); @@ -1293,5 +1293,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmUlong_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmUlong_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); NOREF(pDis); @@ -1300,5 +1300,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmQword(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmQword(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(pOp); @@ -1310,5 +1310,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmQword_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmQword_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); NOREF(pDis); @@ -1317,5 +1317,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmV(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmV(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(pOp); @@ -1343,5 +1343,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmV_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmV_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); @@ -1354,5 +1354,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmZ(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmZ(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(pOp); @@ -1383,5 +1383,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmZ_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmZ_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); @@ -1395,5 +1395,5 @@ // Relative displacement for branches (rel. to next instruction) //***************************************************************************** -static size_t ParseImmBRel(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmBRel(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(pOp); @@ -1406,5 +1406,5 @@ // Relative displacement for branches (rel. to next instruction) //***************************************************************************** -static size_t ParseImmBRel_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmBRel_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); NOREF(pDis); @@ -1414,5 +1414,5 @@ // Relative displacement for branches (rel. to next instruction) //***************************************************************************** -static size_t ParseImmVRel(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmVRel(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(pOp); @@ -1442,5 +1442,5 @@ // Relative displacement for branches (rel. to next instruction) //***************************************************************************** -static size_t ParseImmVRel_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmVRel_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); NOREF(pParam); @@ -1452,5 +1452,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmAddr(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmAddr(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { if (pDis->uAddrMode == DISCPUMODE_32BIT) @@ -1514,5 +1514,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmAddr_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmAddr_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); @@ -1547,5 +1547,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmAddrF(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmAddrF(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { // immediate far pointers - only 16:16 or 16:32; determined by operand, *not* address size! @@ -1570,5 +1570,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmAddrF_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmAddrF_SizeOnly(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); @@ -1589,5 +1589,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseFixedReg(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseFixedReg(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); @@ -1690,5 +1690,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseXv(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseXv(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); @@ -1715,5 +1715,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseXb(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseXb(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); @@ -1740,5 +1740,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseYv(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseYv(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); @@ -1765,5 +1765,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseYb(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseYb(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { NOREF(offInstr); NOREF(pOp); @@ -1790,5 +1790,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseTwoByteEsc(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseTwoByteEsc(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { PCDISOPCODE pOpcode; @@ -1849,5 +1849,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseThreeByteEsc4(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseThreeByteEsc4(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { PCDISOPCODE pOpcode; @@ -1910,5 +1910,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseThreeByteEsc5(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseThreeByteEsc5(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { PCDISOPCODE pOpcode; @@ -1945,5 +1945,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseNopPause(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseNopPause(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -1963,5 +1963,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseImmGrpl(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseImmGrpl(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { int idx = (pDis->bOpCode - 0x80) * 8; @@ -1983,5 +1983,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseShiftGrp2(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseShiftGrp2(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { int idx; @@ -2023,5 +2023,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp3(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp3(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { int idx = (pDis->bOpCode - 0xF6) * 8; @@ -2044,5 +2044,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp4(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp4(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2064,5 +2064,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp5(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp5(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2088,5 +2088,5 @@ // //***************************************************************************** -static size_t Parse3DNow(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t Parse3DNow(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2124,5 +2124,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp6(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp6(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2144,5 +2144,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp7(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp7(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2172,5 +2172,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp8(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp8(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2192,5 +2192,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp9(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp9(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2212,5 +2212,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp10(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp10(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2232,5 +2232,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp12(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp12(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2254,5 +2254,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp13(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp13(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2276,5 +2276,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp14(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp14(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2298,5 +2298,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp15(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp15(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2322,5 +2322,5 @@ //***************************************************************************** //***************************************************************************** -static size_t ParseGrp16(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISCPUSTATE pDis) +static size_t ParseGrp16(size_t offInstr, PCDISOPCODE pOp, PDISOPPARAM pParam, PDISSTATE pDis) { size_t size = 0; @@ -2341,5 +2341,5 @@ //***************************************************************************** //***************************************************************************** -static void disasmModRMReg(PDISCPUSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam, int fRegAddr) +static void disasmModRMReg(PDISSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam, int fRegAddr) { NOREF(pOp); NOREF(pDis); @@ -2419,5 +2419,5 @@ static const uint8_t g_auIndexModRMReg16[4] = { DISGREG_SI, DISGREG_DI, DISGREG_SI, DISGREG_DI }; //***************************************************************************** -static void disasmModRMReg16(PDISCPUSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam) +static void disasmModRMReg16(PDISSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam) { NOREF(pDis); NOREF(pOp); @@ -2432,5 +2432,5 @@ //***************************************************************************** //***************************************************************************** -static void disasmModRMSReg(PDISCPUSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam) +static void disasmModRMSReg(PDISSTATE pDis, PCDISOPCODE pOp, unsigned idx, PDISOPPARAM pParam) { NOREF(pOp); @@ -2474,5 +2474,5 @@ * @param pDis Fully disassembled instruction. */ -static void disValidateLockSequence(PDISCPUSTATE pDis) +static void disValidateLockSequence(PDISSTATE pDis) { Assert(pDis->fPrefix & DISPREFIX_LOCK); @@ -2538,5 +2538,5 @@ * @param pcbInstr Where to store the instruction size. Can be NULL. */ -static int disInstrWorker(PDISCPUSTATE pDis, PCDISOPCODE paOneByteMap, uint32_t *pcbInstr) +static int disInstrWorker(PDISSTATE pDis, PCDISOPCODE paOneByteMap, uint32_t *pcbInstr) { /* @@ -2654,5 +2654,5 @@ */ DECL_FORCE_INLINE(PCDISOPCODE) -disInitializeState(PDISCPUSTATE pDis, RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t fFilter, +disInitializeState(PDISSTATE pDis, RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t fFilter, PFNDISREADBYTES pfnReadBytes, void *pvUser) { @@ -2660,5 +2660,5 @@ * Note! The RT_BZERO make ASSUMPTIONS about the placement of pvUser2. */ - RT_BZERO(pDis, RT_OFFSETOF(DISCPUSTATE, pvUser2)); + RT_BZERO(pDis, RT_OFFSETOF(DISSTATE, pvUser2)); #ifdef VBOX_STRICT /* poison */ @@ -2710,5 +2710,5 @@ * Reads some bytes into the cache. * - * While this will set DISCPUSTATE::rc on failure, the caller should disregard + * While this will set DISSTATE::rc on failure, the caller should disregard * this since that is what would happen if we didn't prefetch bytes prior to the * instruction parsing. @@ -2716,5 +2716,5 @@ * @param pDis The disassembler state. */ -DECL_FORCE_INLINE(void) disPrefetchBytes(PDISCPUSTATE pDis) +DECL_FORCE_INLINE(void) disPrefetchBytes(PDISSTATE pDis) { /* @@ -2748,13 +2748,13 @@ * @param pvUser User argument for the instruction reader. (Ends up in pvUser.) * @param pDis Pointer to CPU structure. With the exception of - * DISCPUSTATE::pvUser2, the structure will be + * DISSTATE::pvUser2, 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::cbInstr.) Optional. + * is also stored in PDISSTATE::cbInstr.) Optional. */ DISDECL(int) DISInstEx(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t fFilter, PFNDISREADBYTES pfnReadBytes, void *pvUser, - PDISCPUSTATE pDis, uint32_t *pcbInstr) + PDISSTATE pDis, uint32_t *pcbInstr) { @@ -2780,14 +2780,14 @@ * @param pvUser User argument for the instruction reader. (Ends up in pvUser.) * @param pDis Pointer to CPU structure. With the exception of - * DISCPUSTATE::pvUser2, the structure will be + * DISSTATE::pvUser2, 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::cbInstr.) Optional. + * is also stored in PDISSTATE::cbInstr.) Optional. */ DISDECL(int) DISInstWithPrefetchedBytes(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, uint32_t fFilter, void const *pvPrefetched, size_t cbPretched, PFNDISREADBYTES pfnReadBytes, void *pvUser, - PDISCPUSTATE pDis, uint32_t *pcbInstr) + PDISSTATE pDis, uint32_t *pcbInstr) { PCDISOPCODE paOneByteMap = disInitializeState(pDis, uInstrAddr, enmCpuMode, fFilter, pfnReadBytes, pvUser); @@ -2825,11 +2825,11 @@ * @param pfnReadBytes Callback for reading instruction bytes. * @param pvUser User argument for the instruction reader. (Ends up in pvUser.) - * @param pDis Pointer to cpu structure. Will be initialized. + * @param pDis Pointer to disassembler state (output). * @param pcbInstr Where to store the size of the instruction. * NULL is allowed. This is also stored in - * PDISCPUSTATE::cbInstr. + * PDISSTATE::cbInstr. */ DISDECL(int) DISInstrWithReader(RTUINTPTR uInstrAddr, DISCPUMODE enmCpuMode, PFNDISREADBYTES pfnReadBytes, void *pvUser, - PDISCPUSTATE pDis, uint32_t *pcbInstr) + PDISSTATE pDis, uint32_t *pcbInstr) { return DISInstEx(uInstrAddr, enmCpuMode, DISOPTYPE_ALL, pfnReadBytes, pvUser, pDis, pcbInstr); @@ -2850,10 +2850,10 @@ * @param pfnReadBytes Callback for reading instruction bytes. * @param pvUser User argument for the instruction reader. (Ends up in pvUser.) - * @param pDis Pointer to cpu structure. Will be initialized. + * @param pDis Pointer to disassembler state (output). * @param pcbInstr Where to store the size of the instruction. * NULL is allowed. This is also stored in - * PDISCPUSTATE::cbInstr. + * PDISSTATE::cbInstr. */ -DISDECL(int) DISInstr(const void *pvInstr, DISCPUMODE enmCpuMode, PDISCPUSTATE pDis, uint32_t *pcbInstr) +DISDECL(int) DISInstr(const void *pvInstr, DISCPUMODE enmCpuMode, PDISSTATE pDis, uint32_t *pcbInstr) { return DISInstEx((uintptr_t)pvInstr, enmCpuMode, DISOPTYPE_ALL, NULL /*pfnReadBytes*/, NULL /*pvUser*/, pDis, pcbInstr); Index: /trunk/src/VBox/Disassembler/DisasmFormatBytes.cpp =================================================================== --- /trunk/src/VBox/Disassembler/DisasmFormatBytes.cpp (revision 41789) +++ /trunk/src/VBox/Disassembler/DisasmFormatBytes.cpp (revision 41790) @@ -36,5 +36,5 @@ * @param fFlags The flags passed to the formatter. */ -size_t disFormatBytes(PCDISCPUSTATE pDis, char *pszDst, size_t cchDst, uint32_t fFlags) +size_t disFormatBytes(PCDISSTATE pDis, char *pszDst, size_t cchDst, uint32_t fFlags) { size_t cchOutput = 0; Index: /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp =================================================================== --- /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp (revision 41789) +++ /trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp (revision 41790) @@ -91,5 +91,5 @@ * @param pcchReg Where to store the length of the name. */ -static const char *disasmFormatYasmBaseReg(PCDISCPUSTATE pDis, PCDISOPPARAM pParam, size_t *pcchReg) +static const char *disasmFormatYasmBaseReg(PCDISSTATE pDis, PCDISOPPARAM pParam, size_t *pcchReg) { switch (pParam->fUse & ( DISUSE_REG_GEN8 | DISUSE_REG_GEN16 | DISUSE_REG_GEN32 | DISUSE_REG_GEN64 @@ -202,5 +202,5 @@ * @param pcchReg Where to store the length of the name. */ -static const char *disasmFormatYasmIndexReg(PCDISCPUSTATE pDis, PCDISOPPARAM pParam, size_t *pcchReg) +static const char *disasmFormatYasmIndexReg(PCDISSTATE pDis, PCDISOPPARAM pParam, size_t *pcchReg) { switch (pDis->uAddrMode) @@ -251,5 +251,5 @@ * @param pvUser User argument for pfnGetSymbol. */ -DISDECL(size_t) DISFormatYasmEx(PCDISCPUSTATE pDis, char *pszBuf, size_t cchBuf, uint32_t fFlags, +DISDECL(size_t) DISFormatYasmEx(PCDISSTATE pDis, char *pszBuf, size_t cchBuf, uint32_t fFlags, PFNDISGETSYMBOL pfnGetSymbol, void *pvUser) { @@ -1191,5 +1191,5 @@ * @param cchBuf The size of the output buffer. */ -DISDECL(size_t) DISFormatYasm(PCDISCPUSTATE pDis, char *pszBuf, size_t cchBuf) +DISDECL(size_t) DISFormatYasm(PCDISSTATE pDis, char *pszBuf, size_t cchBuf) { return DISFormatYasmEx(pDis, pszBuf, cchBuf, 0 /* fFlags */, NULL /* pfnGetSymbol */, NULL /* pvUser */); @@ -1206,5 +1206,5 @@ * bytes. */ -DISDECL(bool) DISFormatYasmIsOddEncoding(PDISCPUSTATE pDis) +DISDECL(bool) DISFormatYasmIsOddEncoding(PDISSTATE pDis) { /* Index: /trunk/src/VBox/Disassembler/DisasmInternal.h =================================================================== --- /trunk/src/VBox/Disassembler/DisasmInternal.h (revision 41789) +++ /trunk/src/VBox/Disassembler/DisasmInternal.h (revision 41790) @@ -171,5 +171,5 @@ -size_t disFormatBytes(PCDISCPUSTATE pDis, char *pszDst, size_t cchDst, uint32_t fFlags); +size_t disFormatBytes(PCDISSTATE pDis, char *pszDst, size_t cchDst, uint32_t fFlags); /** @} */ Index: /trunk/src/VBox/Disassembler/DisasmReg.cpp =================================================================== --- /trunk/src/VBox/Disassembler/DisasmReg.cpp (revision 41789) +++ /trunk/src/VBox/Disassembler/DisasmReg.cpp (revision 41790) @@ -201,5 +201,5 @@ //***************************************************************************** //***************************************************************************** -DISDECL(int) DISGetParamSize(PCDISCPUSTATE pDis, PCDISOPPARAM pParam) +DISDECL(int) DISGetParamSize(PCDISSTATE pDis, PCDISOPPARAM pParam) { unsigned subtype = OP_PARM_VSUBTYPE(pParam->fParam); @@ -257,5 +257,5 @@ //***************************************************************************** //***************************************************************************** -DISDECL(DISSELREG) DISDetectSegReg(PCDISCPUSTATE pDis, PCDISOPPARAM pParam) +DISDECL(DISSELREG) DISDetectSegReg(PCDISSTATE pDis, PCDISOPPARAM pParam) { if (pDis->fPrefix & DISPREFIX_SEG) @@ -278,5 +278,5 @@ //***************************************************************************** //***************************************************************************** -DISDECL(uint8_t) DISQuerySegPrefixByte(PCDISCPUSTATE pDis) +DISDECL(uint8_t) DISQuerySegPrefixByte(PCDISSTATE pDis) { Assert(pDis->fPrefix & DISPREFIX_SEG); @@ -499,5 +499,5 @@ * */ -DISDECL(int) DISQueryParamVal(PCPUMCTXCORE pCtx, PCDISCPUSTATE pDis, PCDISOPPARAM pParam, PDISQPVPARAMVAL pParamVal, DISQPVWHICH parmtype) +DISDECL(int) DISQueryParamVal(PCPUMCTXCORE pCtx, PCDISSTATE pDis, PCDISOPPARAM pParam, PDISQPVPARAMVAL pParamVal, DISQPVWHICH parmtype) { memset(pParamVal, 0, sizeof(*pParamVal)); @@ -757,5 +757,5 @@ * */ -DISDECL(int) DISQueryParamRegPtr(PCPUMCTXCORE pCtx, PCDISCPUSTATE pDis, PCDISOPPARAM pParam, void **ppReg, size_t *pcbSize) +DISDECL(int) DISQueryParamRegPtr(PCPUMCTXCORE pCtx, PCDISSTATE pDis, PCDISOPPARAM pParam, void **ppReg, size_t *pcbSize) { NOREF(pDis); Index: /trunk/src/VBox/Disassembler/testcase/tstDisasm-1.cpp =================================================================== --- /trunk/src/VBox/Disassembler/testcase/tstDisasm-1.cpp (revision 41789) +++ /trunk/src/VBox/Disassembler/testcase/tstDisasm-1.cpp (revision 41790) @@ -43,10 +43,10 @@ uint32_t const cErrBefore = RTTestIErrorCount(); uint32_t cb = 1; - DISCPUSTATE Cpu; + DISSTATE Dis; char szOutput[256] = {0}; - int rc = DISInstrToStr(&pabInstrs[off], enmDisCpuMode, &Cpu, &cb, szOutput, sizeof(szOutput)); + int rc = DISInstrToStr(&pabInstrs[off], enmDisCpuMode, &Dis, &cb, szOutput, sizeof(szOutput)); RTTESTI_CHECK_RC(rc, VINF_SUCCESS); - RTTESTI_CHECK(cb == Cpu.cbInstr); + RTTESTI_CHECK(cb == Dis.cbInstr); RTTESTI_CHECK(cb > 0); RTTESTI_CHECK(cb <= 16); @@ -70,5 +70,5 @@ if (cErrBefore != RTTestIErrorCount()) RTTestIFailureDetails("rc=%Rrc, off=%#x (%u) cbInstr=%u enmDisCpuMode=%d\n", - rc, off, Cpu.cbInstr, enmDisCpuMode); + rc, off, Dis.cbInstr, enmDisCpuMode); RTTestIPrintf(RTTESTLVL_ALWAYS, "%s\n", szOutput); off += cb; @@ -87,7 +87,7 @@ for (size_t off = 0; off < cbInstrs; cInstrs++) { - uint32_t cb = 1; - DISCPUSTATE Cpu; - DISInstr(&pabInstrs[off], enmDisCpuMode, &Cpu, &cb); + uint32_t cb = 1; + DISSTATE Dis; + DISInstr(&pabInstrs[off], enmDisCpuMode, &Dis, &cb); off += cb; } Index: /trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp =================================================================== --- /trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp (revision 41789) +++ /trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp (revision 41790) @@ -40,5 +40,5 @@ typedef struct MYDISSTATE { - DISCPUSTATE Cpu; + DISSTATE Dis; uint64_t uAddress; /**< The current instruction address. */ uint8_t *pbInstr; /**< The current instruction (pointer). */ @@ -93,5 +93,5 @@ #else - size_t cch = DISFormatYasmEx(&pState->Cpu, szTmp, sizeof(szTmp), + size_t cch = DISFormatYasmEx(&pState->Dis, szTmp, sizeof(szTmp), DIS_FMT_FLAGS_STRICT | DIS_FMT_FLAGS_ADDR_RIGHT | DIS_FMT_FLAGS_ADDR_COMMENT | DIS_FMT_FLAGS_BYTES_RIGHT | DIS_FMT_FLAGS_BYTES_COMMENT | DIS_FMT_FLAGS_BYTES_SPACED, @@ -130,5 +130,5 @@ * @param pDis The disassembler output. */ -static bool MyDisasIsValidInstruction(DISCPUSTATE const *pDis) +static bool MyDisasIsValidInstruction(DISSTATE const *pDis) { switch (pDis->pCurInstr->uOpcode) @@ -168,8 +168,8 @@ * @interface_method_impl{FNDISREADBYTES} */ -static DECLCALLBACK(int) MyDisasInstrRead(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead) +static DECLCALLBACK(int) MyDisasInstrRead(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead) { PMYDISSTATE pState = (PMYDISSTATE)pDis; - RTUINTPTR uSrcAddr = pState->Cpu.uInstrAddr + offInstr; + RTUINTPTR uSrcAddr = pState->Dis.uInstrAddr + offInstr; if (RT_LIKELY( pState->uNextAddr == uSrcAddr && pState->cbLeft >= cbMinRead)) @@ -180,6 +180,6 @@ //size_t cbToRead = cbMaxRead; size_t cbToRead = cbMinRead; - memcpy(&pState->Cpu.abInstr[offInstr], pState->pbNext, cbToRead); - pState->Cpu.cbCachedInstr = offInstr + cbToRead; + memcpy(&pState->Dis.abInstr[offInstr], pState->pbNext, cbToRead); + pState->Dis.cbCachedInstr = offInstr + cbToRead; pState->pbNext += cbToRead; pState->cbLeft -= cbToRead; @@ -195,5 +195,5 @@ if (pState->cbLeft > 0) { - memcpy(&pState->Cpu.abInstr[offInstr], pState->pbNext, pState->cbLeft); + memcpy(&pState->Dis.abInstr[offInstr], pState->pbNext, pState->cbLeft); offInstr += (uint8_t)pState->cbLeft; cbMinRead -= (uint8_t)pState->cbLeft; @@ -202,5 +202,5 @@ pState->cbLeft = 0; } - memset(&pState->Cpu.abInstr[offInstr], 0xcc, cbMinRead); + memset(&pState->Dis.abInstr[offInstr], 0xcc, cbMinRead); pState->rc = VERR_EOF; } @@ -211,8 +211,8 @@ */ RTStrmPrintf(g_pStdErr, "Reading before current instruction!\n"); - memset(&pState->Cpu.abInstr[offInstr], 0x90, cbMinRead); + memset(&pState->Dis.abInstr[offInstr], 0x90, cbMinRead); pState->rc = VERR_INTERNAL_ERROR; } - pState->Cpu.cbCachedInstr = offInstr + cbMinRead; + pState->Dis.cbCachedInstr = offInstr + cbMinRead; return pState->rc; } @@ -286,5 +286,5 @@ int rc = DISInstrToStrWithReader(State.uAddress, enmCpuMode, MyDisasInstrRead, &State, - &State.Cpu, &State.cbInstr, State.szLine, sizeof(State.szLine)); + &State.Dis, &State.cbInstr, State.szLine, sizeof(State.szLine)); if ( RT_SUCCESS(rc) || ( ( rc == VERR_DIS_INVALID_OPCODE @@ -294,24 +294,24 @@ State.fUndefOp = rc == VERR_DIS_INVALID_OPCODE || rc == VERR_DIS_GEN_FAILURE - || State.Cpu.pCurInstr->uOpcode == OP_INVALID - || State.Cpu.pCurInstr->uOpcode == OP_ILLUD2 + || State.Dis.pCurInstr->uOpcode == OP_INVALID + || State.Dis.pCurInstr->uOpcode == OP_ILLUD2 || ( State.enmUndefOp == kUndefOp_DefineByte - && !MyDisasIsValidInstruction(&State.Cpu)); + && !MyDisasIsValidInstruction(&State.Dis)); if (State.fUndefOp && State.enmUndefOp == kUndefOp_DefineByte) { if (!State.cbInstr) { - State.Cpu.abInstr[0] = 0; - State.Cpu.pfnReadBytes(&State.Cpu, 0, 1, 1); + State.Dis.abInstr[0] = 0; + State.Dis.pfnReadBytes(&State.Dis, 0, 1, 1); State.cbInstr = 1; } RTPrintf(" db"); for (unsigned off = 0; off < State.cbInstr; off++) - RTPrintf(off ? ", %03xh" : " %03xh", State.Cpu.abInstr[off]); + RTPrintf(off ? ", %03xh" : " %03xh", State.Dis.abInstr[off]); RTPrintf(" ; %s\n", State.szLine); } else if (!State.fUndefOp && State.enmUndefOp == kUndefOp_All) { - RTPrintf("%s: error at %#RX64: unexpected valid instruction (op=%d)\n", argv0, State.uAddress, State.Cpu.pCurInstr->uOpcode); + RTPrintf("%s: error at %#RX64: unexpected valid instruction (op=%d)\n", argv0, State.uAddress, State.Dis.pCurInstr->uOpcode); pfnFormatter(&State); rcRet = VERR_GENERAL_FAILURE; @@ -319,5 +319,5 @@ else if (State.fUndefOp && State.enmUndefOp == kUndefOp_Fail) { - RTPrintf("%s: error at %#RX64: undefined opcode (op=%d)\n", argv0, State.uAddress, State.Cpu.pCurInstr->uOpcode); + RTPrintf("%s: error at %#RX64: undefined opcode (op=%d)\n", argv0, State.uAddress, State.Dis.pCurInstr->uOpcode); pfnFormatter(&State); rcRet = VERR_GENERAL_FAILURE; @@ -327,9 +327,9 @@ /* Use db for odd encodings that we can't make the assembler use. */ if ( State.enmUndefOp == kUndefOp_DefineByte - && DISFormatYasmIsOddEncoding(&State.Cpu)) + && DISFormatYasmIsOddEncoding(&State.Dis)) { RTPrintf(" db"); for (unsigned off = 0; off < State.cbInstr; off++) - RTPrintf(off ? ", %03xh" : " %03xh", State.Cpu.abInstr[off]); + RTPrintf(off ? ", %03xh" : " %03xh", State.Dis.abInstr[off]); RTPrintf(" ; "); }