Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-18 17:14:13 +01:00
Code Releases Wiki Activity

build: Allow building with capstone 4.X again

Browse Source
This commit is contained in:
WerWolv 2023-03-23 16:45:00 +01:00
parent 13be499510
commit 2296766746
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/external/libwolv vendored

@ -1 +1 @@
Subproject commit 3b7a928b7e53e98c5ef7372f1429032f6d622c10
Subproject commit 34d36a2f3397143a79b31fa4ba0f57f91ba0600e

10
lib/libimhex/include/hex/helpers/disassembler.hpp
View File

@ -20,10 +20,16 @@ namespace hex {
TMS320C64X,
M680X,
EVM,
MOS65XX,
WASM,
#if defined(CS_MODE_RISCV32)
RISCV,
#endif
#if defined(CS_MODE_MOS65XX_6502)
MOS65XX,
#endif
#if defined(CS_MODE_BPF_CLASSIC)
BPF,
RISCV,
#endif
MAX,
MIN = ARM

21
plugins/builtin/source/content/views/view_disassembler.cpp
View File

@ -186,12 +186,17 @@ namespace hex::plugin::builtin {
static bool qpx = false;
ImGui::Checkbox("hex.builtin.view.disassembler.ppc.qpx"_lang, &qpx);
static bool spe = false;
ImGui::Checkbox("hex.builtin.view.disassembler.ppc.spe"_lang, &spe);
static bool booke = false;
ImGui::Checkbox("hex.builtin.view.disassembler.ppc.booke"_lang, &booke);
this->m_mode = cs_mode(mode | (qpx ? CS_MODE_QPX : cs_mode(0)) | (spe ? CS_MODE_SPE : cs_mode(0)) | (booke ? CS_MODE_BOOKE : cs_mode(0)));
#if defined (CS_MODE_SPE)
static bool spe = false;
ImGui::Checkbox("hex.builtin.view.disassembler.ppc.spe"_lang, &spe);
static bool booke = false;
ImGui::Checkbox("hex.builtin.view.disassembler.ppc.booke"_lang, &booke);
this->m_mode = cs_mode(mode | (qpx ? CS_MODE_QPX : cs_mode(0)) | (spe ? CS_MODE_SPE : cs_mode(0)) | (booke ? CS_MODE_BOOKE : cs_mode(0)));
#else
this->m_mode = cs_mode(mode | (qpx ? CS_MODE_QPX : cs_mode(0)));
#endif
}
break;
case Architecture::SPARC:
@ -202,6 +207,7 @@ namespace hex::plugin::builtin {
this->m_mode = cs_mode(v9Mode ? CS_MODE_V9 : cs_mode(0));
}
break;
#if defined (CS_MODE_RISCV32)
case Architecture::RISCV:
{
static int mode = CS_MODE_RISCV32;
@ -215,6 +221,7 @@ namespace hex::plugin::builtin {
this->m_mode = cs_mode(mode | (compressed ? CS_MODE_RISCVC : cs_mode(0)));
}
break;
#endif
case Architecture::M68K:
{
static int selectedMode = 0;
@ -267,6 +274,7 @@ namespace hex::plugin::builtin {
this->m_mode = cs_mode(modes[selectedMode].second);
}
break;
#if defined(CS_MODE_MOS65XX_6502)
case Architecture::MOS65XX:
{
static int selectedMode = 0;
@ -292,6 +300,8 @@ namespace hex::plugin::builtin {
this->m_mode = cs_mode(modes[selectedMode].second);
}
break;
#endif
#if defined(CS_MODE_BPF_CLASSIC)
case Architecture::BPF:
{
static int mode = CS_MODE_BPF_CLASSIC;
@ -302,6 +312,7 @@ namespace hex::plugin::builtin {
this->m_mode = cs_mode(mode);
}
break;
#endif
case Architecture::EVM:
case Architecture::TMS320C64X:
case Architecture::ARM64: