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

Adds clocking observers for the tape and FDC.

Browse Source
This commit is contained in:
Thomas Harte 2021-03-23 16:38:04 -04:00
parent 465c74ab86
commit 496a294c71
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
View File

@ -51,6 +51,7 @@ using CharacterMapper = Sinclair::ZX::Keyboard::CharacterMapper;
template<Model model> class ConcreteMachine: template<Model model> class ConcreteMachine:
public Activity::Source, public Activity::Source,
public ClockingHint::Observer,
public Configurable::Device, public Configurable::Device,
public CPU::Z80::BusHandler, public CPU::Z80::BusHandler,
public Machine, public Machine,
@ -83,6 +84,10 @@ template<Model model> class ConcreteMachine:
if(!roms[0]) throw ROMMachine::Error::MissingROMs; if(!roms[0]) throw ROMMachine::Error::MissingROMs;
memcpy(rom_.data(), roms[0]->data(), std::min(rom_.size(), roms[0]->size())); memcpy(rom_.data(), roms[0]->data(), std::min(rom_.size(), roms[0]->size()));
// Register for sleeping notifications.
fdc_->set_clocking_hint_observer(this);
tape_player_.set_clocking_hint_observer(this);
// Set up initial memory map. // Set up initial memory map.
update_memory_map(); update_memory_map();
set_video_address(); set_video_address();
@ -134,7 +139,7 @@ template<Model model> class ConcreteMachine:
return Plus3ClockRate; return Plus3ClockRate;
} }
// MARK: - TimedMachine // MARK: - TimedMachine.
void run_for(const Cycles cycles) override { void run_for(const Cycles cycles) override {
z80_.run_for(cycles); z80_.run_for(cycles);
@ -161,7 +166,7 @@ template<Model model> class ConcreteMachine:
} }
} }
// MARK: - ScanProducer // MARK: - ScanProducer.
void set_scan_target(Outputs::Display::ScanTarget *scan_target) override { void set_scan_target(Outputs::Display::ScanTarget *scan_target) override {
video_->set_scan_target(scan_target); video_->set_scan_target(scan_target);
@ -175,7 +180,7 @@ template<Model model> class ConcreteMachine:
video_->set_display_type(display_type); video_->set_display_type(display_type);
} }
// MARK: - BusHandler // MARK: - BusHandler.
forceinline HalfCycles perform_machine_cycle(const CPU::Z80::PartialMachineCycle &cycle) { forceinline HalfCycles perform_machine_cycle(const CPU::Z80::PartialMachineCycle &cycle) {
using PartialMachineCycle = CPU::Z80::PartialMachineCycle; using PartialMachineCycle = CPU::Z80::PartialMachineCycle;
@ -348,8 +353,7 @@ template<Model model> class ConcreteMachine:
z80_.set_interrupt_line(video_.last_valid()->get_interrupt_line()); z80_.set_interrupt_line(video_.last_valid()->get_interrupt_line());
} }
// TODO: sleeping support here. if(!tape_player_is_sleeping_) tape_player_.run_for(duration.as_integral());
tape_player_.run_for(duration.as_integral());
// Update automatic tape motor control, if enabled; if it's been // Update automatic tape motor control, if enabled; if it's been
// 3 seconds since software last possibly polled the tape, stop it. // 3 seconds since software last possibly polled the tape, stop it.
@ -363,7 +367,7 @@ template<Model model> class ConcreteMachine:
} }
if constexpr (model == Model::Plus3) { if constexpr (model == Model::Plus3) {
fdc_ += Cycles(duration.as_integral()); if(!fdc_is_sleeping_) fdc_ += Cycles(duration.as_integral());
} }
if(typer_) typer_->run_for(duration); if(typer_) typer_->run_for(duration);
@ -379,7 +383,7 @@ template<Model model> class ConcreteMachine:
public: public:
// MARK: - Typer // MARK: - Typer.
HalfCycles get_typer_delay(const std::string &) const override { HalfCycles get_typer_delay(const std::string &) const override {
return z80_.get_is_resetting() ? Cycles(7'000'000) : Cycles(0); return z80_.get_is_resetting() ? Cycles(7'000'000) : Cycles(0);
} }
@ -392,7 +396,7 @@ template<Model model> class ConcreteMachine:
return &keyboard_mapper_; return &keyboard_mapper_;
} }
// MARK: - Keyboard // MARK: - Keyboard.
void set_key_state(uint16_t key, bool is_pressed) override { void set_key_state(uint16_t key, bool is_pressed) override {
keyboard_.set_key_state(key, is_pressed); keyboard_.set_key_state(key, is_pressed);
} }
@ -424,7 +428,14 @@ template<Model model> class ConcreteMachine:
return !media.tapes.empty() || (!media.disks.empty() && model == Model::Plus3); return !media.tapes.empty() || (!media.disks.empty() && model == Model::Plus3);
} }
// MARK: - Tape control // MARK: - ClockingHint::Observer.
void set_component_prefers_clocking(ClockingHint::Source *, ClockingHint::Preference) override {
fdc_is_sleeping_ = fdc_.last_valid()->preferred_clocking() == ClockingHint::Preference::None;
tape_player_is_sleeping_ = tape_player_.preferred_clocking() == ClockingHint::Preference::None;
}
// MARK: - Tape control.
void set_use_automatic_tape_motor_control(bool enabled) { void set_use_automatic_tape_motor_control(bool enabled) {
use_automatic_tape_motor_control_ = enabled; use_automatic_tape_motor_control_ = enabled;
@ -464,7 +475,7 @@ template<Model model> class ConcreteMachine:
return &speaker_; return &speaker_;
} }
// MARK: - Activity Source // MARK: - Activity Source.
void set_activity_observer(Activity::Observer *observer) override { void set_activity_observer(Activity::Observer *observer) override {
if constexpr (model == Model::Plus3) fdc_->set_activity_observer(observer); if constexpr (model == Model::Plus3) fdc_->set_activity_observer(observer);
tape_player_.set_activity_observer(observer); tape_player_.set_activity_observer(observer);
@ -583,6 +594,7 @@ template<Model model> class ConcreteMachine:
// MARK: - Tape. // MARK: - Tape.
Storage::Tape::BinaryTapePlayer tape_player_; Storage::Tape::BinaryTapePlayer tape_player_;
bool tape_player_is_sleeping_ = false;
bool use_automatic_tape_motor_control_ = true; bool use_automatic_tape_motor_control_ = true;
HalfCycles cycles_since_tape_input_read_; HalfCycles cycles_since_tape_input_read_;
@ -637,6 +649,7 @@ template<Model model> class ConcreteMachine:
// MARK: - Disc. // MARK: - Disc.
JustInTimeActor<Amstrad::FDC, 1, 1, Cycles> fdc_; JustInTimeActor<Amstrad::FDC, 1, 1, Cycles> fdc_;
bool fdc_is_sleeping_ = false;
// MARK: - Automatic startup. // MARK: - Automatic startup.
Cycles duration_to_press_enter_; Cycles duration_to_press_enter_;