Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add size and offset to immediate and memory operand structs #489

Merged
merged 9 commits into from
Mar 15, 2024
Merged

Add size and offset to immediate and memory operand structs #489

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e6f6116
adding size to `ZydisDecodedOperandMemDisp_`
NaC-L Mar 1, 2024
1b7619e
replacing `has_displacement` with `size`
NaC-L Mar 2, 2024
686c3c4
added `offset` to `ZydisDecodedOperandImm` and `ZydisDecodedOperandMe…
NaC-L Mar 4, 2024
c21a2b4
updated max displacement immediate size, reordered definitions
NaC-L Mar 4, 2024
5c72890
Appropiate checks for size and offset
NaC-L Mar 5, 2024
c335a88
Replaced macros with a function
NaC-L Mar 5, 2024
ba8597a
Refactored utility function to be consistent with rest of the code
NaC-L Mar 8, 2024
c1a190f
fix formatting in utility function
NaC-L Mar 8, 2024
5eb84f5
fix formatting in utility function II
NaC-L Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/Zydis/SharedTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ extern "C" {
/* ---------------------------------------------------------------------------------------------- */

#define ZYDIS_MAX_INSTRUCTION_LENGTH 15
#define ZYDIS_MAX_DISP_IMM_SIZE 64
#define ZYDIS_MAX_OPERAND_COUNT 10 // TODO: Auto generate
#define ZYDIS_MAX_OPERAND_COUNT_VISIBLE 5 // TODO: Auto generate
#define ZYDIS_POSSIBLE_DISP_IMM_SIZES 0,8,32
#define ZYDIS_POSSIBLE_IMM_SIZES 0,8,16,32,64

/* ---------------------------------------------------------------------------------------------- */

Expand Down
74 changes: 73 additions & 1 deletion tools/ZydisFuzzShared.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,67 @@ void ZydisValidateEnumRanges(const ZydisDecodedInstruction* insn,
" = 0x%016" PRIX64 "\n", (ZyanU64)(value), (ZyanU64)(max)); \
abort(); \
}
# define ZYDIS_CHECK_MAX ZYDIS_CHECK_ENUM
# define ZYDIS_CHECK_VALUE_ONE_OF_1(value, a) \
if ((ZyanU64)(value) != (ZyanU64)(a)) \
{ \
fprintf(stderr, "Value " #value " = 0x%016" PRIX64 " does not match the expected value " \
#a " = 0x%016" PRIX64 "\n", (ZyanU64)(value), (ZyanU64)(a)); \
abort(); \
}

# define ZYDIS_CHECK_VALUE_ONE_OF_2(value, a, b) \
if ((ZyanU64)(value) != (ZyanU64)(a) && (ZyanU64)(value) != (ZyanU64)(b)) \
{ \
fprintf(stderr, "Value " #value " = 0x%016" PRIX64 " does not match any of the expected " \
"values " #a " = 0x%016" PRIX64 ", " #b " = 0x%016" PRIX64 "\n", \
(ZyanU64)(value), (ZyanU64)(a), (ZyanU64)(b)); \
abort(); \
}

# define ZYDIS_CHECK_VALUE_ONE_OF_3(value, a, b, c) \
if ((ZyanU64)(value) != (ZyanU64)(a) && (ZyanU64)(value) != (ZyanU64)(b) && \
(ZyanU64)(value) != (ZyanU64)(c)) \
{ \
fprintf(stderr, "Value " #value " = 0x%016" PRIX64 " does not match any of the expected" \
" values: " #a " = 0x%016" PRIX64 ", " #b " = 0x%016" PRIX64 ", " \
#c " = 0x%016" PRIX64 "\n", \
(ZyanU64)(value), (ZyanU64)(a), (ZyanU64)(b), (ZyanU64)(c)); \
abort(); \
}


# define ZYDIS_CHECK_VALUE_ONE_OF_4(value, a, b, c, d) \
if ((ZyanU64)(value) != (ZyanU64)(a) && (ZyanU64)(value) != (ZyanU64)(b) && \
(ZyanU64)(value) != (ZyanU64)(c) && (ZyanU64)(value) != (ZyanU64)(d)) \
{ \
fprintf(stderr, "Value " #value " = 0x%016" PRIX64 " does not match any of the expected " \
"values. " #a " = 0x%016" PRIX64 ", " #b " = 0x%016" PRIX64 ", " #c \
" = 0x%016" PRIX64 ", " #d " = 0x%016" PRIX64 "\n", \
(ZyanU64)(value), (ZyanU64)(a), (ZyanU64)(b), (ZyanU64)(c), (ZyanU64)(d)); \
abort(); \
}

# define ZYDIS_CHECK_VALUE_ONE_OF_5(value, a, b, c, d, e) \
if ((ZyanU64)(value) != (ZyanU64)(a) && (ZyanU64)(value) != (ZyanU64)(b) && \
(ZyanU64)(value) != (ZyanU64)(c) && (ZyanU64)(value) != (ZyanU64)(d) && \
(ZyanU64)(value) != (ZyanU64)(e)) \
{ \
fprintf(stderr, "Value " #value " = 0x%016" PRIX64 " does not match any of the expected " \
"values. " #a " = 0x%016" PRIX64 ", " #b " = 0x%016" PRIX64 ", " #c \
" = 0x%016" PRIX64 ", " #d " = 0x%016" PRIX64 ", " #e " = 0x%016" PRIX64 "\n", \
(ZyanU64)(value), (ZyanU64)(a), (ZyanU64)(b), (ZyanU64)(c), (ZyanU64)(d), \
(ZyanU64)(e)); \
abort(); \
}



#define ZYDIS_CHECK_VALUE_ONE_OF_N(value, ...) \
GET_MACRO(__VA_ARGS__, ZYDIS_CHECK_VALUE_ONE_OF_5, ZYDIS_CHECK_VALUE_ONE_OF_4, ZYDIS_CHECK_VALUE_ONE_OF_3, ZYDIS_CHECK_VALUE_ONE_OF_2, ZYDIS_CHECK_VALUE_ONE_OF_1)(value, __VA_ARGS__)

#define GET_MACRO(_1, _2, _3, _4, _5, NAME, ...) NAME

flobernd marked this conversation as resolved.
Show resolved Hide resolved

ZYDIS_CHECK_ENUM(insn->length, ZYDIS_MAX_INSTRUCTION_LENGTH);

Expand Down Expand Up @@ -175,11 +236,14 @@ void ZydisValidateEnumRanges(const ZydisDecodedInstruction* insn,
ZYDIS_CHECK_ENUM(op->mem.segment, ZYDIS_REGISTER_MAX_VALUE);
ZYDIS_CHECK_ENUM(op->mem.base, ZYDIS_REGISTER_MAX_VALUE);
ZYDIS_CHECK_ENUM(op->mem.index, ZYDIS_REGISTER_MAX_VALUE);
ZYDIS_CHECK_ENUM(op->mem.disp.size, ZYDIS_MAX_DISP_IMM_SIZE);
ZYDIS_CHECK_VALUE_ONE_OF_N(op->mem.disp.size, ZYDIS_POSSIBLE_DISP_IMM_SIZES);
ZYDIS_CHECK_MAX(op->mem.disp.offset + (op->mem.disp.size / 8), insn->length);
break;
case ZYDIS_OPERAND_TYPE_IMMEDIATE:
ZYDIS_CHECK_ENUM(op->imm.is_signed, ZYAN_TRUE);
ZYDIS_CHECK_ENUM(op->imm.is_relative, ZYAN_TRUE);
ZYDIS_CHECK_VALUE_ONE_OF_N(op->imm.size, ZYDIS_POSSIBLE_IMM_SIZES);
ZYDIS_CHECK_MAX(op->imm.offset + (op->imm.size / 8), insn->length);
break;
default:
break;
Expand Down Expand Up @@ -216,6 +280,14 @@ void ZydisValidateEnumRanges(const ZydisDecodedInstruction* insn,
}

# undef ZYDIS_CHECK_ENUM
# undef ZYDIS_CHECK_MAX
# undef ZYDIS_CHECK_VALUE_ONE_OF_1
# undef ZYDIS_CHECK_VALUE_ONE_OF_2
# undef ZYDIS_CHECK_VALUE_ONE_OF_3
# undef ZYDIS_CHECK_VALUE_ONE_OF_4
# undef ZYDIS_CHECK_VALUE_ONE_OF_5
# undef ZYDIS_CHECK_VALUE_ONE_OF_N
# undef GET_MACRO
}

void ZydisValidateInstructionIdentity(const ZydisDecodedInstruction* insn1,
Expand Down