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

Fixes: switched ZX80 and ZX81 timing to the correct way around, ensured that my wait takes effect if HALT **isn't** set, and made sure to recover from it.

Browse Source
This commit is contained in:
Thomas Harte 2017-06-13 21:48:17 -04:00
parent 76a64d13a0
commit d8e3103a2b
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/ZX8081/ZX8081.cpp
View File

@ -38,12 +38,12 @@ int Machine::perform_machine_cycle(const CPU::Z80::MachineCycle &cycle) {
set_hsync(true); set_hsync(true);
if(nmi_is_enabled_) { if(nmi_is_enabled_) {
set_non_maskable_interrupt_line(true); set_non_maskable_interrupt_line(true);
if(get_halt_line()) { if(!get_halt_line()) {
wait_cycles = vsync_start_cycle_ - horizontal_counter_; wait_cycles = vsync_end_cycle_ - horizontal_counter_;
} }
} }
video_->run_for_cycles(horizontal_counter_ - vsync_start_cycle_ + wait_cycles); video_->run_for_cycles(horizontal_counter_ - vsync_start_cycle_ + wait_cycles);
} else if(previous_counter < vsync_end_cycle_ && horizontal_counter_ >= vsync_end_cycle_) { } else if(previous_counter <= vsync_end_cycle_ && horizontal_counter_ > vsync_end_cycle_) {
video_->run_for_cycles(vsync_end_cycle_ - previous_counter); video_->run_for_cycles(vsync_end_cycle_ - previous_counter);
set_hsync(false); set_hsync(false);
if(nmi_is_enabled_) set_non_maskable_interrupt_line(false); if(nmi_is_enabled_) set_non_maskable_interrupt_line(false);
@ -180,12 +180,14 @@ void Machine::configure_as_target(const StaticAnalyser::Target &target) {
tape_return_address_ = 0x380; tape_return_address_ = 0x380;
vsync_start_cycle_ = 13; vsync_start_cycle_ = 13;
vsync_end_cycle_ = 33; vsync_end_cycle_ = 33;
vsync_start_cycle_ = 16;
vsync_end_cycle_ = 32;
} else { } else {
rom_ = zx80_rom_; rom_ = zx80_rom_;
tape_trap_address_ = 0x220; tape_trap_address_ = 0x220;
tape_return_address_ = 0x248; tape_return_address_ = 0x248;
vsync_start_cycle_ = 16; vsync_start_cycle_ = 13;
vsync_end_cycle_ = 32; vsync_end_cycle_ = 33;
} }
rom_mask_ = (uint16_t)(rom_.size() - 1); rom_mask_ = (uint16_t)(rom_.size() - 1);