mirror of https://github.com/x64dbg/zydis
Reimplemented a basic version of semantic operand-decoding
This commit is contained in:
flobernd
parent
26d39cc7f0
commit
702f6b8d53
|
|
@ -107,74 +107,42 @@ typedef uint8_t ZydisOperandEncoding;
|
|||
enum ZydisOperandEncodings
|
||||
{
|
||||
ZYDIS_OPERAND_ENCODING_NONE,
|
||||
/**
|
||||
* @brief The operand is encoded in the ModRM.reg field.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_REG,
|
||||
/**
|
||||
* @brief The operand is encoded in the ModRM.rm field.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_RM,
|
||||
/**
|
||||
* @brief The operand is encoded in the ModRM.rm field and uses the compressed-disp8 form.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_RM_CD2,
|
||||
/**
|
||||
* @brief The operand is encoded in the ModRM.rm field and uses the compressed-disp8 form.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_RM_CD4,
|
||||
/**
|
||||
* @brief The operand is encoded in the ModRM.rm field and uses the compressed-disp8 form.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_RM_CD8,
|
||||
/**
|
||||
* @brief The operand is encoded in the ModRM.rm field and uses the compressed-disp8 form.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_RM_CD16,
|
||||
/**
|
||||
* @brief The operand is encoded in the ModRM.rm field and uses the compressed-disp8 form.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_RM_CD32,
|
||||
/**
|
||||
* @brief The operand is encoded in the ModRM.rm field and uses the compressed-disp8 form.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_RM_CD64,
|
||||
/**
|
||||
* @brief The operand is encoded in the lower 4 bits of the opcode (register only).
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_MODRM_REG,
|
||||
ZYDIS_OPERAND_ENCODING_MODRM_RM,
|
||||
ZYDIS_OPERAND_ENCODING_OPCODE,
|
||||
/**
|
||||
* @brief The operand is encoded in the VEX/EVEX.vvvv field.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_VVVV,
|
||||
/**
|
||||
* @brief The operand is encoded in the EVEX.aaa field.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_AAA,
|
||||
/**
|
||||
* @brief The operand is encoded in the low-part of an 8-bit immediate value.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_IMM8_LO,
|
||||
/**
|
||||
* @brief The operand is encoded in the high-part of an 8-bit immediate value.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_IMM8_HI,
|
||||
/**
|
||||
* @brief The operand is encoded as an 8-bit immediate value.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_IMM8,
|
||||
/**
|
||||
* @brief The operand is encoded as an 16-bit immediate value.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_IMM16,
|
||||
/**
|
||||
* @brief The operand is encoded as an 32-bit immediate value.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_IMM32,
|
||||
/**
|
||||
* @brief The operand is encoded as an 64-bit immediate value.
|
||||
*/
|
||||
ZYDIS_OPERAND_ENCODING_IMM64
|
||||
ZYDIS_OPERAND_ENCODING_NDS,
|
||||
ZYDIS_OPERAND_ENCODING_MASK,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM8_LO,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM8_HI,
|
||||
ZYDIS_OPERAND_ENCODING_DISP8,
|
||||
ZYDIS_OPERAND_ENCODING_DISP16,
|
||||
ZYDIS_OPERAND_ENCODING_DISP32,
|
||||
ZYDIS_OPERAND_ENCODING_DISP64,
|
||||
ZYDIS_OPERAND_ENCODING_DISP16_32_64,
|
||||
ZYDIS_OPERAND_ENCODING_DISP32_32_64,
|
||||
ZYDIS_OPERAND_ENCODING_DISP16_32_32,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM_CONST1,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM8,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM16,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM32,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM64,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM16_32_64,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM32_32_64,
|
||||
ZYDIS_OPERAND_ENCODING_UIMM16_32_32,
|
||||
ZYDIS_OPERAND_ENCODING_SIMM8,
|
||||
ZYDIS_OPERAND_ENCODING_SIMM16,
|
||||
ZYDIS_OPERAND_ENCODING_SIMM32,
|
||||
ZYDIS_OPERAND_ENCODING_SIMM64,
|
||||
ZYDIS_OPERAND_ENCODING_SIMM16_32_64,
|
||||
ZYDIS_OPERAND_ENCODING_SIMM32_32_64,
|
||||
ZYDIS_OPERAND_ENCODING_SIMM16_32_32,
|
||||
ZYDIS_OPERAND_ENCODING_JIMM8,
|
||||
ZYDIS_OPERAND_ENCODING_JIMM16,
|
||||
ZYDIS_OPERAND_ENCODING_JIMM32,
|
||||
ZYDIS_OPERAND_ENCODING_JIMM64,
|
||||
ZYDIS_OPERAND_ENCODING_JIMM16_32_64,
|
||||
ZYDIS_OPERAND_ENCODING_JIMM32_32_64,
|
||||
ZYDIS_OPERAND_ENCODING_JIMM16_32_32
|
||||
};
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
|
@ -191,6 +159,7 @@ typedef uint8_t ZydisOperandVisibility;
|
|||
*/
|
||||
enum ZydisOperandVisibilities
|
||||
{
|
||||
ZYDIS_OPERAND_VISIBILITY_INVALID,
|
||||
/**
|
||||
* @brief The operand is explicitly encoded in the instruction.
|
||||
*/
|
||||
|
|
@ -219,6 +188,7 @@ typedef uint8_t ZydisOperandAction;
|
|||
*/
|
||||
enum ZydisOperandActions
|
||||
{
|
||||
ZYDIS_OPERAND_ACTION_INVALID,
|
||||
/**
|
||||
* @brief The operand is read by the instruction.
|
||||
*/
|
||||
|
|
@ -234,19 +204,45 @@ enum ZydisOperandActions
|
|||
/**
|
||||
* @brief The operand is conditionally read by the instruction.
|
||||
*/
|
||||
ZYDIS_OPERAND_ACTION_COND_READ,
|
||||
ZYDIS_OPERAND_ACTION_CONDREAD,
|
||||
/**
|
||||
* @brief The operand is conditionally written by the instruction (may write).
|
||||
*/
|
||||
ZYDIS_OPERAND_ACTION_COND_WRITE,
|
||||
ZYDIS_OPERAND_ACTION_CONDWRITE,
|
||||
/**
|
||||
* @brief The operand is read and conditionally written by the instruction (may write).
|
||||
*/
|
||||
ZYDIS_OPERAND_ACTION_READ_COND_WRITE,
|
||||
ZYDIS_OPERAND_ACTION_READ_CONDWRITE,
|
||||
/**
|
||||
* @brief The operand is written conditionally read by the instruction (must write).
|
||||
* @brief The operand is written and conditionally read by the instruction (must write).
|
||||
*/
|
||||
ZYDIS_OPERAND_ACTION_WRITE_COND_READ,
|
||||
ZYDIS_OPERAND_ACTION_CONDREAD_WRITE,
|
||||
};
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
/* Element type */
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* @brief Defines the @c ZydisElementType datatype.
|
||||
*/
|
||||
typedef uint8_t ZydisElementType;
|
||||
|
||||
/**
|
||||
* @brief Values that represent element-types.
|
||||
*/
|
||||
enum ZydisElementTypes
|
||||
{
|
||||
ZYDIS_ELEMENT_TYPE_INVALID,
|
||||
ZYDIS_ELEMENT_TYPE_VARIABLE, // TODO: Remove
|
||||
ZYDIS_ELEMENT_TYPE_STRUCT,
|
||||
ZYDIS_ELEMENT_TYPE_UINT,
|
||||
ZYDIS_ELEMENT_TYPE_INT,
|
||||
ZYDIS_ELEMENT_TYPE_FLOAT16,
|
||||
ZYDIS_ELEMENT_TYPE_FLOAT32,
|
||||
ZYDIS_ELEMENT_TYPE_FLOAT64,
|
||||
ZYDIS_ELEMENT_TYPE_FLOAT80,
|
||||
ZYDIS_ELEMENT_TYPE_LONGBCD
|
||||
};
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
|
@ -258,8 +254,6 @@ enum ZydisOperandActions
|
|||
*/
|
||||
typedef struct ZydisOperandInfo_
|
||||
{
|
||||
// semantic operand type ... temporary
|
||||
uint32_t temp;
|
||||
/**
|
||||
* @brief The operand-id.
|
||||
*/
|
||||
|
|
@ -272,18 +266,30 @@ typedef struct ZydisOperandInfo_
|
|||
* @brief The visibility of the operand.
|
||||
*/
|
||||
ZydisOperandVisibility visibility;
|
||||
/**
|
||||
* @brief The operand-encoding (only valid for explicit operands).
|
||||
*/
|
||||
ZydisOperandEncoding encoding;
|
||||
/**
|
||||
* @brief The operand-action.
|
||||
*/
|
||||
ZydisOperandAction action;
|
||||
/**
|
||||
* @brief The operand-encoding.
|
||||
*/
|
||||
ZydisOperandEncoding encoding;
|
||||
/**
|
||||
* @brief The logical size of the operand (in bytes).
|
||||
*/
|
||||
uint16_t size;
|
||||
/**
|
||||
* @brief The element-type.
|
||||
*/
|
||||
ZydisElementType elementType;
|
||||
/**
|
||||
* @brief The size of a single element.
|
||||
*/
|
||||
uint16_t elementSize;
|
||||
/**
|
||||
* @brief The number of elements.
|
||||
*/
|
||||
uint16_t elementCount;
|
||||
/**
|
||||
* @brief Extended info for register-operands.
|
||||
*/
|
||||
|
|
@ -293,10 +299,6 @@ typedef struct ZydisOperandInfo_
|
|||
*/
|
||||
struct
|
||||
{
|
||||
/**
|
||||
* @brief The adress size (16, 32 or 64 bit).
|
||||
*/
|
||||
uint8_t addressSize;
|
||||
/**
|
||||
* @brief The segment register.
|
||||
*/
|
||||
|
|
@ -318,6 +320,10 @@ typedef struct ZydisOperandInfo_
|
|||
*/
|
||||
struct
|
||||
{
|
||||
/**
|
||||
* @brief Signals, if the displacement value is used.
|
||||
*/
|
||||
ZydisBool hasDisplacement;
|
||||
/**
|
||||
* @brief The displacement value
|
||||
*/
|
||||
|
|
@ -328,15 +334,6 @@ typedef struct ZydisOperandInfo_
|
|||
int32_t sdword;
|
||||
int64_t sqword;
|
||||
} value;
|
||||
/**
|
||||
* @brief The physical displacement size, in bits.
|
||||
*/
|
||||
uint8_t dataSize;
|
||||
/**
|
||||
* @brief The offset of the displacement data, relative to the beginning of the
|
||||
* instruction, in bytes.
|
||||
*/
|
||||
uint8_t dataOffset;
|
||||
} disp;
|
||||
} mem;
|
||||
/**
|
||||
|
|
@ -375,15 +372,6 @@ typedef struct ZydisOperandInfo_
|
|||
int64_t sqword;
|
||||
uint64_t uqword;
|
||||
} value;
|
||||
/**
|
||||
* @brief The physical immediate size, in bits.
|
||||
*/
|
||||
uint8_t dataSize;
|
||||
/**
|
||||
* @brief The offset of the immediate data, relative to the beginning of the
|
||||
* instruction, in bytes.
|
||||
*/
|
||||
uint8_t dataOffset;
|
||||
} imm;
|
||||
} ZydisOperandInfo;
|
||||
|
||||
|
|
@ -699,125 +687,117 @@ typedef uint64_t ZydisInstructionAttributes;
|
|||
#define ZYDIS_ATTRIB_HAS_ADDRESSSIZE 0x0000001000000000
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
/* AVX mask policy */
|
||||
/* AVX vector-length */
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* @brief Defines the @c ZydisAVX512MaskPolicy datatype.
|
||||
* @brief Defines the @c ZydisVectorLength datatype.
|
||||
*/
|
||||
typedef uint8_t ZydisAVX512MaskPolicy;
|
||||
typedef uint16_t ZydisVectorLength;
|
||||
|
||||
/**
|
||||
* @brief Values that represent avx-512 mask-policies.
|
||||
* @brief Values that represent vector-lengths.
|
||||
*/
|
||||
enum ZydisAVX512MaskPolicies
|
||||
enum ZydisVectorLengths
|
||||
{
|
||||
ZYDIS_AVX512_MASKPOLICY_INVALID,
|
||||
/**
|
||||
* @brief The instruction accepts mask-registers other than the default-mask (@c REG_K0), but
|
||||
* does not require them.
|
||||
*/
|
||||
ZYDIS_AVX512_MASKPOLICY_MASK_ACCEPTED,
|
||||
/**
|
||||
* @brief The instruction requires a mask-register other than the default-mask (@c REG_K0).
|
||||
*/
|
||||
ZYDIS_AVX512_MASKPOLICY_MASK_REQUIRED,
|
||||
/**
|
||||
* @brief The instruction does not allow a mask-register other than the default-mask
|
||||
* (@c REG_K0).
|
||||
*/
|
||||
ZYDIS_AVX512_MASKPOLICY_MASK_FORBIDDEN
|
||||
ZYDIS_VECTOR_LENGTH_INVALID = 0,
|
||||
ZYDIS_VECTOR_LENGTH_128 = 128,
|
||||
ZYDIS_VECTOR_LENGTH_256 = 256,
|
||||
ZYDIS_VECTOR_LENGTH_512 = 512
|
||||
};
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
/* AVX mask mode */
|
||||
/* EVEX tuple-type */
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* @brief Defines the @c ZydisAVX512MaskMode datatype.
|
||||
* @brief Defines the @c ZydisEVEXTupleType datatype.
|
||||
*/
|
||||
typedef uint8_t ZydisAVX512MaskMode;
|
||||
typedef uint8_t ZydisEVEXTupleType;
|
||||
|
||||
/**
|
||||
* @brief Values that represent avx-512 mask-modes.
|
||||
* @brief Values that represent EVEX tuple-types.
|
||||
*/
|
||||
enum ZydisAVX512MaskModes
|
||||
enum ZydisEVEXTupleTypes
|
||||
{
|
||||
ZYDIS_AVX512_MASKMODE_INVALID,
|
||||
ZYDIS_TUPLETYPE_INVALID,
|
||||
/**
|
||||
* @brief Merge mode. This is the default mode for all EVEX-instructions.
|
||||
* @brief Full Vector
|
||||
*/
|
||||
ZYDIS_AVX512_MASKMODE_MERGE,
|
||||
ZYDIS_TUPLETYPE_FV,
|
||||
/**
|
||||
* @brief The zeroing mode is enabled for this instruction.
|
||||
* @brief Half Vector
|
||||
*/
|
||||
ZYDIS_AVX512_MASKMODE_ZERO
|
||||
ZYDIS_TUPLETYPE_HV,
|
||||
/**
|
||||
* @brief Full Vector Mem
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_FVM,
|
||||
/**
|
||||
* @brief Tuple1 Scalar
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_T1S,
|
||||
/**
|
||||
* @brief Tuple1 Fixed
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_T1F,
|
||||
/**
|
||||
* @brief Gather / Scatter
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_GSCAT,
|
||||
/**
|
||||
* @brief Tuple2
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_T2,
|
||||
/**
|
||||
* @brief Tuple4
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_T4,
|
||||
/**
|
||||
* @brief Tuple8
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_T8,
|
||||
/**
|
||||
* @brief Half Mem
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_HVM,
|
||||
/**
|
||||
* @brief QuarterMem
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_QVM,
|
||||
/**
|
||||
* @brief OctMem
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_OVM,
|
||||
/**
|
||||
* @brief Mem128
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_M128,
|
||||
/**
|
||||
* @brief MOVDDUP
|
||||
*/
|
||||
ZYDIS_TUPLETYPE_DUP
|
||||
};
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
/* AVX broadcast type */
|
||||
/* AVX broadcast-mode */
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* @brief Defines the @c ZydisAVX512BroadcastType datatype.
|
||||
* @brief Defines the @c ZydisBroadcastMode datatype.
|
||||
*/
|
||||
typedef uint8_t ZydisAVX512BroadcastType;
|
||||
typedef uint16_t ZydisBroadcastMode;
|
||||
|
||||
/**
|
||||
* @brief Values that represent avx-512 broadcast-types.
|
||||
* @brief Values that represent AVX broadcast-modes.
|
||||
*/
|
||||
enum ZydisAVX512BroadcastTypes
|
||||
enum ZydisBroadcastModes
|
||||
{
|
||||
ZYDIS_AVX512_BCSTMODE_INVALID,
|
||||
/**
|
||||
* @brief 1to2 broadcast.
|
||||
*/
|
||||
ZYDIS_AVX512_BCSTMODE_2,
|
||||
/**
|
||||
* @brief 1to4 broadcast.
|
||||
*/
|
||||
ZYDIS_AVX512_BCSTMODE_4,
|
||||
/**
|
||||
* @brief 1to8 broadcast.
|
||||
*/
|
||||
ZYDIS_AVX512_BCSTMODE_8,
|
||||
/**
|
||||
* @brief 1to16 broadcast.
|
||||
*/
|
||||
ZYDIS_AVX512_BCSTMODE_16
|
||||
};
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
/* AVX rounding mode */
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* @brief Defines the @c ZydisAVX512RoundingMode datatype.
|
||||
*/
|
||||
typedef uint8_t ZydisAVX512RoundingMode;
|
||||
|
||||
/**
|
||||
* @brief Values that represent avx-512 rounding-modes.
|
||||
*/
|
||||
enum ZydisAVXRoundingModes
|
||||
{
|
||||
ZYDIS_AVX_RNDMODE_INVALID,
|
||||
/**
|
||||
* @brief Round to nearest.
|
||||
*/
|
||||
ZYDIS_AVX_RNDMODE_RN,
|
||||
/**
|
||||
* @brief Round down.
|
||||
*/
|
||||
ZYDIS_AVX_RNDMODE_RD,
|
||||
/**
|
||||
* @brief Round up.
|
||||
*/
|
||||
ZYDIS_AVX_RNDMODE_RU,
|
||||
/**
|
||||
* @brief Round towards zero.
|
||||
*/
|
||||
ZYDIS_AVX_RNDMODE_RZ
|
||||
ZYDIS_BROADCAST_MODE_INVALID,
|
||||
ZYDIS_BROADCAST_MODE_1_TO_2,
|
||||
ZYDIS_BROADCAST_MODE_1_TO_4,
|
||||
ZYDIS_BROADCAST_MODE_1_TO_8,
|
||||
ZYDIS_BROADCAST_MODE_1_TO_16
|
||||
};
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
|
@ -872,7 +852,7 @@ typedef struct ZydisInstructionInfo_
|
|||
/**
|
||||
* @brief Detailed info for all instruction operands.
|
||||
*/
|
||||
ZydisOperandInfo operands[5];
|
||||
ZydisOperandInfo operands[10];
|
||||
/**
|
||||
* @brief Instruction attributes.
|
||||
*/
|
||||
|
|
@ -890,34 +870,15 @@ typedef struct ZydisInstructionInfo_
|
|||
*/
|
||||
uint64_t instrPointer;
|
||||
/**
|
||||
* @brief Extended info for avx-related instructions.
|
||||
* @brief Extended info for AVX instructions.
|
||||
*/
|
||||
struct
|
||||
{
|
||||
/**
|
||||
* @brief The AVX mask-policy.
|
||||
*/
|
||||
ZydisAVX512MaskPolicy maskPolicy;
|
||||
/**
|
||||
* @brief The AVX mask-mode.
|
||||
*/
|
||||
ZydisAVX512MaskMode maskMode;
|
||||
/**
|
||||
* @brief The AVX mask-register.
|
||||
*/
|
||||
ZydisRegister maskRegister;
|
||||
/**
|
||||
* @brief The avx-512 broadcast-type.
|
||||
*/
|
||||
ZydisAVX512BroadcastType broadcast;
|
||||
/**
|
||||
* @brief The avx-512 rounding-mode.
|
||||
*/
|
||||
ZydisAVX512RoundingMode roundingMode;
|
||||
/**
|
||||
* @brief @c TRUE, if the avx-512 suppress-all-exceptions flag is set.
|
||||
*/
|
||||
ZydisBool hasSAE;
|
||||
ZydisVectorLength vectorLength;
|
||||
ZydisEVEXTupleType tupleType;
|
||||
uint8_t elementSize;
|
||||
uint8_t compressedDisp8Scale;
|
||||
ZydisBroadcastMode broadcastMode;
|
||||
} avx;
|
||||
/**
|
||||
* @brief Extended info about different instruction-parts like ModRM, SIB or
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ static const ZydisInstructionParts instructionClassMap[] =
|
|||
/*04*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_MODRM | ZYDIS_INSTRPART_FLAG_HAS_IMM0, { { 0, 0, 0 } }, { { { 8, 8, 8 }, ZYDIS_TRUE, ZYDIS_FALSE }, { { 0, 0, 0 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*05*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_MODRM | ZYDIS_INSTRPART_FLAG_HAS_IMM0, { { 0, 0, 0 } }, { { { 16, 32, 32 }, ZYDIS_TRUE, ZYDIS_FALSE }, { { 0, 0, 0 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*06*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_MODRM | ZYDIS_INSTRPART_FLAG_HAS_IMM0, { { 0, 0, 0 } }, { { { 8, 8, 8 }, ZYDIS_FALSE, ZYDIS_FALSE }, { { 0, 0, 0 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*07*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_IMM0 | ZYDIS_INSTRPART_FLAG_HAS_IMM1, { { 0, 0, 0 } }, { { { 16, 32, 32 }, ZYDIS_TRUE, ZYDIS_TRUE }, { { 16, 16, 16 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*08*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_IMM0, { { 0, 0, 0 } }, { { { 16, 32, 32 }, ZYDIS_TRUE, ZYDIS_TRUE }, { { 0, 0, 0 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*09*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_IMM0, { { 0, 0, 0 } }, { { { 32, 32, 32 }, ZYDIS_TRUE, ZYDIS_TRUE }, { { 0, 0, 0 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*07*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_IMM0, { { 0, 0, 0 } }, { { { 16, 32, 32 }, ZYDIS_TRUE, ZYDIS_TRUE }, { { 0, 0, 0 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*08*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_IMM0, { { 0, 0, 0 } }, { { { 32, 32, 32 }, ZYDIS_TRUE, ZYDIS_TRUE }, { { 0, 0, 0 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*09*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_IMM0 | ZYDIS_INSTRPART_FLAG_HAS_IMM1, { { 0, 0, 0 } }, { { { 16, 32, 32 }, ZYDIS_TRUE, ZYDIS_TRUE }, { { 16, 16, 16 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*0A*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_IMM0 | ZYDIS_INSTRPART_FLAG_HAS_IMM1, { { 0, 0, 0 } }, { { { 16, 16, 16 }, ZYDIS_FALSE, ZYDIS_FALSE }, { { 8, 8, 8 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*0B*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_IMM0, { { 0, 0, 0 } }, { { { 8, 8, 8 }, ZYDIS_FALSE, ZYDIS_FALSE }, { { 0, 0, 0 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
/*0C*/ { 0 | ZYDIS_INSTRPART_FLAG_HAS_IMM0, { { 0, 0, 0 } }, { { { 8, 8, 8 }, ZYDIS_TRUE, ZYDIS_TRUE }, { { 0, 0, 0 }, ZYDIS_FALSE, ZYDIS_FALSE } } },
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -161,12 +161,69 @@ enum ZydisInstructionTreeNodeTypes
|
|||
/* Operand definition */
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* @brief Defines the @c ZydisSemanticOperandType datatype.
|
||||
*/
|
||||
typedef uint8_t ZydisSemanticOperandType;
|
||||
|
||||
/**
|
||||
* @brief Values that represent semantic operand-types.
|
||||
*/
|
||||
enum ZydisSemanticOperandTypes
|
||||
{
|
||||
ZYDIS_SEMANTIC_OPTYPE_UNUSED,
|
||||
ZYDIS_SEMANTIC_OPTYPE_IMPLICIT_REG,
|
||||
ZYDIS_SEMANTIC_OPTYPE_IMPLICIT_MEM,
|
||||
ZYDIS_SEMANTIC_OPTYPE_GPR8,
|
||||
ZYDIS_SEMANTIC_OPTYPE_GPR16,
|
||||
ZYDIS_SEMANTIC_OPTYPE_GPR32,
|
||||
ZYDIS_SEMANTIC_OPTYPE_GPR64,
|
||||
ZYDIS_SEMANTIC_OPTYPE_GPR16_32_64,
|
||||
ZYDIS_SEMANTIC_OPTYPE_GPR32_32_64,
|
||||
ZYDIS_SEMANTIC_OPTYPE_GPR16_32_32,
|
||||
ZYDIS_SEMANTIC_OPTYPE_FPR,
|
||||
ZYDIS_SEMANTIC_OPTYPE_MMX,
|
||||
ZYDIS_SEMANTIC_OPTYPE_XMM,
|
||||
ZYDIS_SEMANTIC_OPTYPE_YMM,
|
||||
ZYDIS_SEMANTIC_OPTYPE_ZMM,
|
||||
ZYDIS_SEMANTIC_OPTYPE_BND,
|
||||
ZYDIS_SEMANTIC_OPTYPE_SREG,
|
||||
ZYDIS_SEMANTIC_OPTYPE_CR,
|
||||
ZYDIS_SEMANTIC_OPTYPE_DR,
|
||||
ZYDIS_SEMANTIC_OPTYPE_MASK,
|
||||
ZYDIS_SEMANTIC_OPTYPE_MEM,
|
||||
ZYDIS_SEMANTIC_OPTYPE_MEM_VSIBX,
|
||||
ZYDIS_SEMANTIC_OPTYPE_MEM_VSIBY,
|
||||
ZYDIS_SEMANTIC_OPTYPE_MEM_VSIBZ,
|
||||
ZYDIS_SEMANTIC_OPTYPE_IMM,
|
||||
ZYDIS_SEMANTIC_OPTYPE_REL,
|
||||
ZYDIS_SEMANTIC_OPTYPE_PTR,
|
||||
ZYDIS_SEMANTIC_OPTYPE_AGEN,
|
||||
ZYDIS_SEMANTIC_OPTYPE_MOFFS
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Defines the @c ZydisOperandDefinition struct.
|
||||
*/
|
||||
typedef struct ZydisOperandDefinition_
|
||||
{
|
||||
int dummy;
|
||||
ZydisSemanticOperandType type : 5;
|
||||
ZydisOperandVisibility visibility : 2;
|
||||
ZydisOperandAction action : 3;
|
||||
uint16_t size[3];
|
||||
uint8_t elementType : 4;
|
||||
uint16_t elementSize : 12;
|
||||
union
|
||||
{
|
||||
uint8_t encoding;
|
||||
ZydisRegister reg;
|
||||
struct
|
||||
{
|
||||
uint8_t seg : 3;
|
||||
uint8_t base : 3;
|
||||
ZydisOperandAction baseAction : 3;
|
||||
} mem;
|
||||
} op;
|
||||
} ZydisOperandDefinition;
|
||||
|
||||
/* ---------------------------------------------------------------------------------------------- */
|
||||
|
|
@ -200,7 +257,6 @@ typedef struct ZydisInstructionDefinitionDEFAULT_
|
|||
ZydisBool acceptsHLEWithoutLock : 1;
|
||||
ZydisBool acceptsBranchHints : 1;
|
||||
ZydisBool acceptsSegment : 1;
|
||||
|
||||
} ZydisInstructionDefinitionDEFAULT;
|
||||
|
||||
typedef struct ZydisInstructionDefinition3DNOW_
|
||||
|
|
@ -220,7 +276,9 @@ typedef struct ZydisInstructionDefinitionVEX_
|
|||
|
||||
typedef struct ZydisInstructionDefinitionEVEX_
|
||||
{
|
||||
ZydisInstructionDefinition base;
|
||||
ZYDIS_INSTRUCTION_DEFINITION_BASE;
|
||||
ZydisEVEXTupleType tupleType : 4;
|
||||
uint8_t elementSize : 7;
|
||||
} ZydisInstructionDefinitionEVEX;
|
||||
|
||||
typedef struct ZydisInstructionDefinitionMVEX_
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
969
src/Decoder.c
969
src/Decoder.c
File diff suppressed because it is too large
Load Diff
|
|
@ -271,7 +271,7 @@ static ZydisStatus ZydisFormatterFormatOperandMemIntel(ZydisInstructionFormatter
|
|||
ZYDIS_CHECK(
|
||||
ZydisStringBufferAppend(buffer, bufEnd - *buffer, ZYDIS_STRBUF_APPEND_MODE_DEFAULT, "["));
|
||||
|
||||
if ((operand->mem.disp.dataSize != 0) && (
|
||||
if (operand->mem.disp.hasDisplacement && (
|
||||
(operand->mem.base == ZYDIS_REGISTER_NONE) ||
|
||||
(operand->mem.base == ZYDIS_REGISTER_EIP) ||
|
||||
(operand->mem.base == ZYDIS_REGISTER_RIP)) &&
|
||||
|
|
@ -413,7 +413,7 @@ static ZydisStatus ZydisFormatterPrintDisplacementIntel(ZydisInstructionFormatte
|
|||
return ZYDIS_STATUS_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
if ((operand->mem.disp.dataSize) && ((operand->mem.disp.value.sqword) ||
|
||||
if (operand->mem.disp.hasDisplacement && ((operand->mem.disp.value.sqword) ||
|
||||
((operand->mem.base == ZYDIS_REGISTER_NONE) &&
|
||||
(operand->mem.index == ZYDIS_REGISTER_NONE))))
|
||||
{
|
||||
|
|
@ -627,7 +627,7 @@ static ZydisStatus ZydisFormatterPrintDecoratorIntel(ZydisInstructionFormatter*
|
|||
return ZYDIS_STATUS_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
const char* bufEnd = *buffer + bufferLen;
|
||||
/*const char* bufEnd = *buffer + bufferLen;
|
||||
|
||||
if (operand->id == 0)
|
||||
{
|
||||
|
|
@ -708,7 +708,7 @@ static ZydisStatus ZydisFormatterPrintDecoratorIntel(ZydisInstructionFormatter*
|
|||
return ZYDIS_STATUS_INVALID_PARAMETER;
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
return ZYDIS_STATUS_SUCCESS;
|
||||
}
|
||||
|
|
@ -742,8 +742,6 @@ static ZydisStatus ZydisFormatterFormatInstrIntel(ZydisInstructionFormatter* for
|
|||
const char* bufPreOperand = *buffer;
|
||||
switch (info->operands[i].type)
|
||||
{
|
||||
case ZYDIS_OPERAND_TYPE_UNUSED:
|
||||
return ZYDIS_STATUS_INVALID_PARAMETER;
|
||||
case ZYDIS_OPERAND_TYPE_REGISTER:
|
||||
ZYDIS_CHECK(formatter->funcFormatOperandReg(formatter, buffer, bufEnd - *buffer,
|
||||
info, &info->operands[i]));
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ ZydisStatus ZydisUtilsCalcAbsoluteTargetAddress(const ZydisInstructionInfo* info
|
|||
switch (operand->type)
|
||||
{
|
||||
case ZYDIS_OPERAND_TYPE_MEMORY:
|
||||
if (operand->mem.disp.dataSize == 0)
|
||||
if (!operand->mem.disp.hasDisplacement)
|
||||
{
|
||||
return ZYDIS_STATUS_INVALID_PARAMETER;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue