6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-09-27 18:55:48 +00:00
Code Issues Projects Releases Wiki Activity

Use ranges properly to apply address mapping.

Browse Source
This commit is contained in:
Thomas Harte 2023-09-06 22:26:15 -04:00
parent 251b8e69ad
commit 8c3ebe23f6
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Analyser/Static/Disassembler/Kernel.hpp
View File

@ -14,23 +14,23 @@ namespace Analyser::Static::Disassembly {
template <typename D, typename S> struct PartialDisassembly {
D disassembly;
std::vector<S> remaining_entry_points;
std::vector<bool> touched;
std::map<S, S> touched; // Maps from start of range to end.
};
template <typename D, typename S, typename Disassembler> D Disassemble(
const std::vector<uint8_t> &memory,
const std::function<std::size_t(S)> &address_mapper,
std::vector<S> entry_points,
bool exhaustive) {
bool exhaustive)
{
PartialDisassembly<D, S> partial_disassembly;
partial_disassembly.remaining_entry_points = entry_points;
partial_disassembly.touched.resize(memory.size());
while(true) {
while(!partial_disassembly.remaining_entry_points.empty()) {
// Do a recursive-style disassembly for all current entry points.
while(!partial_disassembly.remaining_entry_points.empty()) {
// Pull the next entry point from the back of the vector.
S next_entry_point = partial_disassembly.remaining_entry_points.back();
const S next_entry_point = partial_disassembly.remaining_entry_points.back();
partial_disassembly.remaining_entry_points.pop_back();
// If that address has already been visited, forget about it.
@ -50,14 +50,18 @@ template <typename D, typename S, typename Disassembler> D Disassemble(
break;
}
// Otherwise, find the first address that isn't yet disassembled and chuck it onto the list.
auto first_untouched = std::find(partial_disassembly.touched.begin(), partial_disassembly.touched.end(), false);
if(first_untouched == partial_disassembly.touched.end()) {
break;
// Otherwise, find the first area between or just beyond a disassembled range
// that isn't yet disassembled and chuck it onto the list.
for(const auto &pair: partial_disassembly.touched) {
const auto end = pair.second;
if(partial_disassembly.touched.find(end) == partial_disassembly.touched.end()) {
if(address_mapper(end) < memory.size()) {
partial_disassembly.remaining_entry_points.push_back(end);
}
break;
}
}
partial_disassembly.remaining_entry_points.push_back(
static_cast<S>(first_untouched - partial_disassembly.touched.begin())
);
}
return partial_disassembly.disassembly;

8
Analyser/Static/Disassembler/Z80.cpp
View File

@ -546,6 +546,9 @@ struct Z80Disassembler {
disassembly.disassembly.internal_calls.insert(entry_point);
Accessor accessor(memory, address_mapper, entry_point);
auto &touched = disassembly.touched[entry_point];
touched = entry_point;
while(!accessor.at_end()) {
Instruction instruction;
instruction.address = accessor.address();
@ -559,10 +562,7 @@ struct Z80Disassembler {
disassembly.disassembly.instructions_by_address[instruction.address] = instruction;
// Apply all touches.
std::fill(
disassembly.touched.begin() + instruction.address,
disassembly.touched.begin() + accessor.address(),
true);
touched = accessor.address();
// Update access tables.
int access_type =