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

Renamed `ZydisStringAppendStaticEx` to `ZydisStringAppendExStatic`

This commit is contained in:
flobernd 2017-12-03 11:57:49 +01:00 committed by Joel Höner
parent e943baa683
commit 1d6c296c5f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Zydis/String.h
View File

@ -247,7 +247,7 @@ ZYDIS_NO_EXPORT ZYDIS_INLINE ZydisStatus ZydisStringAppendExC(ZydisString* strin
* @c ZYDIS_STATUS_INSUFFICIENT_BUFFER_SIZE, if the size of the buffer was not * @c ZYDIS_STATUS_INSUFFICIENT_BUFFER_SIZE, if the size of the buffer was not
* sufficient to append the given @c text. * sufficient to append the given @c text.
*/ */
ZYDIS_NO_EXPORT ZYDIS_INLINE ZydisStatus ZydisStringAppendStaticEx(ZydisString* string, ZYDIS_NO_EXPORT ZYDIS_INLINE ZydisStatus ZydisStringAppendExStatic(ZydisString* string,
const ZydisStaticString* text, ZydisLetterCase letterCase) const ZydisStaticString* text, ZydisLetterCase letterCase)
{ {
if (!text || !text->buffer) if (!text || !text->buffer)

18
src/Formatter.c
View File

@ -96,7 +96,7 @@ static ZydisStatus ZydisFormatterPrintMnemonicIntel(const ZydisFormatter* format
{ {
return ZydisStringAppendExC(string, "invalid", formatter->letterCase); return ZydisStringAppendExC(string, "invalid", formatter->letterCase);
} }
ZYDIS_CHECK(ZydisStringAppendStaticEx(string, mnemonic, formatter->letterCase)); ZYDIS_CHECK(ZydisStringAppendExStatic(string, mnemonic, formatter->letterCase));
if (instruction->attributes & ZYDIS_ATTRIB_IS_FAR_BRANCH) if (instruction->attributes & ZYDIS_ATTRIB_IS_FAR_BRANCH)
{ {
@ -129,7 +129,7 @@ static ZydisStatus ZydisFormatterFormatOperandRegIntel(const ZydisFormatter* for
{ {
return ZydisStringAppendExC(string, "invalid", formatter->letterCase); return ZydisStringAppendExC(string, "invalid", formatter->letterCase);
} }
return ZydisStringAppendStaticEx(string, reg, formatter->letterCase); return ZydisStringAppendExStatic(string, reg, formatter->letterCase);
} }
static ZydisStatus ZydisFormatterFormatOperandMemIntel(const ZydisFormatter* formatter, static ZydisStatus ZydisFormatterFormatOperandMemIntel(const ZydisFormatter* formatter,
@ -159,7 +159,7 @@ static ZydisStatus ZydisFormatterFormatOperandMemIntel(const ZydisFormatter* for
address, userData)); address, userData));
} else } else
{ {
ZYDIS_CHECK(ZydisStringAppendStaticEx(string, ZYDIS_CHECK(ZydisStringAppendExStatic(string,
ZydisRegisterGetStaticString(operand->mem.base), formatter->letterCase)); ZydisRegisterGetStaticString(operand->mem.base), formatter->letterCase));
ZYDIS_CHECK(formatter->funcPrintDisplacement(formatter, string, instruction, operand, ZYDIS_CHECK(formatter->funcPrintDisplacement(formatter, string, instruction, operand,
userData)); userData));
@ -174,7 +174,7 @@ static ZydisStatus ZydisFormatterFormatOperandMemIntel(const ZydisFormatter* for
{ {
return ZYDIS_STATUS_INVALID_PARAMETER; return ZYDIS_STATUS_INVALID_PARAMETER;
} }
ZYDIS_CHECK(ZydisStringAppendStaticEx(string, reg, formatter->letterCase)); ZYDIS_CHECK(ZydisStringAppendExStatic(string, reg, formatter->letterCase));
} }
if ((operand->mem.index != ZYDIS_REGISTER_NONE) && if ((operand->mem.index != ZYDIS_REGISTER_NONE) &&
(operand->mem.type != ZYDIS_MEMOP_TYPE_MIB)) (operand->mem.type != ZYDIS_MEMOP_TYPE_MIB))
@ -188,7 +188,7 @@ static ZydisStatus ZydisFormatterFormatOperandMemIntel(const ZydisFormatter* for
{ {
ZYDIS_CHECK(ZydisStringAppendC(string, "+")); ZYDIS_CHECK(ZydisStringAppendC(string, "+"));
} }
ZYDIS_CHECK(ZydisStringAppendStaticEx(string, reg, formatter->letterCase)); ZYDIS_CHECK(ZydisStringAppendExStatic(string, reg, formatter->letterCase));
if (operand->mem.scale) if (operand->mem.scale)
{ {
ZYDIS_CHECK(ZydisStringAppendC(string, "*")); ZYDIS_CHECK(ZydisStringAppendC(string, "*"));
@ -523,14 +523,14 @@ static ZydisStatus ZydisFormatterPrintSegmentIntel(const ZydisFormatter* formatt
case ZYDIS_REGISTER_CS: case ZYDIS_REGISTER_CS:
case ZYDIS_REGISTER_FS: case ZYDIS_REGISTER_FS:
case ZYDIS_REGISTER_GS: case ZYDIS_REGISTER_GS:
ZYDIS_CHECK(ZydisStringAppendStaticEx(string, ZYDIS_CHECK(ZydisStringAppendExStatic(string,
ZydisRegisterGetStaticString(operand->mem.segment), formatter->letterCase)); ZydisRegisterGetStaticString(operand->mem.segment), formatter->letterCase));
return ZydisStringAppendC(string, ":"); return ZydisStringAppendC(string, ":");
case ZYDIS_REGISTER_SS: case ZYDIS_REGISTER_SS:
if ((formatter->forceSegments) || if ((formatter->forceSegments) ||
(instruction->attributes & ZYDIS_ATTRIB_HAS_SEGMENT_SS)) (instruction->attributes & ZYDIS_ATTRIB_HAS_SEGMENT_SS))
{ {
ZYDIS_CHECK(ZydisStringAppendStaticEx(string, ZYDIS_CHECK(ZydisStringAppendExStatic(string,
ZydisRegisterGetStaticString(operand->mem.segment), formatter->letterCase)); ZydisRegisterGetStaticString(operand->mem.segment), formatter->letterCase));
return ZydisStringAppendC(string, ":"); return ZydisStringAppendC(string, ":");
} }
@ -539,7 +539,7 @@ static ZydisStatus ZydisFormatterPrintSegmentIntel(const ZydisFormatter* formatt
if ((formatter->forceSegments) || if ((formatter->forceSegments) ||
(instruction->attributes & ZYDIS_ATTRIB_HAS_SEGMENT_DS)) (instruction->attributes & ZYDIS_ATTRIB_HAS_SEGMENT_DS))
{ {
ZYDIS_CHECK(ZydisStringAppendStaticEx(string, ZYDIS_CHECK(ZydisStringAppendExStatic(string,
ZydisRegisterGetStaticString(operand->mem.segment), formatter->letterCase)); ZydisRegisterGetStaticString(operand->mem.segment), formatter->letterCase));
return ZydisStringAppendC(string, ":"); return ZydisStringAppendC(string, ":");
} }
@ -574,7 +574,7 @@ static ZydisStatus ZydisFormatterPrintDecoratorIntel(const ZydisFormatter* forma
return ZYDIS_STATUS_INVALID_PARAMETER; return ZYDIS_STATUS_INVALID_PARAMETER;
} }
ZYDIS_CHECK(ZydisStringAppendC(string, " {")); ZYDIS_CHECK(ZydisStringAppendC(string, " {"));
ZYDIS_CHECK(ZydisStringAppendStaticEx(string, reg, formatter->letterCase)); ZYDIS_CHECK(ZydisStringAppendExStatic(string, reg, formatter->letterCase));
ZYDIS_CHECK(ZydisStringAppendC(string, "}")); ZYDIS_CHECK(ZydisStringAppendC(string, "}"));
if (instruction->avx.mask.mode == ZYDIS_MASK_MODE_ZERO) if (instruction->avx.mask.mode == ZYDIS_MASK_MODE_ZERO)
{ {