x64dbg
/
zydis
mirror of https://github.com/x64dbg/zydis
1
0
Fork 0
Code Releases Activity

Revert "Minor interface changes" 

This reverts commit 0ba5c95dac.
This commit is contained in:
Joel Höner 2017-11-02 23:03:21 +01:00
parent 0ba5c95dac
commit 3a38b9ceb5
4 changed files with 122 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/ZydisFuzzIn.c
View File

@ -43,7 +43,7 @@ typedef struct ZydisFuzzControlBlock_
{ {
ZydisMachineMode machineMode; ZydisMachineMode machineMode;
ZydisAddressWidth addressWidth; ZydisAddressWidth addressWidth;
ZydisDecoderFlags decoderFlags; ZydisBool decoderMode[ZYDIS_DECODER_MODE_MAX_VALUE + 1];
ZydisFormatterStyle formatterStyle; ZydisFormatterStyle formatterStyle;
ZydisFormatterFlags formatterFlags; ZydisFormatterFlags formatterFlags;
ZydisFormatterAddressFormat formatterAddrFormat; ZydisFormatterAddressFormat formatterAddrFormat;
@ -71,12 +71,21 @@ int main()
} }
ZydisDecoder decoder; ZydisDecoder decoder;
if (!ZYDIS_SUCCESS(ZydisDecoderInitEx(&decoder, controlBlock.machineMode, if (!ZYDIS_SUCCESS(
controlBlock.addressWidth, controlBlock.decoderFlags))) ZydisDecoderInit(&decoder, controlBlock.machineMode, controlBlock.addressWidth)))
{ {
fputs("Failed to initialize decoder\n", stderr); fputs("Failed to initialize decoder\n", stderr);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
for (ZydisDecoderMode mode = 1; mode <= ZYDIS_DECODER_MODE_MAX_VALUE; ++mode)
{
if (!ZYDIS_SUCCESS(
ZydisDecoderEnableMode(&decoder, mode, controlBlock.decoderMode[mode] ? 1 : 0)))
{
fputs("Failed to adjust decoder-mode\n", stderr);
return EXIT_FAILURE;
}
}
ZydisFormatter formatter; ZydisFormatter formatter;
if (!ZYDIS_SUCCESS(ZydisFormatterInitEx(&formatter, controlBlock.formatterStyle, if (!ZYDIS_SUCCESS(ZydisFormatterInitEx(&formatter, controlBlock.formatterStyle,

14
examples/ZydisPerfTest.c
View File

@ -154,19 +154,19 @@ void adjustProcessAndThreadPriority()
uint64_t processBuffer(const char* buffer, size_t length, ZydisBool minimalMode, ZydisBool format) uint64_t processBuffer(const char* buffer, size_t length, ZydisBool minimalMode, ZydisBool format)
{ {
ZydisDecoderFlags flags = ZYDIS_DECODER_FLAG_DEFAULT_MASK;
if (minimalMode)
{
flags |= ZYDIS_DECODER_FLAG_MINIMAL;
}
ZydisDecoder decoder; ZydisDecoder decoder;
if (!ZYDIS_SUCCESS( if (!ZYDIS_SUCCESS(
ZydisDecoderInitEx(&decoder, ZYDIS_MACHINE_MODE_LONG_64, ZYDIS_ADDRESS_WIDTH_64, flags))) ZydisDecoderInit(&decoder, ZYDIS_MACHINE_MODE_LONG_64, ZYDIS_ADDRESS_WIDTH_64)))
{ {
fputs("Failed to initialize decoder\n", stderr); fputs("Failed to initialize decoder\n", stderr);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (!ZYDIS_SUCCESS(
ZydisDecoderEnableMode(&decoder, ZYDIS_DECODER_MODE_MINIMAL, minimalMode)))
{
fputs("Failed to adjust decoder-mode\n", stderr);
exit(EXIT_FAILURE);
}
ZydisFormatter formatter; ZydisFormatter formatter;
if (format) if (format)

66
include/Zydis/Decoder.h
View File

@ -46,15 +46,21 @@ extern "C" {
/* ============================================================================================== */ /* ============================================================================================== */
/* ---------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------- */
/* Decoder flags */ /* Decoder mode */
/* ---------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------- */
/** /**
* @brief Defines the @c ZydisDecoderFlags datatype. * @brief Defines the @c ZydisDecoderMode datatype.
*/ */
typedef uint8_t ZydisDecoderFlags; typedef uint8_t ZydisDecoderMode;
/** /**
* @brief Values that represent decoder-modes.
*/
enum ZydisDecoderModes
{
ZYDIS_DECODER_MODE_INVALID,
/**
* @brief Enables minimal instruction decoding without semantic analysis. * @brief Enables minimal instruction decoding without semantic analysis.
* *
* This mode provides access to the mnemonic, the instruction-length, the effective * This mode provides access to the mnemonic, the instruction-length, the effective
@ -64,8 +70,8 @@ typedef uint8_t ZydisDecoderFlags;
* Operands, most attributes and other specific information (like AVX info) are not * Operands, most attributes and other specific information (like AVX info) are not
* accessible in this mode. * accessible in this mode.
*/ */
#define ZYDIS_DECODER_FLAG_MINIMAL 0x01 // (1 << 0) ZYDIS_DECODER_MODE_MINIMAL,
/** /**
* @brief Enables the AMD-branch mode. * @brief Enables the AMD-branch mode.
* *
* Intel ignores the operand-size override-prefix (`0x66`) for all branches with 32-bit * Intel ignores the operand-size override-prefix (`0x66`) for all branches with 32-bit
@ -73,47 +79,44 @@ typedef uint8_t ZydisDecoderFlags;
* In AMD-branch mode `0x66` is not ignored and changes the operand-size and the size of the * In AMD-branch mode `0x66` is not ignored and changes the operand-size and the size of the
* immediate to 16-bit. * immediate to 16-bit.
*/ */
#define ZYDIS_DECODER_FLAG_AMD_BRANCHES 0x02 // (1 << 1) ZYDIS_DECODER_MODE_AMD_BRANCHES,
/** /**
* @brief Enables the MPX mode. * @brief Enables the MPX mode.
* *
* The MPX ISA-extension reuses (overrides) some of the widenop instruction opcodes. * The MPX isa-extension reuses (overrides) some of the widenop instruction opcodes.
* *
* This mode is enabled by default. * This mode is enabled by default.
*/ */
#define ZYDIS_DECODER_FLAG_MPX 0x04 // (1 << 2) ZYDIS_DECODER_MODE_MPX,
/** /**
* @brief Enables the CET mode. * @brief Enables the CET mode.
* *
* The CET ISA-extension reuses (overrides) some of the widenop instruction opcodes. * The CET isa-extension reuses (overrides) some of the widenop instruction opcodes.
* *
* This mode is enabled by default. * This mode is enabled by default.
*/ */
#define ZYDIS_DECODER_FLAG_CET 0x08 // (1 << 3) ZYDIS_DECODER_MODE_CET,
/** /**
* @brief Enables the LZCNT mode. * @brief Enables the LZCNT mode.
* *
* The LZCNT ISA-extension reuses (overrides) some of the widenop instruction opcodes. * The LZCNT isa-extension reuses (overrides) some of the widenop instruction opcodes.
* *
* This mode is enabled by default. * This mode is enabled by default.
*/ */
#define ZYDIS_DECODER_FLAG_LZCNT 0x10 // (1 << 4) ZYDIS_DECODER_MODE_LZCNT,
/** /**
* @brief Enables the TZCNT mode. * @brief Enables the TZCNT mode.
* *
* The TZCNT ISA-extension reuses (overrides) some of the widenop instruction opcodes. * The TZCNT isa-extension reuses (overrides) some of the widenop instruction opcodes.
* *
* This mode is enabled by default. * This mode is enabled by default.
*/ */
#define ZYDIS_DECODER_FLAG_TZCNT 0x20 // (1 << 5) ZYDIS_DECODER_MODE_TZCNT,
/**
/** * @brief Maximum value of this enum.
* @brief The default set of decoder-flags.
*/ */
#define ZYDIS_DECODER_FLAG_DEFAULT_MASK ZYDIS_DECODER_FLAG_MPX | \ ZYDIS_DECODER_MODE_MAX_VALUE = ZYDIS_DECODER_MODE_TZCNT
ZYDIS_DECODER_FLAG_CET | \ };
ZYDIS_DECODER_FLAG_LZCNT | \
ZYDIS_DECODER_FLAG_TZCNT
/* ---------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------- */
/* Decoder struct */ /* Decoder struct */
@ -126,7 +129,7 @@ typedef struct ZydisDecoder_
{ {
ZydisMachineMode machineMode; ZydisMachineMode machineMode;
ZydisAddressWidth addressWidth; ZydisAddressWidth addressWidth;
ZydisDecoderFlags flags; ZydisBool decoderMode[ZYDIS_DECODER_MODE_MAX_VALUE + 1];
} ZydisDecoder; } ZydisDecoder;
/* ---------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------- */
@ -148,17 +151,16 @@ ZYDIS_EXPORT ZydisStatus ZydisDecoderInit(ZydisDecoder* decoder, ZydisMachineMod
ZydisAddressWidth addressWidth); ZydisAddressWidth addressWidth);
/** /**
* @brief Initializes the given @c ZydisDecoder instance. * @brief Enables or disables the specified decoder-mode.
* *
* @param decoder A pointer to the @c ZydisDecoder instance. * @param decoder A pointer to the @c ZydisDecoder instance.
* @param machineMode The machine mode. * @param mode The decoder mode.
* @param addressWidth The address width. * @param enabled `ZYDIS_TRUE` to enable, or `ZYDIS_FALSE` to disable the specified decoder-mode.
* @param flags Additional decoder flags.
* *
* @return A zydis status code. * @return A zydis status code.
*/ */
ZYDIS_EXPORT ZydisStatus ZydisDecoderInitEx(ZydisDecoder* decoder, ZydisMachineMode machineMode, ZYDIS_EXPORT ZydisStatus ZydisDecoderEnableMode(ZydisDecoder* decoder, ZydisDecoderMode mode,
ZydisAddressWidth addressWidth, ZydisDecoderFlags flags); ZydisBool enabled);
/** /**
* @brief Decodes the instruction in the given input @c buffer. * @brief Decodes the instruction in the given input @c buffer.

45
src/Decoder.c
View File

@ -2107,8 +2107,8 @@ static void ZydisSetAttributes(ZydisDecoderContext* context, ZydisDecodedInstruc
break; break;
} }
} }
if ((context->decoder->flags & ZYDIS_DECODER_FLAG_MPX) && if (context->decoder->decoderMode[ZYDIS_DECODER_MODE_MPX] &&
(instruction->attributes & ZYDIS_ATTRIB_ACCEPTS_BOUND)) instruction->attributes & ZYDIS_ATTRIB_ACCEPTS_BOUND)
{ {
instruction->attributes |= ZYDIS_ATTRIB_HAS_BOUND; instruction->attributes |= ZYDIS_ATTRIB_HAS_BOUND;
break; break;
@ -4300,19 +4300,19 @@ static ZydisStatus ZydisDecodeInstruction(ZydisDecoderContext* context,
status = ZydisNodeHandlerMvexE(instruction, &index); status = ZydisNodeHandlerMvexE(instruction, &index);
break; break;
case ZYDIS_NODETYPE_FILTER_MODE_AMD: case ZYDIS_NODETYPE_FILTER_MODE_AMD:
index = context->decoder->flags & ZYDIS_DECODER_FLAG_AMD_BRANCHES ? 1 : 0; index = context->decoder->decoderMode[ZYDIS_DECODER_MODE_AMD_BRANCHES] ? 1 : 0;
break; break;
case ZYDIS_NODETYPE_FILTER_MODE_MPX: case ZYDIS_NODETYPE_FILTER_MODE_MPX:
index = context->decoder->flags & ZYDIS_DECODER_FLAG_MPX ? 1 : 0; index = context->decoder->decoderMode[ZYDIS_DECODER_MODE_MPX] ? 1 : 0;
break; break;
case ZYDIS_NODETYPE_FILTER_MODE_CET: case ZYDIS_NODETYPE_FILTER_MODE_CET:
index = context->decoder->flags & ZYDIS_DECODER_FLAG_CET ? 1 : 0; index = context->decoder->decoderMode[ZYDIS_DECODER_MODE_CET] ? 1 : 0;
break; break;
case ZYDIS_NODETYPE_FILTER_MODE_LZCNT: case ZYDIS_NODETYPE_FILTER_MODE_LZCNT:
index = context->decoder->flags & ZYDIS_DECODER_FLAG_LZCNT ? 1 : 0; index = context->decoder->decoderMode[ZYDIS_DECODER_MODE_LZCNT] ? 1 : 0;
break; break;
case ZYDIS_NODETYPE_FILTER_MODE_TZCNT: case ZYDIS_NODETYPE_FILTER_MODE_TZCNT:
index = context->decoder->flags & ZYDIS_DECODER_FLAG_TZCNT ? 1 : 0; index = context->decoder->decoderMode[ZYDIS_DECODER_MODE_TZCNT] ? 1 : 0;
break; break;
default: default:
if (nodeType & ZYDIS_NODETYPE_DEFINITION_MASK) if (nodeType & ZYDIS_NODETYPE_DEFINITION_MASK)
@ -4353,7 +4353,7 @@ static ZydisStatus ZydisDecodeInstruction(ZydisDecoderContext* context,
instruction->meta.isaExt = definition->isaExt; instruction->meta.isaExt = definition->isaExt;
instruction->meta.exceptionClass = definition->exceptionClass; instruction->meta.exceptionClass = definition->exceptionClass;
if (!(context->decoder->flags & ZYDIS_DECODER_FLAG_MINIMAL)) if (!context->decoder->decoderMode[ZYDIS_DECODER_MODE_MINIMAL])
{ {
ZydisSetAttributes(context, instruction, definition); ZydisSetAttributes(context, instruction, definition);
switch (instruction->encoding) switch (instruction->encoding)
@ -4396,12 +4396,17 @@ static ZydisStatus ZydisDecodeInstruction(ZydisDecoderContext* context,
ZydisStatus ZydisDecoderInit(ZydisDecoder* decoder, ZydisMachineMode machineMode, ZydisStatus ZydisDecoderInit(ZydisDecoder* decoder, ZydisMachineMode machineMode,
ZydisAddressWidth addressWidth) ZydisAddressWidth addressWidth)
{ {
return ZydisDecoderInitEx(decoder, machineMode, addressWidth, ZYDIS_DECODER_FLAG_DEFAULT_MASK); static const ZydisBool decoderModes[ZYDIS_DECODER_MODE_MAX_VALUE + 1] =
} {
ZYDIS_FALSE, // ZYDIS_DECODER_MODE_INVALID
ZYDIS_FALSE, // ZYDIS_DECODER_MODE_MINIMAL
ZYDIS_FALSE, // ZYDIS_DECODER_MODE_AMD_BRANCHES
ZYDIS_TRUE , // ZYDIS_DECODER_MODE_MPX
ZYDIS_TRUE , // ZYDIS_DECODER_MODE_CET
ZYDIS_TRUE , // ZYDIS_DECODER_MODE_LZCNT
ZYDIS_TRUE // ZYDIS_DECODER_MODE_TZCNT
};
ZydisStatus ZydisDecoderInitEx(ZydisDecoder* decoder, ZydisMachineMode machineMode,
ZydisAddressWidth addressWidth, ZydisDecoderFlags flags)
{
if (!decoder || ((machineMode != 16) && (machineMode != 32) && (machineMode != 64))) if (!decoder || ((machineMode != 16) && (machineMode != 32) && (machineMode != 64)))
{ {
return ZYDIS_STATUS_INVALID_PARAMETER; return ZYDIS_STATUS_INVALID_PARAMETER;
@ -4422,7 +4427,19 @@ ZydisStatus ZydisDecoderInitEx(ZydisDecoder* decoder, ZydisMachineMode machineMo
decoder->machineMode = machineMode; decoder->machineMode = machineMode;
decoder->addressWidth = addressWidth; decoder->addressWidth = addressWidth;
decoder->flags = flags; memcpy(&decoder->decoderMode, &decoderModes, sizeof(decoderModes));
return ZYDIS_STATUS_SUCCESS;
}
ZydisStatus ZydisDecoderEnableMode(ZydisDecoder* decoder, ZydisDecoderMode mode, ZydisBool enabled)
{
if (!decoder || !mode || (mode > ZYDIS_DECODER_MODE_MAX_VALUE))
{
return ZYDIS_STATUS_INVALID_PARAMETER;
}
decoder->decoderMode[mode] = enabled;
return ZYDIS_STATUS_SUCCESS; return ZYDIS_STATUS_SUCCESS;
} }