6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-21 21:33:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix base RAM mapping.

Browse Source
This commit is contained in:
Thomas Harte 2023-01-13 09:31:56 -05:00
parent 23ff3fc366
commit befc81743a
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Machines/MSX/MSX.cpp
View File

@ -255,7 +255,7 @@ class ConcreteMachine:
}
memory_slots_[0].map(0, 0, 0, 32768);
memory_slots_[3].map(0, 0, 0, 65536);
memory_slots_[3].template map<MemorySlot::AccessType::ReadWrite>(0, 0, 0, 65536);
// Add a disk cartridge if any disks were supplied.
if(target.has_disk_drive) {

12
Machines/MSX/MemorySlotHandler.cpp
View File

@ -53,6 +53,7 @@ const std::vector<uint8_t> &MemorySlot::source() const {
return source_;
}
template <MSX::MemorySlot::AccessType type>
void MemorySlot::map(int subslot, std::size_t source_address, uint16_t destination_address, std::size_t length) {
assert(!(destination_address & 8191));
assert(!(length & 8191));
@ -60,7 +61,13 @@ void MemorySlot::map(int subslot, std::size_t source_address, uint16_t destinati
for(std::size_t c = 0; c < (length >> 13); ++c) {
source_address %= source_.size();
read_pointers_[subslot][(destination_address >> 13) + c] = &source_[source_address];
const int bank = int((destination_address >> 13) + c);
read_pointers_[subslot][bank] = &source_[source_address];
if constexpr (type == AccessType::ReadWrite) {
write_pointers_[subslot][bank] = read_pointers_[subslot][bank];
}
source_address += 8192;
}
@ -79,3 +86,6 @@ void MemorySlot::unmap(int subslot, uint16_t destination_address, std::size_t le
// TODO: need to indicate that mapping changed.
}
template void MemorySlot::map<MSX::MemorySlot::AccessType::Read>(int subslot, std::size_t source_address, uint16_t destination_address, std::size_t length);
template void MemorySlot::map<MSX::MemorySlot::AccessType::ReadWrite>(int subslot, std::size_t source_address, uint16_t destination_address, std::size_t length);

7
Machines/MSX/MemorySlotHandler.hpp
View File

@ -60,10 +60,15 @@ class MemorySlot {
/// Provides a reference to the internal source storage.
const std::vector<uint8_t> &source() const;
enum AccessType {
Read,
ReadWrite
};
/// Maps the content from @c source_address in the buffer previously
/// supplied to @c set_source to the region indicated by
/// @c destination_address and @c length within @c subslot.
void map(
template <AccessType type = AccessType::Read> void map(
int subslot,
std::size_t source_address,
uint16_t destination_address,