Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-11 16:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize instruction summary

Browse Source
This commit is contained in:
momo5502
2025-08-18 19:29:25 +02:00
parent 1db2c97165
commit 80c8b88d23
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/analyzer/analysis.cpp
View File

@@ -31,7 +31,7 @@ namespace
};
}
std::string get_instruction_string(const emulator& emu, const uint64_t address)
std::string get_instruction_string(const disassembler& d, const emulator& emu, const uint64_t address)
{
std::array<uint8_t, MAX_INSTRUCTION_BYTES> instruction_bytes{};
const auto result = emu.try_read_memory(address, instruction_bytes.data(), instruction_bytes.size());
@@ -40,8 +40,7 @@ namespace
return {};
}
disassembler disasm{};
const auto instructions = disasm.disassemble(instruction_bytes, 1);
const auto instructions = d.disassemble(instruction_bytes, 1);
if (instructions.empty())
{
return {};
@@ -59,7 +58,7 @@ namespace
// TODO: Pass enum?
if (details == "Illegal instruction")
{
const auto inst = get_instruction_string(c.win_emu->emu(), rip);
const auto inst = get_instruction_string(c.d, c.win_emu->emu(), rip);
if (!inst.empty())
{
addition = " (" + inst + ")";
@@ -258,7 +257,7 @@ namespace
}
}
bool is_return(const emulator& emu, const uint64_t address)
bool is_return(const disassembler& d, const emulator& emu, const uint64_t address)
{
std::array<uint8_t, MAX_INSTRUCTION_BYTES> instruction_bytes{};
const auto result = emu.try_read_memory(address, instruction_bytes.data(), instruction_bytes.size());
@@ -267,14 +266,13 @@ namespace
return false;
}
disassembler disasm{};
const auto instructions = disasm.disassemble(instruction_bytes, 1);
const auto instructions = d.disassemble(instruction_bytes, 1);
if (instructions.empty())
{
return false;
}
return cs_insn_group(disasm.get_handle(), instructions.data(), CS_GRP_RET);
return cs_insn_group(d.get_handle(), instructions.data(), CS_GRP_RET);
}
void record_instruction(analysis_context& c, const uint64_t address)
@@ -293,7 +291,7 @@ namespace
return;
}
++c.instructions[instructions[0].mnemonic];
++c.instructions[instructions[0].id];
}
void handle_instruction(analysis_context& c, const uint64_t address)
@@ -384,7 +382,7 @@ namespace
win_emu.log.print(is_interesting_call ? color::yellow : color::gray, "Executing entry point: %s (0x%" PRIx64 ")\n",
binary->name.c_str(), address);
}
else if (is_previous_main_exe && binary != previous_binary && !is_return(c.win_emu->emu(), previous_ip))
else if (is_previous_main_exe && binary != previous_binary && !is_return(c.d, c.win_emu->emu(), previous_ip))
{
auto nearest_entry = binary->address_names.upper_bound(address);
if (nearest_entry == binary->address_names.begin())

4
src/analyzer/analysis.hpp
View File

@@ -2,6 +2,7 @@
#include <set>
#include <string>
#include "disassembler.hpp"
struct mapped_module;
class module_manager;
@@ -40,7 +41,8 @@ struct analysis_context
std::string output{};
bool has_reached_main{false};
std::map<std::string, uint64_t> instructions{};
disassembler d{};
std::unordered_map<uint32_t, uint64_t> instructions{};
std::vector<accessed_import> accessed_imports{};
};

13
src/analyzer/main.cpp
View File

@@ -223,20 +223,21 @@ namespace
void print_instruction_summary(const analysis_context& c)
{
std::map<uint64_t, std::vector<std::string>> instruction_counts{};
std::map<uint64_t, std::vector<uint32_t>> instruction_counts{};
for (const auto& [mnemonic, count] : c.instructions)
for (const auto& [instruction, count] : c.instructions)
{
instruction_counts[count].push_back(mnemonic);
instruction_counts[count].push_back(instruction);
}
c.win_emu->log.print(color::white, "Instruction summary:\n");
for (const auto& [count, mnemonics] : instruction_counts)
for (const auto& [count, instructions] : instruction_counts)
{
for (const auto& mnemonic : mnemonics)
for (const auto& instruction : instructions)
{
c.win_emu->log.print(color::white, "%s: %" PRIx64 "\n", mnemonic.c_str(), count);
const auto* mnemonic = cs_insn_name(c.d.get_handle(), instruction);
c.win_emu->log.print(color::white, "%s: %" PRIx64 "\n", mnemonic, count);
}
}
}