1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-01 10:05:55 +00:00

Tests having been fixed by instating proper Z80 cycle counting, removed caveman logging.

This commit is contained in:
Thomas Harte 2017-05-31 19:58:57 -04:00
parent b99e4210ba
commit 494ce073b5
2 changed files with 4 additions and 4 deletions

View File

@ -170,7 +170,7 @@ class FUSETests: XCTestCase {
// if name != "02" { // if name != "02" {
// continue; // continue;
// } // }
print("\(name)") // print("\(name)")
let initialState = RegisterState(dictionary: itemDictionary["state"] as! [String: Any]) let initialState = RegisterState(dictionary: itemDictionary["state"] as! [String: Any])
let targetState = RegisterState(dictionary: outputDictionary["state"] as! [String: Any]) let targetState = RegisterState(dictionary: outputDictionary["state"] as! [String: Any])

View File

@ -20,14 +20,14 @@ class ConcreteAllRAMProcessor: public AllRAMProcessor, public Processor<Concrete
uint16_t address = cycle.address ? *cycle.address : 0x0000; uint16_t address = cycle.address ? *cycle.address : 0x0000;
switch(cycle.operation) { switch(cycle.operation) {
case BusOperation::ReadOpcode: case BusOperation::ReadOpcode:
printf("! "); // printf("! ");
check_address_for_trap(address); check_address_for_trap(address);
case BusOperation::Read: case BusOperation::Read:
printf("r %04x [%02x] AF:%04x BC:%04x DE:%04x HL:%04x SP:%04x\n", address, memory_[address], get_value_of_register(CPU::Z80::Register::AF), get_value_of_register(CPU::Z80::Register::BC), get_value_of_register(CPU::Z80::Register::DE), get_value_of_register(CPU::Z80::Register::HL), get_value_of_register(CPU::Z80::Register::StackPointer)); // printf("r %04x [%02x] AF:%04x BC:%04x DE:%04x HL:%04x SP:%04x\n", address, memory_[address], get_value_of_register(CPU::Z80::Register::AF), get_value_of_register(CPU::Z80::Register::BC), get_value_of_register(CPU::Z80::Register::DE), get_value_of_register(CPU::Z80::Register::HL), get_value_of_register(CPU::Z80::Register::StackPointer));
*cycle.value = memory_[address]; *cycle.value = memory_[address];
break; break;
case BusOperation::Write: case BusOperation::Write:
printf("w %04x\n", address); // printf("w %04x\n", address);
memory_[address] = *cycle.value; memory_[address] = *cycle.value;
break; break;