diff --git a/StaticAnalyser/Disassembler/Disassembler6502.cpp b/StaticAnalyser/Disassembler/Disassembler6502.cpp index 8cc71e4bd..3b773f10e 100644 --- a/StaticAnalyser/Disassembler/Disassembler6502.cpp +++ b/StaticAnalyser/Disassembler/Disassembler6502.cpp @@ -16,7 +16,6 @@ struct PartialDisassembly { std::vector remaining_entry_points; }; - static void AddToDisassembly(PartialDisassembly &disassembly, const std::vector &memory, uint16_t start_address, uint16_t entry_point) { uint16_t address = entry_point; @@ -24,10 +23,10 @@ static void AddToDisassembly(PartialDisassembly &disassembly, const std::vector< { uint16_t local_address = address - start_address; if(local_address >= memory.size()) return; - address++; struct Instruction instruction; instruction.address = address; + address++; // get operation uint8_t operation = memory[local_address]; @@ -259,6 +258,19 @@ static void AddToDisassembly(PartialDisassembly &disassembly, const std::vector< // store the instruction away disassembly.disassembly.instructions_by_address[instruction.address] = instruction; + // TODO: something wider-ranging than this + if(instruction.addressing_mode == Instruction::Absolute && (instruction.operand < start_address || instruction.operand >= start_address + memory.size())) + { + if( instruction.operation == Instruction::STY || + instruction.operation == Instruction::STX || + instruction.operation == Instruction::STA) + disassembly.disassembly.external_stores.insert(instruction.operand); + if( instruction.operation == Instruction::LDY || + instruction.operation == Instruction::LDX || + instruction.operation == Instruction::LDA) + disassembly.disassembly.external_loads.insert(instruction.operand); + } + // decide on overall flow control if(instruction.operation == Instruction::RTS || instruction.operation == Instruction::RTI) return; if(instruction.operation == Instruction::BRK) return; // TODO: check whether IRQ vector is within memory range @@ -280,7 +292,7 @@ static void AddToDisassembly(PartialDisassembly &disassembly, const std::vector< } } -Disassembly Disassemble(const std::vector &memory, uint16_t start_address, std::vector entry_points) +Disassembly StaticAnalyser::MOS6502::Disassemble(const std::vector &memory, uint16_t start_address, std::vector entry_points) { PartialDisassembly partialDisassembly; partialDisassembly.remaining_entry_points = entry_points; @@ -294,8 +306,11 @@ Disassembly Disassemble(const std::vector &memory, uint16_t start_addre // if that address has already bene visited, forget about it if(partialDisassembly.disassembly.instructions_by_address.find(next_entry_point) != partialDisassembly.disassembly.instructions_by_address.end()) continue; - // otherwise perform a diassembly run - AddToDisassembly(partialDisassembly, memory, start_address, next_entry_point); + // if it's outgoing, log it as such and forget about it; otherwise disassemble + if(next_entry_point < start_address || next_entry_point >= start_address + memory.size()) + partialDisassembly.disassembly.outward_calls.insert(next_entry_point); + else + AddToDisassembly(partialDisassembly, memory, start_address, next_entry_point); } return std::move(partialDisassembly.disassembly); diff --git a/StaticAnalyser/Oric/StaticAnalyser.cpp b/StaticAnalyser/Oric/StaticAnalyser.cpp index a258ad65a..b2e403f7b 100644 --- a/StaticAnalyser/Oric/StaticAnalyser.cpp +++ b/StaticAnalyser/Oric/StaticAnalyser.cpp @@ -9,9 +9,68 @@ #include "StaticAnalyser.hpp" #include "Tape.hpp" +#include "../Disassembler/Disassembler6502.hpp" using namespace StaticAnalyser::Oric; +static int Score(const StaticAnalyser::MOS6502::Disassembly &disassembly, const std::set &rom_functions) +{ + int score = 0; + + for(auto address : disassembly.outward_calls) + { + if(rom_functions.find(address) != rom_functions.end()) + score++; + else + score--; + } + + return score; +} + +static int Basic10Score(const StaticAnalyser::MOS6502::Disassembly &disassembly) +{ + std::set rom_functions = { + 0xc3ca, 0xc3f8, 0xc448, 0xc47c, 0xc4b5, 0xc4e3, 0xc4e0, 0xc524, 0xc56f, 0xc5a2, 0xc5f8, 0xc60a, 0xc6a5, 0xc6de, 0xc719, 0xc738, + 0xc773, 0xc824, 0xc832, 0xc841, 0xc8c1, 0xc8fe, 0xc91f, 0xc93f, 0xc941, 0xc91e, 0xc98b, 0xc996, 0xc9b3, 0xc9e0, 0xca0a, 0xca1c, + 0xca1f, 0xca3e, 0xca61, 0xca78, 0xca98, 0xcad2, 0xcb61, 0xcb9f, 0xcc59, 0xcbed, 0xcc0a, 0xcc8c, 0xcc8f, 0xccba, 0xccc9, 0xccfd, + 0xce0c, 0xce77, 0xce8b, 0xcfac, 0xcf74, 0xd03c, 0xd059, 0xcff0, 0xd087, 0xd0f2, 0xd0fc, 0xd361, 0xd3eb, 0xd47e, 0xd4a6, 0xd401, + 0xd593, 0xd5a3, 0xd4fa, 0xd595, 0xd730, 0xd767, 0xd816, 0xd82a, 0xd856, 0xd861, 0xd8a6, 0xd8b5, 0xd80a, 0xd867, 0xd938, 0xd894, + 0xd89d, 0xd8ac, 0xd983, 0xd993, 0xd9b5, 0xd93d, 0xd965, 0xda3f, 0xd9c6, 0xda16, 0xdaab, 0xdada, 0xda6b, 0xdb92, 0xdbb9, 0xdc79, + 0xdd4d, 0xdda3, 0xddbf, 0xd0d0, 0xde77, 0xdef4, 0xdf0b, 0xdf0f, 0xdf04, 0xdf12, 0xdf31, 0xdf4c, 0xdf8c, 0xdfa5, 0xdfcf, 0xe076, + 0xe0c1, 0xe22a, 0xe27c, 0xe2a6, 0xe313, 0xe34b, 0xe387, 0xe38e, 0xe3d7, 0xe407, 0xe43b, 0xe46f, 0xe4a8, 0xe4f2, 0xe554, 0xe57d, + 0xe585, 0xe58c, 0xe594, 0xe5a4, 0xe5ab, 0xe5b6, 0xe5ea, 0xe563, 0xe5c6, 0xe630, 0xe696, 0xe6ba, 0xe6ca, 0xe725, 0xe7aa, 0xe903, + 0xe7db, 0xe80d, 0xe987, 0xe9d1, 0xe87d, 0xe905, 0xe965, 0xe974, 0xe994, 0xe9a9, 0xe9bb, 0xec45, 0xeccc, 0xedc4, 0xecc7, 0xed01, + 0xed09, 0xed70, 0xed81, 0xed8f, 0xe0ad, 0xeee8, 0xeef8, 0xebdf, 0xebe2, 0xebe5, 0xebeb, 0xebee, 0xebf4, 0xebf7, 0xebfa, 0xebe8, + 0xf43c, 0xf4ef, 0xf523, 0xf561, 0xf535, 0xf57b, 0xf5d3, 0xf71a, 0xf73f, 0xf7e4, 0xf7e0, 0xf82f, 0xf88f, 0xf8af, 0xf8b5, 0xf920, + 0xf967, 0xf960, 0xf9c9, 0xfa14, 0xfa85, 0xfa9b, 0xfab1, 0xfac7, 0xfafa, 0xfb10, 0xfb26, 0xfbb6, 0xfbfe + }; + + return Score(disassembly, rom_functions); +} + +static int Basic11Score(const StaticAnalyser::MOS6502::Disassembly &disassembly) +{ + std::set rom_functions = { + 0xc3c6, 0xc3f4, 0xc444, 0xc47c, 0xc4a8, 0xc4d3, 0xc4e0, 0xc524, 0xc55f, 0xc592, 0xc5e8, 0xc5fa, 0xc692, 0xc6b3, 0xc6ee, 0xc70d, + 0xc748, 0xc7fd, 0xc809, 0xc816, 0xc82f, 0xc855, 0xc8c1, 0xc915, 0xc952, 0xc971, 0xc973, 0xc9a0, 0xc9bd, 0xc9c8, 0xc9e5, 0xca12, + 0xca3c, 0xca4e, 0xca51, 0xca70, 0xca99, 0xcac2, 0xcae2, 0xcb1c, 0xcbab, 0xcbf0, 0xcc59, 0xccb0, 0xccce, 0xcd16, 0xcd19, 0xcd46, + 0xcd55, 0xcd89, 0xce98, 0xcf03, 0xcf17, 0xcfac, 0xd000, 0xd03c, 0xd059, 0xd07c, 0xd113, 0xd17e, 0xd188, 0xd361, 0xd3eb, 0xd47e, + 0xd4a6, 0xd4ba, 0xd593, 0xd5a3, 0xd5b5, 0xd650, 0xd730, 0xd767, 0xd816, 0xd82a, 0xd856, 0xd861, 0xd8a6, 0xd8b5, 0xd8c5, 0xd922, + 0xd938, 0xd94f, 0xd958, 0xd967, 0xd983, 0xd993, 0xd9b5, 0xd9de, 0xda0c, 0xda3f, 0xda51, 0xdaa1, 0xdaab, 0xdada, 0xdaf6, 0xdb92, + 0xdbb9, 0xdcaf, 0xdd51, 0xdda7, 0xddc3, 0xddd4, 0xde77, 0xdef4, 0xdf0b, 0xdf0f, 0xdf13, 0xdf21, 0xdf49, 0xdf4c, 0xdf8c, 0xdfbd, + 0xdfe7, 0xe076, 0xe0c5, 0xe22e, 0xe27c, 0xe2aa, 0xe313, 0xe34f, 0xe38b, 0xe392, 0xe3db, 0xe407, 0xe43f, 0xe46f, 0xe4ac, 0xe4e0, + 0xe4f2, 0xe56c, 0xe57d, 0xe585, 0xe58c, 0xe594, 0xe5a4, 0xe5ab, 0xe5b6, 0xe5ea, 0xe5f5, 0xe607, 0xe65e, 0xe6c9, 0xe735, 0xe75a, + 0xe76a, 0xe7b2, 0xe85b, 0xe903, 0xe909, 0xe946, 0xe987, 0xe9d1, 0xeaf0, 0xeb78, 0xebce, 0xebe7, 0xec0c, 0xec21, 0xec33, 0xec45, + 0xeccc, 0xedc4, 0xede0, 0xee1a, 0xee22, 0xee8c, 0xee9d, 0xeeab, 0xeec9, 0xeee8, 0xeef8, 0xf0c8, 0xf0fd, 0xf110, 0xf11d, 0xf12d, + 0xf204, 0xf210, 0xf268, 0xf37f, 0xf495, 0xf4ef, 0xf523, 0xf561, 0xf590, 0xf5c1, 0xf602, 0xf71a, 0xf77c, 0xf7e4, 0xf816, 0xf865, + 0xf88f, 0xf8af, 0xf8b5, 0xf920, 0xf967, 0xf9aa, 0xf9c9, 0xfa14, 0xfa9f, 0xfab5, 0xfacb, 0xfae1, 0xfb14, 0xfb2a, 0xfb40, 0xfbd0, + 0xfc18 + }; + + return Score(disassembly, rom_functions); +} + void StaticAnalyser::Oric::AddTargets( const std::list> &disks, const std::list> &tapes, @@ -22,16 +81,35 @@ void StaticAnalyser::Oric::AddTargets( target.machine = Target::Oric; target.probability = 1.0; + int basic10_votes = 0; + int basic11_votes = 0; + for(auto tape : tapes) { std::list tape_files = GetFiles(tape); if(tape_files.size()) { + for(auto file : tape_files) + { + if(file.data_type == File::MachineCode) + { + std::vector entry_points = {file.starting_address}; + StaticAnalyser::MOS6502::Disassembly disassembly = + StaticAnalyser::MOS6502::Disassemble(file.data, file.starting_address, entry_points); + + int basic10_score = Basic10Score(disassembly); + int basic11_score = Basic11Score(disassembly); + if(basic10_score > basic11_score) basic10_votes++; else basic11_votes++; + } + } + target.tapes.push_back(tape); target.loadingCommand = "CLOAD\"\"\n"; } } + target.oric.use_atmos_rom = basic11_votes >= basic10_votes; + if(target.tapes.size() || target.disks.size() || target.cartridges.size()) destination.push_back(target); } diff --git a/StaticAnalyser/StaticAnalyser.hpp b/StaticAnalyser/StaticAnalyser.hpp index ca20b271a..59e4bd550 100644 --- a/StaticAnalyser/StaticAnalyser.hpp +++ b/StaticAnalyser/StaticAnalyser.hpp @@ -49,6 +49,10 @@ struct Target { bool has_dfs; bool should_hold_shift; } acorn; + + struct { + bool use_atmos_rom; + } oric; }; std::string loadingCommand;