diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp index a253fbed7..08a973fff 100644 --- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp +++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp @@ -10,6 +10,8 @@ #include "../../MachineTypes.hpp" +#include "../../../Processors/Z80/Z80.hpp" + #include "../../../Analyser/Static/ZXSpectrum/Target.hpp" #include @@ -24,11 +26,13 @@ namespace ZXSpectrum { using Model = Analyser::Static::ZXSpectrum::Target::Model; template class ConcreteMachine: + public Machine, public MachineTypes::ScanProducer, public MachineTypes::TimedMachine, - public Machine { + public CPU::Z80::BusHandler { public: - ConcreteMachine(const Analyser::Static::ZXSpectrum::Target &target, const ROMMachine::ROMFetcher &rom_fetcher) + ConcreteMachine(const Analyser::Static::ZXSpectrum::Target &target, const ROMMachine::ROMFetcher &rom_fetcher) : + z80_(*this) { set_clock_rate(ClockRate); @@ -39,15 +43,17 @@ template class ConcreteMachine: if(!roms[0]) throw ROMMachine::Error::MissingROMs; memcpy(rom_.data(), roms[0]->data(), std::min(rom_.size(), roms[0]->size())); - // TODO: insert media, set up memory map. + // Set up initial memory map. + update_memory_map(); + + // TODO: insert media. (void)target; } // MARK: - TimedMachine void run_for(const Cycles cycles) override { - // TODO. - (void)cycles; + z80_.run_for(cycles); } // MARK: - ScanProducer @@ -61,9 +67,92 @@ template class ConcreteMachine: return Outputs::Display::ScanStatus(); } + // MARK: - BusHandler + + forceinline HalfCycles perform_machine_cycle(const CPU::Z80::PartialMachineCycle &cycle) { + (void)cycle; + + return HalfCycles(0); + } + private: + CPU::Z80::Processor z80_; + + // MARK: - Memory. std::array rom_; std::array ram_; + + std::array scratch_; + const uint8_t *read_pointers_[4]; + uint8_t *write_pointers_[4]; + + uint8_t port1ffd_ = 0; + uint8_t port7ffd_ = 0; + bool disable_paging_ = false; + + void update_memory_map() { + if(disable_paging_) { + // Set 48kb-esque memory map. + set_memory(0, rom_.data(), nullptr); + set_memory(1, &ram_[5 * 16384], &ram_[5 * 16384]); + set_memory(2, &ram_[2 * 16384], &ram_[2 * 16384]); + set_memory(3, &ram_[0 * 16384], &ram_[0 * 16384]); + return; + } + + if(port1ffd_ & 1) { + // "Special paging mode", i.e. one of four fixed + // RAM configurations, port 7ffd doesn't matter. + + switch(port1ffd_ & 0x6) { + default: + case 0x00: + set_memory(0, &ram_[0 * 16384], &ram_[0 * 16384]); + set_memory(1, &ram_[1 * 16384], &ram_[1 * 16384]); + set_memory(2, &ram_[2 * 16384], &ram_[2 * 16384]); + set_memory(3, &ram_[3 * 16384], &ram_[3 * 16384]); + break; + + case 0x02: + set_memory(0, &ram_[4 * 16384], &ram_[4 * 16384]); + set_memory(1, &ram_[5 * 16384], &ram_[5 * 16384]); + set_memory(2, &ram_[6 * 16384], &ram_[6 * 16384]); + set_memory(3, &ram_[7 * 16384], &ram_[7 * 16384]); + break; + + case 0x04: + set_memory(0, &ram_[4 * 16384], &ram_[4 * 16384]); + set_memory(1, &ram_[5 * 16384], &ram_[5 * 16384]); + set_memory(2, &ram_[6 * 16384], &ram_[6 * 16384]); + set_memory(3, &ram_[3 * 16384], &ram_[3 * 16384]); + break; + + case 0x06: + set_memory(0, &ram_[4 * 16384], &ram_[4 * 16384]); + set_memory(1, &ram_[7 * 16384], &ram_[7 * 16384]); + set_memory(2, &ram_[6 * 16384], &ram_[6 * 16384]); + set_memory(3, &ram_[3 * 16384], &ram_[3 * 16384]); + break; + } + + return; + } + + // Apply standard 128kb-esque mapping (albeit with extra ROM to pick from). + const auto rom = &rom_[ (((port1ffd_ >> 1) & 2) | ((port7ffd_ >> 4) & 1)) * 16384]; + set_memory(0, rom, nullptr); + + set_memory(1, &ram_[5 * 16384], &ram_[5 * 16384]); + set_memory(2, &ram_[2 * 16384], &ram_[2 * 16384]); + + const auto high_ram = &ram_[(port7ffd_ & 7) * 16384]; + set_memory(3, high_ram, high_ram); + } + + void set_memory(int bank, const uint8_t *read, uint8_t *write) { + read_pointers_[bank] = read - bank*16384; + write_pointers_[bank] = (write ? write : scratch_.data()) - bank*16384; + } };