6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Starts to formalise the ST memory map a little.

Browse Source
This commit is contained in:
Thomas Harte 2019-10-06 17:15:29 -04:00
parent 484a0ceeb8
commit 87a6d22894
1 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Machines/AtariST/AtariST.cpp
View File

@ -45,6 +45,17 @@ class ConcreteMachine:
throw ROMMachine::Error::MissingROMs; throw ROMMachine::Error::MissingROMs;
} }
Memory::PackBigEndian16(*roms[0], rom_); Memory::PackBigEndian16(*roms[0], rom_);
// Set up basic memory map.
memory_map_[0] = BusDevice::MostlyRAM;
for(int c = 1; c < 0xf0; ++c) memory_map_[c] = BusDevice::RAM;
// This is appropriate for: TOS 1.x, no cartridge.
for(int c = 0xf0; c < 0xfc; ++c) memory_map_[c] = BusDevice::Unassigned;
for(int c = 0xfc; c < 0xff; ++c) memory_map_[c] = BusDevice::ROM;
memory_map_[0xfa] = memory_map_[0xfb] = BusDevice::Cartridge;
memory_map_[0xff] = BusDevice::IO;
} }
// MARK: CRTMachine::Machine // MARK: CRTMachine::Machine
@ -69,22 +80,49 @@ class ConcreteMachine:
// A null cycle leaves nothing else to do. // A null cycle leaves nothing else to do.
if(!(cycle.operation & (Microcycle::NewAddress | Microcycle::SameAddress))) return HalfCycles(0); if(!(cycle.operation & (Microcycle::NewAddress | Microcycle::SameAddress))) return HalfCycles(0);
/* TODO: DTack, bus error, VPA. */
auto address = cycle.word_address(); auto address = cycle.word_address();
uint16_t *memory; uint16_t *memory;
if(address < 4) { switch(memory_map_[address >> 15]) {
memory = rom_.data(); case BusDevice::MostlyRAM:
} else if(address < 0x700000) { if(address < 4) {
memory = ram_.data(); memory = rom_.data();
address &= ram_.size() - 1; break;
// TODO: align with the next access window. }
} else if(address < 0x780000) { // TOS 2.0+ address case BusDevice::RAM:
memory = rom_.data(); memory = ram_.data();
address &= rom_.size() - 1; address &= ram_.size() - 1;
} else if(address >= 0x7e0000 && address < 0x7f8000) { // TOS 1.0 address // TODO: align with the next access window.
memory = rom_.data(); break;
address &= rom_.size() - 1;
} else { case BusDevice::ROM:
assert(false); memory = rom_.data();
address %= rom_.size();
break;
case BusDevice::Cartridge:
/*
TOS 1.0 appears to attempt to read from the catridge before it has setup
the bus error vector. Therefore I assume no bus error flows.
*/
switch(cycle.operation & (Microcycle::SelectWord | Microcycle::SelectByte | Microcycle::Read)) {
default: break;
case Microcycle::SelectWord | Microcycle::Read:
*cycle.value = 0xffff;
break;
case Microcycle::SelectByte | Microcycle::Read:
cycle.value->halves.low = 0xff;
break;
}
return HalfCycles(0);
case BusDevice::Unassigned:
return HalfCycles(0);
case BusDevice::IO:
assert(false);
break;
} }
// If control has fallen through to here, the access is either a read from ROM, or a read or write to RAM. // If control has fallen through to here, the access is either a read from ROM, or a read or write to RAM.
@ -119,6 +157,10 @@ class ConcreteMachine:
std::vector<uint16_t> ram_; std::vector<uint16_t> ram_;
std::vector<uint16_t> rom_; std::vector<uint16_t> rom_;
enum class BusDevice {
MostlyRAM, RAM, ROM, Cartridge, IO, Unassigned
};
BusDevice memory_map_[256];
}; };
} }