6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-25 18:30:07 +00:00
Code Issues Projects Releases Wiki Activity

Reduce nesting.

Browse Source
This commit is contained in:
Thomas Harte 2021-07-06 22:32:59 -04:00
parent 55af8fa5d9
commit 16bd826491
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Machines/Enterprise/Enterprise.cpp
View File

@ -276,16 +276,14 @@ template <bool has_disk_controller> class ConcreteMachine:
}
break;
case PartialMachineCycle::ReadOpcodeStart:
if(!is_video_[address >> 14]) {
if(wait_mode_ != WaitMode::None) {
penalty = dave_delay_;
}
} else {
if(is_video_[address >> 14]) {
// Query Nick for the amount of delay that would occur with one cycle left
// in this read opcode.
const auto delay_time = nick_.time_since_flush(HalfCycles(2));
const auto delay = nick_.last_valid()->get_time_until_z80_slot(delay_time);
penalty = nick_.back_map(delay, delay_time);
} else if(wait_mode_ != WaitMode::None) {
penalty = dave_delay_;
}
break;
@ -520,6 +518,10 @@ template <bool has_disk_controller> class ConcreteMachine:
case PartialMachineCycle::ReadOpcode:
if(read_pointers_[address >> 14]) {
*cycle.value = read_pointers_[address >> 14][address];
// if(cycle.operation == PartialMachineCycle::ReadOpcode && address == 0xc728) {
// printf("");
// }
} else {
*cycle.value = 0xff;
}