6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Adds missing 6560 update hooks.

Browse Source
This commit is contained in:
Thomas Harte 2018-03-29 20:49:36 -04:00
parent e1aa3e5a7f
commit 286259c83b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Machines/Commodore/Vic-20/Vic20.cpp
View File

@ -528,7 +528,10 @@ class ConcreteMachine:
if(isReadOperation(operation)) { if(isReadOperation(operation)) {
uint8_t result = processor_read_memory_map_[address >> 10] ? processor_read_memory_map_[address >> 10][address & 0x3ff] : 0xff; uint8_t result = processor_read_memory_map_[address >> 10] ? processor_read_memory_map_[address >> 10][address & 0x3ff] : 0xff;
if((address&0xfc00) == 0x9000) { if((address&0xfc00) == 0x9000) {
if((address&0xff00) == 0x9000) result &= mos6560_->get_register(address); if((address&0xff00) == 0x9000) {
update_video();
result &= mos6560_->get_register(address);
}
if((address&0xfc10) == 0x9010) result &= user_port_via_.get_register(address); if((address&0xfc10) == 0x9010) result &= user_port_via_.get_register(address);
if((address&0xfc20) == 0x9020) result &= keyboard_via_.get_register(address); if((address&0xfc20) == 0x9020) result &= keyboard_via_.get_register(address);
} }
@ -595,12 +598,16 @@ class ConcreteMachine:
} }
} }
} else { } else {
mos6560_->run_for(cycles_since_mos6560_update_.flush());
uint8_t *ram = processor_write_memory_map_[address >> 10]; uint8_t *ram = processor_write_memory_map_[address >> 10];
if(ram) ram[address & 0x3ff] = *value; if(ram) {
update_video();
ram[address & 0x3ff] = *value;
}
if((address&0xfc00) == 0x9000) { if((address&0xfc00) == 0x9000) {
if((address&0xff00) == 0x9000) mos6560_->set_register(address, *value); if((address&0xff00) == 0x9000) {
update_video();
mos6560_->set_register(address, *value);
}
if((address&0xfc10) == 0x9010) user_port_via_.set_register(address, *value); if((address&0xfc10) == 0x9010) user_port_via_.set_register(address, *value);
if((address&0xfc20) == 0x9020) keyboard_via_.set_register(address, *value); if((address&0xfc20) == 0x9020) keyboard_via_.set_register(address, *value);
} }
@ -621,7 +628,7 @@ class ConcreteMachine:
} }
void flush() { void flush() {
mos6560_->run_for(cycles_since_mos6560_update_.flush()); update_video();
mos6560_->flush(); mos6560_->flush();
} }
@ -697,6 +704,9 @@ class ConcreteMachine:
} }
private: private:
void update_video() {
mos6560_->run_for(cycles_since_mos6560_update_.flush());
}
Analyser::Static::Commodore::Target commodore_target_; Analyser::Static::Commodore::Target commodore_target_;
CPU::MOS6502::Processor<ConcreteMachine, false> m6502_; CPU::MOS6502::Processor<ConcreteMachine, false> m6502_;