Get the 6502 tests running again.

Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2017-10-28 13:06:56 +01:00
parent b232e6992c
commit 0d3776d3ec
3 changed files with 3 additions and 4 deletions

View File

@ -11,7 +11,6 @@
#include "Disassembly.h" #include "Disassembly.h"
#include "Symbols.h" #include "Symbols.h"
#include "AddressEventArgs.h"
#include "ProfileLineEventArgs.h" #include "ProfileLineEventArgs.h"
#include "ProfileScopeEventArgs.h" #include "ProfileScopeEventArgs.h"

View File

@ -52,7 +52,7 @@ void Board::initialise() {
} }
if (m_configuration.allowInput()) { 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)); 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"; 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 (address == m_configuration.getInputAddress()) {
if (DATA() != 0) { if (DATA() != 0) {
assert(address == ADDRESS().word); assert(address == ADDRESS().word);

View File

@ -45,7 +45,7 @@ private:
void Cpu_ExecutedInstruction_StopLoop(const EightBit::MOS6502& cpu); 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 Memory_WrittenByte_Output(uint16_t address);
void Cpu_ExecutedInstruction_Poll(const EightBit::MOS6502& cpu); void Cpu_ExecutedInstruction_Poll(const EightBit::MOS6502& cpu);