From da97bf95c091216a66010ebcf0aebfd759681bfe Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 2 Mar 2018 19:20:37 -0500 Subject: [PATCH] Loosens ColecoVision cartridge size test to allow for slightly broken images. --- Analyser/Static/Coleco/StaticAnalyser.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Analyser/Static/Coleco/StaticAnalyser.cpp b/Analyser/Static/Coleco/StaticAnalyser.cpp index 2c3521fd5..5796034cf 100644 --- a/Analyser/Static/Coleco/StaticAnalyser.cpp +++ b/Analyser/Static/Coleco/StaticAnalyser.cpp @@ -21,19 +21,32 @@ static std::vector> // which must be 8, 12, 16, 24 or 32 kb in size const Storage::Cartridge::Cartridge::Segment &segment = segments.front(); const std::size_t data_size = segment.data.size(); - if((data_size&8191) && (data_size != 12*1024)) continue; + const std::size_t overflow = data_size&8191; + if(overflow > 8 && overflow != 512 && (data_size != 12*1024)) continue; if(data_size < 8192) continue; // the two bytes that will be first must be 0xaa and 0x55, either way around auto *start = &segment.data[0]; - if(data_size > 32768) { + if((data_size & static_cast(~8191)) > 32768) { start = &segment.data[segment.data.size() - 16384]; } if(start[0] != 0xaa && start[0] != 0x55 && start[1] != 0xaa && start[1] != 0x55) continue; if(start[0] == start[1]) continue; // probability of a random binary blob that isn't a Coleco ROM proceeding to here is 1 - 1/32768. - coleco_cartridges.push_back(cartridge); + if(!overflow) { + coleco_cartridges.push_back(cartridge); + } else { + // Size down to a multiple of 8kb and apply the start address. + std::vector output_segments; + + std::vector truncated_data; + std::vector::difference_type truncated_size = static_cast::difference_type>(segment.data.size()) & ~8191; + truncated_data.insert(truncated_data.begin(), segment.data.begin(), segment.data.begin() + truncated_size); + output_segments.emplace_back(0x8000, truncated_data); + + coleco_cartridges.emplace_back(new Storage::Cartridge::Cartridge(output_segments)); + } } return coleco_cartridges;