6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-09 05:25:01 +00:00
Code Issues Projects Releases Wiki Activity

Allows the MSX to load ROMs that aren't quite multiples of 8kb.

Browse Source
This commit is contained in:
Thomas Harte
2018-01-16 22:27:41 -05:00
parent e13312dcc5
commit 583c3cfe7d
3 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
StaticAnalyser/Acorn/StaticAnalyser.cpp
View File

@@ -24,7 +24,7 @@ static std::list<std::shared_ptr<Storage::Cartridge::Cartridge>>
if(segments.size() != 1) continue; if(segments.size() != 1) continue;
// which must be 8 or 16 kb in size // which must be 8 or 16 kb in size
Storage::Cartridge::Cartridge::Segment segment = segments.front(); const Storage::Cartridge::Cartridge::Segment &segment = segments.front();
if(segment.data.size() != 0x4000 && segment.data.size() != 0x2000) continue; if(segment.data.size() != 0x4000 && segment.data.size() != 0x2000) continue;
// is a copyright string present? // is a copyright string present?

19
StaticAnalyser/MSX/StaticAnalyser.cpp
View File

@@ -34,10 +34,10 @@ static std::list<std::shared_ptr<Storage::Cartridge::Cartridge>>
// Only one mapped item is allowed. // Only one mapped item is allowed.
if(segments.size() != 1) continue; if(segments.size() != 1) continue;
// Which must be a multiple of 16 kb in size. // Which must be no more than 63 bytes larger than a multiple of 8 kb in size.
Storage::Cartridge::Cartridge::Segment segment = segments.front(); Storage::Cartridge::Cartridge::Segment segment = segments.front();
const size_t data_size = segment.data.size(); const size_t data_size = segment.data.size();
if(data_size < 0x2000 || data_size & 0x3fff) continue; if(data_size < 0x2000 || (data_size & 0x1fff) > 64) continue;
// Check for a ROM header at address 0; if it's not found then try 0x4000 // Check for a ROM header at address 0; if it's not found then try 0x4000
// and adjust the start address; // and adjust the start address;
@@ -184,10 +184,17 @@ static std::list<std::shared_ptr<Storage::Cartridge::Cartridge>>
} }
} }
// Apply the standard MSX start address. // Size down to a multiple of 8kb in size and apply the start address.
msx_cartridges.emplace_back(new Storage::Cartridge::Cartridge({ std::vector<Storage::Cartridge::Cartridge::Segment> output_segments;
Storage::Cartridge::Cartridge::Segment(start_address, segment.data) if(segment.data.size() & 0x1fff) {
})); std::vector<uint8_t> truncated_data;
std::vector<uint8_t>::difference_type truncated_size = static_cast<std::vector<uint8_t>::difference_type>(segment.data.size() & ~0x1fff);
truncated_data.insert(truncated_data.begin(), segment.data.begin(), segment.data.begin() + truncated_size);
output_segments.emplace_back(start_address, truncated_data);
} else {
output_segments.emplace_back(start_address, segment.data);
}
msx_cartridges.emplace_back(new Storage::Cartridge::Cartridge(output_segments));
} }
return msx_cartridges; return msx_cartridges;

22
Storage/Cartridge/Cartridge.hpp
View File

@@ -28,12 +28,28 @@ namespace Cartridge {
class Cartridge { class Cartridge {
public: public:
struct Segment { struct Segment {
Segment(size_t start_address, size_t end_address, std::vector<uint8_t> data) : Segment(size_t start_address, size_t end_address, std::vector<uint8_t> &&data) :
start_address(start_address), end_address(end_address), data(std::move(data)) {} start_address(start_address), end_address(end_address), data(data) {}
Segment(size_t start_address, std::vector<uint8_t> data) : Segment(size_t start_address, size_t end_address, const std::vector<uint8_t> &data) :
start_address(start_address), end_address(end_address), data(data) {}
Segment(size_t start_address, std::vector<uint8_t> &&data) :
Segment(start_address, start_address + data.size(), data) {} Segment(start_address, start_address + data.size(), data) {}
Segment(size_t start_address, const std::vector<uint8_t> &data) :
Segment(start_address, start_address + data.size(), data) {}
Segment(Segment &&segment) :
start_address(segment.start_address),
end_address(segment.end_address),
data(std::move(segment.data)) {}
Segment(const Segment &segment) :
start_address(segment.start_address),
end_address(segment.end_address),
data(segment.data) {}
/// Indicates that an address is unknown. /// Indicates that an address is unknown.
static const size_t UnknownAddress; static const size_t UnknownAddress;