6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-27 00:30:26 +00:00
Code Issues Projects Releases Wiki Activity

Made another attempt to distinguish.

Browse Source
This commit is contained in:
Thomas Harte 2017-02-27 08:06:57 -05:00
parent a3d339092e
commit fe07cd0248
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
StaticAnalyser/Atari/StaticAnalyser.cpp
View File

@ -38,17 +38,17 @@ static void DeterminePagingFor2kCartridge(StaticAnalyser::Target &target, const
StaticAnalyser::MOS6502::Disassemble(segment.data, full_range_mapper, {entry_address, break_address}); StaticAnalyser::MOS6502::Disassemble(segment.data, full_range_mapper, {entry_address, break_address});
// if there are no subroutines in the top 2kb of memory then this isn't a CommaVid // if there are no subroutines in the top 2kb of memory then this isn't a CommaVid
bool has_subroutine_call = false; bool has_appropriate_subroutine_calls = false;
bool has_inappropriate_subroutine_calls = false;
for(uint16_t address : high_location_disassembly.internal_calls) for(uint16_t address : high_location_disassembly.internal_calls)
{ {
const uint16_t masked_address = address & 0x1fff; const uint16_t masked_address = address & 0x1fff;
if(masked_address >= 0x1800) has_appropriate_subroutine_calls |= (masked_address >= 0x1800);
{ has_inappropriate_subroutine_calls |= (masked_address < 0x1800);
has_subroutine_call = true;
break;
}
} }
if(!has_subroutine_call) return;
// assumption here: a CommaVid will never branch into RAM. Possibly unsafe: if it won't then what's the RAM for?
if(!has_appropriate_subroutine_calls || has_inappropriate_subroutine_calls) return;
std::set<uint16_t> all_writes = high_location_disassembly.external_stores; std::set<uint16_t> all_writes = high_location_disassembly.external_stores;
all_writes.insert(high_location_disassembly.external_modifies.begin(), high_location_disassembly.external_modifies.end()); all_writes.insert(high_location_disassembly.external_modifies.begin(), high_location_disassembly.external_modifies.end());
@ -68,7 +68,11 @@ static void DeterminePagingFor2kCartridge(StaticAnalyser::Target &target, const
} }
// conclude that this is a CommaVid if it attempted to write something to the CommaVid RAM locations // conclude that this is a CommaVid if it attempted to write something to the CommaVid RAM locations
if(has_appropriate_writes) target.atari.paging_model = StaticAnalyser::Atari2600PagingModel::CommaVid; if(has_appropriate_writes)
{
target.atari.paging_model = StaticAnalyser::Atari2600PagingModel::CommaVid;
return;
}
} }
static void DeterminePagingForCartridge(StaticAnalyser::Target &target, const Storage::Cartridge::Cartridge::Segment &segment) static void DeterminePagingForCartridge(StaticAnalyser::Target &target, const Storage::Cartridge::Cartridge::Segment &segment)