6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 03:32:01 +00:00
Code Issues Projects Releases Wiki Activity

Expose the extension ROM to an MSX 2.

Browse Source
This commit is contained in:
Thomas Harte 2023-01-13 14:16:12 -05:00
parent 4190d25698
commit 9f450b3ccb
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Machines/MSX/MSX.cpp
View File

@ -147,6 +147,10 @@ class ConcreteMachine:
static constexpr int RAMMemorySlot = 3; static constexpr int RAMMemorySlot = 3;
static constexpr int RAMMemorySubSlot = 0; static constexpr int RAMMemorySubSlot = 0;
static constexpr int ExtensionROMSubSlot = 1;
// Provide 512kb of memory for an MSX 2; 64kb for an MSX 1. 'Slightly' arbitrary.
static constexpr size_t RAMSize = model == Target::Model::MSX2 ? 512 * 1024 : 64 * 1024;
public: public:
ConcreteMachine(const Target &target, const ROMMachine::ROMFetcher &rom_fetcher): ConcreteMachine(const Target &target, const ROMMachine::ROMFetcher &rom_fetcher):
@ -247,7 +251,6 @@ class ConcreteMachine:
has_bios = true; has_bios = true;
} }
} }
if(!has_bios) { if(!has_bios) {
std::vector<uint8_t> &bios = roms.find(bios_name)->second; std::vector<uint8_t> &bios = roms.find(bios_name)->second;
@ -266,8 +269,24 @@ class ConcreteMachine:
memory_slots_[0].map(0, 0, 0, 32768); memory_slots_[0].map(0, 0, 0, 32768);
memory_slots_[RAMMemorySlot].resize_source(65536); if constexpr (model == Target::Model::MSX2) {
// If there's an extension ROM, add it as a subslot in the same slot as RAM.
std::vector<uint8_t> ram_plus;
ram_plus.resize(RAMSize);
const auto extension = roms.find(ROM::Name::MSX2Extension);
std::copy(extension->second.begin(), extension->second.end(), std::back_inserter(ram_plus));
memory_slots_[RAMMemorySlot].supports_secondary_paging = true;
memory_slots_[RAMMemorySlot].set_source(ram_plus);
memory_slots_[RAMMemorySlot].template map<MemorySlot::AccessType::ReadWrite>(RAMMemorySubSlot, 0, 0, 65536); memory_slots_[RAMMemorySlot].template map<MemorySlot::AccessType::ReadWrite>(RAMMemorySubSlot, 0, 0, 65536);
memory_slots_[RAMMemorySlot].map(ExtensionROMSubSlot, 0, 0, 32768);
} else {
memory_slots_[RAMMemorySlot].resize_source(65536);
memory_slots_[RAMMemorySlot].template map<MemorySlot::AccessType::ReadWrite>(RAMMemorySubSlot, RAMSize, 0, 65536);
}
// Add a disk cartridge if any disks were supplied. // Add a disk cartridge if any disks were supplied.
if(target.has_disk_drive) { if(target.has_disk_drive) {