From 0d3776d3ecd07906362998592ba1f7736ba2de94 Mon Sep 17 00:00:00 2001 From: Adrian Conlon Date: Sat, 28 Oct 2017 13:06:56 +0100 Subject: [PATCH] Get the 6502 tests running again. Signed-off-by: Adrian Conlon --- M6502/inc/Profiler.h | 1 - M6502/test_M6502/Board.cpp | 4 ++-- M6502/test_M6502/Board.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/M6502/inc/Profiler.h b/M6502/inc/Profiler.h index c689b4f..12739e6 100644 --- a/M6502/inc/Profiler.h +++ b/M6502/inc/Profiler.h @@ -11,7 +11,6 @@ #include "Disassembly.h" #include "Symbols.h" -#include "AddressEventArgs.h" #include "ProfileLineEventArgs.h" #include "ProfileScopeEventArgs.h" diff --git a/M6502/test_M6502/Board.cpp b/M6502/test_M6502/Board.cpp index 6525ef8..95e1da4 100644 --- a/M6502/test_M6502/Board.cpp +++ b/M6502/test_M6502/Board.cpp @@ -52,7 +52,7 @@ void Board::initialise() { } if (m_configuration.allowInput()) { - ReadByte.connect(std::bind(&Board::Memory_ReadByte_Input, this, std::placeholders::_1)); + ReadingByte.connect(std::bind(&Board::Memory_ReadingByte_Input, this, std::placeholders::_1)); m_cpu.ExecutedInstruction.connect(std::bind(&Board::Cpu_ExecutedInstruction_Poll, this, std::placeholders::_1)); } @@ -105,7 +105,7 @@ void Board::Cpu_ExecutingInstruction_Debug(const EightBit::MOS6502& cpu) { std::cout << "\n"; } -void Board::Memory_ReadByte_Input(const uint16_t address) { +void Board::Memory_ReadingByte_Input(const uint16_t address) { if (address == m_configuration.getInputAddress()) { if (DATA() != 0) { assert(address == ADDRESS().word); diff --git a/M6502/test_M6502/Board.h b/M6502/test_M6502/Board.h index 0c24076..b7d676e 100644 --- a/M6502/test_M6502/Board.h +++ b/M6502/test_M6502/Board.h @@ -45,7 +45,7 @@ private: void Cpu_ExecutedInstruction_StopLoop(const EightBit::MOS6502& cpu); - void Memory_ReadByte_Input(uint16_t address); + void Memory_ReadingByte_Input(uint16_t address); void Memory_WrittenByte_Output(uint16_t address); void Cpu_ExecutedInstruction_Poll(const EightBit::MOS6502& cpu);