1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00

Merge pull request #777 from TomHarte/ShowCRCs

Show CRC32s of missing ROMs.
This commit is contained in:
Thomas Harte 2020-03-23 21:33:10 -04:00 committed by GitHub
commit af037649c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions

View File

@ -126,7 +126,6 @@ class ConcreteMachine:
paging_registers_[1] = 1; paging_registers_[1] = 1;
paging_registers_[2] = 0; paging_registers_[2] = 0;
} }
page_cartridge();
// Load the BIOS if relevant. // Load the BIOS if relevant.
if(has_bios()) { if(has_bios()) {
@ -145,6 +144,7 @@ class ConcreteMachine:
memcpy(&bios_, roms[0]->data(), roms[0]->size()); memcpy(&bios_, roms[0]->data(), roms[0]->size());
} }
} }
page_cartridge();
// Map RAM. // Map RAM.
if(is_master_system(model_)) { if(is_master_system(model_)) {

View File

@ -70,7 +70,7 @@
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Desktop/Soft/Master System/R-Type (NTSC).sms&quot;" argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Desktop/Soft/Master System/R-Type (NTSC).sms&quot;"
isEnabled = "YES"> isEnabled = "NO">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "--output=CompositeMonochrome" argument = "--output=CompositeMonochrome"
@ -86,7 +86,7 @@
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Desktop/Soft/Amstrad CPC/Robocop.dsk&quot;" argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Desktop/Soft/Amstrad CPC/Robocop.dsk&quot;"
isEnabled = "NO"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "--speed=5" argument = "--speed=5"
@ -94,7 +94,7 @@
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "--rompath=/Users/thomasharte/Projects/CLK/ROMImages" argument = "--rompath=/Users/thomasharte/Projects/CLK/ROMImages"
isEnabled = "YES"> isEnabled = "NO">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "--help" argument = "--help"

View File

@ -12,6 +12,7 @@
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <iomanip>
#include <iostream> #include <iostream>
#include <map> #include <map>
#include <memory> #include <memory>
@ -718,11 +719,18 @@ int main(int argc, char *argv[]) {
std::cerr << "Could not find system ROMs; please install to /usr/local/share/CLK/ or /usr/share/CLK/, or provide a --rompath." << std::endl; std::cerr << "Could not find system ROMs; please install to /usr/local/share/CLK/ or /usr/share/CLK/, or provide a --rompath." << std::endl;
std::cerr << "One or more of the following was needed but not found:" << std::endl; std::cerr << "One or more of the following was needed but not found:" << std::endl;
for(const auto &rom: requested_roms) { for(const auto &rom: requested_roms) {
std::cerr << rom.machine_name << '/' << rom.file_name; std::cerr << rom.machine_name << '/' << rom.file_name << " (";
if(!rom.descriptive_name.empty()) { if(!rom.descriptive_name.empty()) {
std::cerr << " (" << rom.descriptive_name << ")"; std::cerr << rom.descriptive_name << "; ";
} }
std::cerr << std::endl; std::cerr << "accepted crc32s: ";
bool is_first = true;
for(const auto crc32: rom.crc32s) {
if(!is_first) std::cerr << ", ";
is_first = false;
std::cerr << std::hex << std::setfill('0') << std::setw(8) << crc32;
}
std::cerr << ")" << std::endl;
} }
break; break;
} }