1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00

[Re]discovered that sync may also be a product of the interrupt cycle. So started looking into that.

This commit is contained in:
Thomas Harte 2017-06-04 21:54:55 -04:00
parent 7f743c6fb0
commit 7e3a46c33e
2 changed files with 22 additions and 10 deletions

View File

@ -11,7 +11,8 @@
using namespace ZX8081; using namespace ZX8081;
Machine::Machine() : Machine::Machine() :
vertical_sync_(false), vsync_(false),
hsync_(false),
ram_(65536) { ram_(65536) {
// run at 3.25 Mhz // run at 3.25 Mhz
set_clock_rate(3250000); set_clock_rate(3250000);
@ -23,24 +24,26 @@ int Machine::perform_machine_cycle(const CPU::Z80::MachineCycle &cycle) {
uint8_t r; uint8_t r;
switch(cycle.operation) { switch(cycle.operation) {
case CPU::Z80::BusOperation::Output: case CPU::Z80::BusOperation::Output:
if(*cycle.address == 0xff) { if((*cycle.address&0xff) == 0xff) {
update_display(); set_vsync(false);
set_sync(false);
} }
break; break;
case CPU::Z80::BusOperation::Input: case CPU::Z80::BusOperation::Input:
if(*cycle.address == 0xfe) { if((*cycle.address&0xff) == 0xfe) {
update_display(); set_vsync(true);
set_sync(true);
} }
*cycle.value = 0xff;
break; break;
case CPU::Z80::BusOperation::Interrupt: case CPU::Z80::BusOperation::Interrupt:
set_hsync(true);
*cycle.value = 0xff; *cycle.value = 0xff;
break; break;
case CPU::Z80::BusOperation::ReadOpcode: case CPU::Z80::BusOperation::ReadOpcode:
set_hsync(false);
// printf("%04x\n", *cycle.address);
r = (uint8_t)get_value_of_register(CPU::Z80::Register::R); r = (uint8_t)get_value_of_register(CPU::Z80::Register::R);
set_interrupt_line(!(r & 0x40)); set_interrupt_line(!(r & 0x40));
case CPU::Z80::BusOperation::Read: case CPU::Z80::BusOperation::Read:
@ -113,8 +116,16 @@ void Machine::update_display() {
cycles_since_display_update_ = 0; cycles_since_display_update_ = 0;
} }
void Machine::set_sync(bool sync) { void Machine::set_vsync(bool sync) {
if(sync && !vsync_) printf("\n---\n");
vsync_ = sync;
}
void Machine::set_hsync(bool sync) {
if(sync && !hsync_) printf("\n");
hsync_ = sync;
} }
void Machine::output_byte(uint8_t byte) { void Machine::output_byte(uint8_t byte) {
printf("%02x ", byte);
} }

View File

@ -50,11 +50,12 @@ class Machine:
std::vector<uint8_t> zx81_rom_, zx80_rom_, rom_; std::vector<uint8_t> zx81_rom_, zx80_rom_, rom_;
std::vector<uint8_t> ram_; std::vector<uint8_t> ram_;
bool vertical_sync_; bool vsync_, hsync_;
int cycles_since_display_update_; int cycles_since_display_update_;
void update_display(); void update_display();
void set_sync(bool sync); void set_vsync(bool sync);
void set_hsync(bool sync);
void output_byte(uint8_t byte); void output_byte(uint8_t byte);
}; };