Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-26 16:23:44 +01:00
Code Releases Wiki Activity

impr: Added load and base address to instruction pl types

Browse Source
This commit is contained in:
WerWolv 2024-12-14 21:52:19 +01:00
parent 7f75706584
commit ed0a94659e
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/disassembler/source/content/pl_builtin_types.cpp
View File

@ -64,7 +64,7 @@ namespace hex::plugin::disasm {
const pl::api::Namespace nsHexDec = { "builtin", "hex", "dec" }; const pl::api::Namespace nsHexDec = { "builtin", "hex", "dec" };
/* Json<data_pattern> */ /* Json<data_pattern> */
ContentRegistry::PatternLanguage::addType(nsHexDec, "Instruction", FunctionParameterCount::exactly(3), [](Evaluator *evaluator, auto params) -> std::unique_ptr<pl::ptrn::Pattern> { ContentRegistry::PatternLanguage::addType(nsHexDec, "Instruction", FunctionParameterCount::exactly(4), [](Evaluator *evaluator, auto params) -> std::unique_ptr<pl::ptrn::Pattern> {
cs_arch arch; cs_arch arch;
cs_mode mode; cs_mode mode;
@ -74,10 +74,15 @@ namespace hex::plugin::disasm {
err::E0012.throwError(e.what()); err::E0012.throwError(e.what());
} }
const auto syntaxString = params[1].toString(); const auto syntaxString = params[1].toString();
const auto relocatedAddress = params[2].toUnsigned(); const auto imageBaseAddress = params[2].toUnsigned();
const auto imageLoadAddress = params[3].toUnsigned();
const auto address = evaluator->getReadOffset(); const auto address = evaluator->getReadOffset();
const auto codeOffset = address - imageBaseAddress;
u64 instructionLoadAddress = imageLoadAddress + codeOffset;
csh capstone; csh capstone;
if (cs_open(arch, mode, &capstone) == CS_ERR_OK) { if (cs_open(arch, mode, &capstone) == CS_ERR_OK) {
cs_opt_value syntax; cs_opt_value syntax;
@ -99,24 +104,24 @@ namespace hex::plugin::disasm {
std::vector<u8> data(std::min<u64>(32, evaluator->getSectionSize(sectionId) - address)); std::vector<u8> data(std::min<u64>(32, evaluator->getSectionSize(sectionId) - address));
evaluator->readData(address, data.data(), data.size(), sectionId); evaluator->readData(address, data.data(), data.size(), sectionId);
cs_insn *instruction = nullptr; cs_insn instruction;
size_t instructionCount = cs_disasm(capstone, data.data(), data.size(), relocatedAddress, 1, &instruction); const u8 *code = data.data();
if (instructionCount != 1) { size_t dataSize = data.size();
if (!cs_disasm_iter(capstone, &code, &dataSize, &instructionLoadAddress, &instruction)) {
err::E0012.throwError("Failed to disassemble instruction"); err::E0012.throwError("Failed to disassemble instruction");
} }
auto result = std::make_unique<PatternInstruction>(evaluator, address, instruction->size, 0); auto result = std::make_unique<PatternInstruction>(evaluator, address, instruction.size, 0);
std::string instructionString; std::string instructionString;
if (instruction->mnemonic[0] != '\x00') if (instruction.mnemonic[0] != '\x00')
instructionString += instruction->mnemonic; instructionString += instruction.mnemonic;
if (instruction->op_str[0] != '\x00') { if (instruction.op_str[0] != '\x00') {
instructionString += ' '; instructionString += ' ';
instructionString += instruction->op_str; instructionString += instruction.op_str;
} }
result->setInstructionString(instructionString); result->setInstructionString(instructionString);
cs_free(instruction, instructionCount);
cs_close(&capstone); cs_close(&capstone);
return result; return result;