6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-19 23:29:05 +00:00
Code Issues Projects Releases Wiki Activity

Ensures intended no-drive behaviour; no more risks with dangling pointers or nullptr.

Browse Source
This commit is contained in:
Thomas Harte 2020-11-11 17:54:21 -05:00
parent da9e378ab1
commit 6d511f01a4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Components/DiskII/IWM.cpp
View File

@ -263,7 +263,7 @@ void IWM::run_for(const Cycles cycles) {
} break; } break;
case ShiftMode::Writing: case ShiftMode::Writing:
if(drives_[active_drive_]->is_writing()) { if(drives_[active_drive_] && drives_[active_drive_]->is_writing()) {
while(cycles_since_shift_ + integer_cycles >= bit_length_) { while(cycles_since_shift_ + integer_cycles >= bit_length_) {
const auto cycles_until_write = bit_length_ - cycles_since_shift_; const auto cycles_until_write = bit_length_ - cycles_since_shift_;
drives_[active_drive_]->run_for(cycles_until_write); drives_[active_drive_]->run_for(cycles_until_write);
@ -293,11 +293,11 @@ void IWM::run_for(const Cycles cycles) {
} }
cycles_since_shift_ = integer_cycles; cycles_since_shift_ = integer_cycles;
if(integer_cycles) { if(drives_[active_drive_] && integer_cycles) {
drives_[active_drive_]->run_for(cycles_since_shift_); drives_[active_drive_]->run_for(cycles_since_shift_);
} }
} else { } else {
drives_[active_drive_]->run_for(cycles); if(drives_[active_drive_]) drives_[active_drive_]->run_for(cycles);
} }
break; break;
@ -386,16 +386,20 @@ void IWM::propose_shift(uint8_t bit) {
void IWM::set_drive(int slot, IWMDrive *drive) { void IWM::set_drive(int slot, IWMDrive *drive) {
drives_[slot] = drive; drives_[slot] = drive;
drive->set_event_delegate(this); if(drive) {
drive->set_clocking_hint_observer(this); drive->set_event_delegate(this);
drive->set_clocking_hint_observer(this);
} else {
drive_is_rotating_[slot] = false;
}
} }
void IWM::set_component_prefers_clocking(ClockingHint::Source *component, ClockingHint::Preference clocking) { void IWM::set_component_prefers_clocking(ClockingHint::Source *component, ClockingHint::Preference clocking) {
const bool is_rotating = clocking != ClockingHint::Preference::None; const bool is_rotating = clocking != ClockingHint::Preference::None;
if(component == static_cast<ClockingHint::Source *>(drives_[0])) { if(drives_[0] && component == static_cast<ClockingHint::Source *>(drives_[0])) {
drive_is_rotating_[0] = is_rotating; drive_is_rotating_[0] = is_rotating;
} else { } else if(drives_[1] && component == static_cast<ClockingHint::Source *>(drives_[1])) {
drive_is_rotating_[1] = is_rotating; drive_is_rotating_[1] = is_rotating;
} }
} }