Sorta works
This commit is contained in:
@@ -5,11 +5,6 @@
|
||||
#include <array>
|
||||
|
||||
struct Disassembler {
|
||||
struct CommentPart {
|
||||
std::string str;
|
||||
u64 resolvedAddr = 0xFFFF'FFFF'FFFF'FFFFull;
|
||||
};
|
||||
|
||||
struct DisassemblyResult {
|
||||
bool success = false;
|
||||
std::string full;
|
||||
@@ -20,23 +15,6 @@ struct Disassembler {
|
||||
std::string str;
|
||||
};
|
||||
std::array<Operand, 3> ops{};
|
||||
std::array<CommentPart, 3> comment{};
|
||||
std::string GetFormattedComment() {
|
||||
std::string res{};
|
||||
for(auto& [str, _] : comment) {
|
||||
res += str;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
u64 GetResolvedAddressFromComment() {
|
||||
auto it = std::ranges::find_if(comment, [](auto& part) {
|
||||
return part.resolvedAddr != 0xFFFF'FFFF'FFFF'FFFFull;
|
||||
});
|
||||
|
||||
if(it == comment.end()) return 0xFFFF'FFFF'FFFF'FFFFull;
|
||||
return it->resolvedAddr;
|
||||
}
|
||||
};
|
||||
|
||||
~Disassembler() { cs_close(&handle); }
|
||||
@@ -50,8 +28,6 @@ struct Disassembler {
|
||||
[[nodiscard]] DisassemblyResult DisassembleDetailed(u32 address, u32 instruction) const;
|
||||
[[nodiscard]] DisassemblyResult DisassembleSimple(u32 address, u32 instruction) const;
|
||||
private:
|
||||
template <typename T>
|
||||
T CapstoneToRegValue(mips_reg reg) const;
|
||||
explicit Disassembler(const bool rsp) : rsp(rsp) {
|
||||
if (cs_open(CS_ARCH_MIPS, static_cast<cs_mode>((rsp ? CS_MODE_32 : CS_MODE_64) | CS_MODE_BIG_ENDIAN), &handle) !=
|
||||
CS_ERR_OK) {
|
||||
@@ -59,7 +35,7 @@ private:
|
||||
}
|
||||
|
||||
if (cs_option(handle, CS_OPT_DETAIL, CS_OPT_ON) != CS_ERR_OK) {
|
||||
warn("Could not enable disassembler's details!");
|
||||
Util::Error::GetInstance().Throw({Util::Error::Severity::WARN}, {Util::Error::Type::CAPSTONE_ERROR}, {}, {}, "Could not enable disassembler's details!");
|
||||
details = false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user