6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-28 07:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Added an extra test to try to avoid spurious |cpm launches.

Browse Source
This commit is contained in:
Thomas Harte 2017-08-16 21:55:31 -04:00
parent 952da1e581
commit 9d9a1c341d
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
StaticAnalyser/AmstradCPC/StaticAnalyser.cpp
View File

@ -26,11 +26,11 @@ static std::string RunCommandFor(const Storage::Disk::CPM::File &file) {
} }
static void InspectDataCatalogue( static void InspectDataCatalogue(
const std::unique_ptr<Storage::Disk::CPM::Catalogue> &data_catalogue, const Storage::Disk::CPM::Catalogue &catalogue,
StaticAnalyser::Target &target) { StaticAnalyser::Target &target) {
// If there's just one file, run that. // If there's just one file, run that.
if(data_catalogue->files.size() == 1) { if(catalogue.files.size() == 1) {
target.loadingCommand = RunCommandFor(data_catalogue->files[0]); target.loadingCommand = RunCommandFor(catalogue.files[0]);
return; return;
} }
@ -42,22 +42,22 @@ static void InspectDataCatalogue(
size_t last_basic_file = 0; size_t last_basic_file = 0;
size_t last_implicit_suffixed_file = 0; size_t last_implicit_suffixed_file = 0;
for(size_t c = 0; c < data_catalogue->files.size(); c++) { for(size_t c = 0; c < catalogue.files.size(); c++) {
// Files with nothing but spaces in their name can't be loaded by the user, so disregard them. // Files with nothing but spaces in their name can't be loaded by the user, so disregard them.
if(data_catalogue->files[c].type == " " && data_catalogue->files[c].name == " ") if(catalogue.files[c].type == " " && catalogue.files[c].name == " ")
continue; continue;
// Check for whether this is [potentially] BASIC. // Check for whether this is [potentially] BASIC.
if(data_catalogue->files[c].data.size() >= 128 && !((data_catalogue->files[c].data[18] >> 1) & 7)) { if(catalogue.files[c].data.size() >= 128 && !((catalogue.files[c].data[18] >> 1) & 7)) {
basic_files++; basic_files++;
last_basic_file = c; last_basic_file = c;
} }
// Check suffix for emptiness. // Check suffix for emptiness.
if( if(
data_catalogue->files[c].type == " " || catalogue.files[c].type == " " ||
strcmp_insensitive(data_catalogue->files[c].type.c_str(), "BAS") || strcmp_insensitive(catalogue.files[c].type.c_str(), "BAS") ||
strcmp_insensitive(data_catalogue->files[c].type.c_str(), "BIN") strcmp_insensitive(catalogue.files[c].type.c_str(), "BIN")
) { ) {
implicit_suffixed_files++; implicit_suffixed_files++;
last_implicit_suffixed_file = c; last_implicit_suffixed_file = c;
@ -65,7 +65,7 @@ static void InspectDataCatalogue(
} }
if(basic_files == 1 || implicit_suffixed_files == 1) { if(basic_files == 1 || implicit_suffixed_files == 1) {
size_t selected_file = (basic_files == 1) ? last_basic_file : last_implicit_suffixed_file; size_t selected_file = (basic_files == 1) ? last_basic_file : last_implicit_suffixed_file;
target.loadingCommand = RunCommandFor(data_catalogue->files[selected_file]); target.loadingCommand = RunCommandFor(catalogue.files[selected_file]);
return; return;
} }
@ -75,18 +75,33 @@ static void InspectDataCatalogue(
static void InspectSystemCatalogue( static void InspectSystemCatalogue(
const std::shared_ptr<Storage::Disk::Disk> &disk, const std::shared_ptr<Storage::Disk::Disk> &disk,
const std::unique_ptr<Storage::Disk::CPM::Catalogue> &catalogue, const Storage::Disk::CPM::Catalogue &catalogue,
StaticAnalyser::Target &target) { StaticAnalyser::Target &target) {
Storage::Encodings::MFM::Parser parser(true, disk); Storage::Encodings::MFM::Parser parser(true, disk);
// Check that the boot sector exists.
if(parser.get_sector(0, 0, 0x41) != nullptr) { // Check that the boot sector exists and looks like it had content written to it.
// This is a system disk, then launch it as though it were CP/M. std::shared_ptr<Storage::Encodings::MFM::Sector> boot_sector = parser.get_sector(0, 0, 0x41);
target.loadingCommand = "|cpm\n"; if(boot_sector != nullptr) {
} else { // Check that the first 64 bytes of the sector aren't identical; if they are then probably
InspectDataCatalogue(catalogue, target); // this disk was formatted and the filler byte never replaced.
bool matched = true;
for(size_t c = 1; c < 64; c++) {
if(boot_sector->data[c] != boot_sector->data[0]) {
matched = false;
break;
} }
} }
// This is a system disk, then launch it as though it were CP/M.
if(!matched) {
target.loadingCommand = "|cpm\n";
return;
}
}
InspectDataCatalogue(catalogue, target);
}
void StaticAnalyser::AmstradCPC::AddTargets( void StaticAnalyser::AmstradCPC::AddTargets(
const std::list<std::shared_ptr<Storage::Disk::Disk>> &disks, const std::list<std::shared_ptr<Storage::Disk::Disk>> &disks,
const std::list<std::shared_ptr<Storage::Tape::Tape>> &tapes, const std::list<std::shared_ptr<Storage::Tape::Tape>> &tapes,
@ -119,7 +134,7 @@ void StaticAnalyser::AmstradCPC::AddTargets(
std::unique_ptr<Storage::Disk::CPM::Catalogue> data_catalogue = Storage::Disk::CPM::GetCatalogue(target.disks.front(), data_format); std::unique_ptr<Storage::Disk::CPM::Catalogue> data_catalogue = Storage::Disk::CPM::GetCatalogue(target.disks.front(), data_format);
if(data_catalogue) { if(data_catalogue) {
InspectDataCatalogue(data_catalogue, target); InspectDataCatalogue(*data_catalogue, target);
} else { } else {
Storage::Disk::CPM::ParameterBlock system_format; Storage::Disk::CPM::ParameterBlock system_format;
system_format.sectors_per_track = 9; system_format.sectors_per_track = 9;
@ -131,7 +146,7 @@ void StaticAnalyser::AmstradCPC::AddTargets(
std::unique_ptr<Storage::Disk::CPM::Catalogue> system_catalogue = Storage::Disk::CPM::GetCatalogue(target.disks.front(), system_format); std::unique_ptr<Storage::Disk::CPM::Catalogue> system_catalogue = Storage::Disk::CPM::GetCatalogue(target.disks.front(), system_format);
if(system_catalogue) { if(system_catalogue) {
InspectSystemCatalogue(target.disks.front(), data_catalogue, target); InspectSystemCatalogue(target.disks.front(), *system_catalogue, target);
} }
} }
} }