imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 13:05:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

impr: Refactor disassembler system to make it more modular

Browse Source
This commit is contained in:
WerWolv
2024-12-26 18:41:34 +01:00
parent f11205bba7
commit a76c6c653d
11 changed files with 570 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/disassembler/include/content/helpers/disassembler.hpp
View File

@@ -6,10 +6,11 @@
#include <capstone/capstone.h>
#include <wolv/utils/string.hpp>
#include <hex/helpers/utils.hpp>
namespace hex::plugin::disasm {
enum class Architecture : i32
enum class BuiltinArchitecture : i32
{
ARM = CS_ARCH_ARM,
ARM64 = CS_ARCH_ARM64,
@@ -39,18 +40,18 @@ namespace hex::plugin::disasm {
MIN = ARM
};
class Disassembler {
class CapstoneDisassembler {
public:
constexpr static cs_arch toCapstoneArchitecture(Architecture architecture) {
constexpr static cs_arch toCapstoneArchitecture(BuiltinArchitecture architecture) {
return static_cast<cs_arch>(architecture);
}
static bool isSupported(Architecture architecture) {
static bool isSupported(BuiltinArchitecture architecture) {
return cs_support(toCapstoneArchitecture(architecture));
}
constexpr static auto ArchitectureNames = []{
std::array<const char *, static_cast<u32>(Architecture::MAX) + 1> names = { };
std::array<const char *, static_cast<u32>(BuiltinArchitecture::MAX) + 1> names = { };
names[CS_ARCH_ARM] = "ARM";
names[CS_ARCH_ARM64] = "AArch64";
@@ -84,7 +85,7 @@ namespace hex::plugin::disasm {
return supportedCount;
}
for (supportedCount = static_cast<i32>(Architecture::MIN); supportedCount < static_cast<i32>(Architecture::MAX) + 1; supportedCount++) {
for (supportedCount = static_cast<i32>(BuiltinArchitecture::MIN); supportedCount < static_cast<i32>(BuiltinArchitecture::MAX) + 1; supportedCount++) {
if (!cs_support(supportedCount)) {
break;
}

17
plugins/disassembler/include/content/views/view_disassembler.hpp
View File

@@ -9,18 +9,10 @@
#include <string>
#include <vector>
#include <hex/api/content_registry.hpp>
namespace hex::plugin::disasm {
struct Disassembly {
u64 address;
u64 offset;
size_t size;
std::string bytes;
std::string mnemonic;
std::string operators;
};
class ViewDisassembler : public View::Window {
public:
explicit ViewDisassembler();
@@ -36,13 +28,12 @@ namespace hex::plugin::disasm {
ui::RegionType m_range = ui::RegionType::EntireData;
Region m_regionToDisassemble = { };
Architecture m_architecture = Architecture::ARM;
cs_mode m_mode = cs_mode(0);
std::unique_ptr<ContentRegistry::Disassembler::Architecture> m_currArchitecture = nullptr;
std::vector<Disassembly> m_disassembly;
std::vector<ContentRegistry::Disassembler::Instruction> m_disassembly;
void disassemble();
void exportToFile();
};
}
}