6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-07-26 04:24:18 +00:00
Code Issues Projects Releases Wiki Activity

Simplified decoding logic.

Browse Source
This commit is contained in:
Thomas Harte
2017-06-14 22:24:44 -04:00
parent d8e3103a2b
commit 9b3d05e05f
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Machines/ZX8081/ZX8081.cpp
View File

@@ -64,11 +64,8 @@ int Machine::perform_machine_cycle(const CPU::Z80::MachineCycle &cycle) {
set_vsync(false); set_vsync(false);
line_counter_ = 0; line_counter_ = 0;
switch(address & 7) { if(!(address & 2)) nmi_is_enabled_ = false;
default: break; if(!(address & 1)) nmi_is_enabled_ = is_zx81_;
case 0x5: nmi_is_enabled_ = false; break;
case 0x6: nmi_is_enabled_ = is_zx81_; break;
}
break; break;
case CPU::Z80::BusOperation::Input: { case CPU::Z80::BusOperation::Input: {
@@ -103,7 +100,7 @@ int Machine::perform_machine_cycle(const CPU::Z80::MachineCycle &cycle) {
set_interrupt_line(false); set_interrupt_line(false);
// Check for use of the fast tape hack. // Check for use of the fast tape hack.
if(address == tape_trap_address_) { // TODO: && fast_tape_hack_enabled_ /* if(address == tape_trap_address_) { // TODO: && fast_tape_hack_enabled_
int next_byte = parser_.get_next_byte(tape_player_.get_tape()); int next_byte = parser_.get_next_byte(tape_player_.get_tape());
if(next_byte != -1) { if(next_byte != -1) {
uint16_t hl = get_value_of_register(CPU::Z80::Register::HL); uint16_t hl = get_value_of_register(CPU::Z80::Register::HL);
@@ -112,7 +109,7 @@ int Machine::perform_machine_cycle(const CPU::Z80::MachineCycle &cycle) {
set_value_of_register(CPU::Z80::Register::ProgramCounter, tape_return_address_ - 1); set_value_of_register(CPU::Z80::Register::ProgramCounter, tape_return_address_ - 1);
return 0; return 0;
} }
} }*/
case CPU::Z80::BusOperation::Read: case CPU::Z80::BusOperation::Read:
if(address < ram_base_) { if(address < ram_base_) {