x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

ZYDIS: Use ZydisOperandAction as an enum instead of a flag

This commit is contained in:
Bálint Faragó 2018-10-29 23:28:14 +01:00 committed by Duncan Ogilvie
parent 0065f204a3
commit e0052d6b2b
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dbg/commands/cmd-undocumented.cpp
View File

@ -245,15 +245,23 @@ bool cbInstrZydis(int argc, char* argv[])
dprintf_untranslated("imm[0].offset: %d, imm[0].size: %d\n", instr->raw.imm[0].offset, instr->raw.imm[0].size);
dprintf_untranslated("imm[1].offset: %d, imm[1].size: %d\n", instr->raw.imm[1].offset, instr->raw.imm[1].size);
dprintf_untranslated("size: %d, id: %d, opcount: %d\n", cp.Size(), cp.GetId(), instr->operandCount);
auto rwstr = [](uint8_t access)
auto rwstr = [](uint8_t action)
{
if(access & ZYDIS_OPERAND_ACTION_READ && access & ZYDIS_OPERAND_ACTION_WRITE)
return "read+write";
if(access & ZYDIS_OPERAND_ACTION_READ)
switch(action)
{
case ZYDIS_OPERAND_ACTION_READ:
case ZYDIS_OPERAND_ACTION_CONDREAD:
return "read";
if(access & ZYDIS_OPERAND_ACTION_WRITE)
case ZYDIS_OPERAND_ACTION_WRITE:
case ZYDIS_OPERAND_ACTION_CONDWRITE:
return "write";
return "???";
case ZYDIS_OPERAND_ACTION_READWRITE:
case ZYDIS_OPERAND_ACTION_READ_CONDWRITE:
case ZYDIS_OPERAND_ACTION_CONDREAD_WRITE:
return "read+write";
default:
return "???";
}
};
auto vis = [](uint8_t visibility)
{

16
src/zydis_wrapper/zydis_wrapper.cpp
View File

@ -873,10 +873,22 @@ void Zydis::RegInfo(uint8_t regs[ZYDIS_REGISTER_MAX_VALUE + 1]) const
{
case ZYDIS_OPERAND_TYPE_REGISTER:
{
if(op.action & ZYDIS_OPERAND_ACTION_MASK_READ)
switch (op.action)
{
case ZYDIS_OPERAND_ACTION_READ:
case ZYDIS_OPERAND_ACTION_CONDREAD:
regs[op.reg.value] |= RAIRead;
if(op.action & ZYDIS_OPERAND_ACTION_MASK_WRITE)
break;
case ZYDIS_OPERAND_ACTION_WRITE:
case ZYDIS_OPERAND_ACTION_CONDWRITE:
regs[op.reg.value] |= RAIWrite;
break;
case ZYDIS_OPERAND_ACTION_READWRITE:
case ZYDIS_OPERAND_ACTION_READ_CONDWRITE:
case ZYDIS_OPERAND_ACTION_CONDREAD_WRITE:
regs[op.reg.value] |= RAIRead | RAIWrite;
break;
}
regs[op.reg.value] |= op.visibility == ZYDIS_OPERAND_VISIBILITY_HIDDEN ?
RAIImplicit : RAIExplicit;
}