From 103c863534d5074637f96f14edbbb9ccc23f705a Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 20 May 2017 23:03:52 -0400 Subject: [PATCH] Through temporarily dramatically increased logging, fixed conditional JP. --- Processors/Z80/Z80.hpp | 2 +- Processors/Z80/Z80AllRAM.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Processors/Z80/Z80.hpp b/Processors/Z80/Z80.hpp index 90412f031..3b56dd5a4 100644 --- a/Processors/Z80/Z80.hpp +++ b/Processors/Z80/Z80.hpp @@ -161,7 +161,7 @@ template class Processor: public MicroOpScheduler { #define PUSH(x) {MicroOp::Decrement16, &sp_.full}, STOREL(x.bytes.high, sp_), {MicroOp::Decrement16, &sp_.full}, STOREL(x.bytes.low, sp_) #define POP(x) FETCHL(x.bytes.low, sp_), {MicroOp::Increment16, &sp_.full}, FETCHL(x.bytes.high, sp_), {MicroOp::Increment16, &sp_.full} -#define JP(cc) Program(FETCH16(temporary_, pc_), {MicroOp::cc}, {MicroOp::Move16, &address_.full, &pc_.full}) +#define JP(cc) Program(FETCH16(address_, pc_), {MicroOp::cc}, {MicroOp::Move16, &address_.full, &pc_.full}) #define LD(a, b) Program({MicroOp::Move8, &b, &a}) #define LD_GROUP(r) \ diff --git a/Processors/Z80/Z80AllRAM.cpp b/Processors/Z80/Z80AllRAM.cpp index d14e6a9b4..ef5b8b3e7 100644 --- a/Processors/Z80/Z80AllRAM.cpp +++ b/Processors/Z80/Z80AllRAM.cpp @@ -19,7 +19,7 @@ int AllRAMProcessor::perform_machine_cycle(const MachineCycle *cycle) { printf("! "); check_address_for_trap(*cycle->address); case BusOperation::Read: - printf("r %04x [%02x]\n", *cycle->address, memory_[*cycle->address]); + printf("r %04x [%02x] AF:%04x BC:%04x DE:%04x HL:%04x SP:%04x\n", *cycle->address, memory_[*cycle->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_[*cycle->address]; break; case BusOperation::Write: