From ebce9a2e51e7aa1ffb92c864e7ce53b2a0bf94aa Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 6 Aug 2018 21:15:13 -0400 Subject: [PATCH] Fixes test target. --- OSBindings/Mac/Clock SignalTests/Bridges/C1540Bridge.mm | 4 ++-- .../Mac/Clock SignalTests/Bridges/TestMachine6502.mm | 4 ++-- Processors/6502/AllRAM/6502AllRAM.cpp | 8 ++++---- Processors/6502/AllRAM/6502AllRAM.hpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/Bridges/C1540Bridge.mm b/OSBindings/Mac/Clock SignalTests/Bridges/C1540Bridge.mm index 1aa3829d1..21c9da14e 100644 --- a/OSBindings/Mac/Clock SignalTests/Bridges/C1540Bridge.mm +++ b/OSBindings/Mac/Clock SignalTests/Bridges/C1540Bridge.mm @@ -32,8 +32,8 @@ class VanillaSerialPort: public Commodore::Serial::Port { _serialBus.reset(new ::Commodore::Serial::Bus); _serialPort.reset(new VanillaSerialPort); - _c1540.reset(new Commodore::C1540::Machine(Commodore::C1540::Machine::C1540)); - _c1540->set_rom_fetcher(CSROMFetcher()); + auto rom_fetcher = CSROMFetcher(); + _c1540.reset(new Commodore::C1540::Machine(Commodore::C1540::Personality::C1540, rom_fetcher)); _c1540->set_serial_bus(_serialBus); Commodore::Serial::AttachPortAndBus(_serialPort, _serialBus); } diff --git a/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm b/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm index e4bbe2499..7477a0370 100644 --- a/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm +++ b/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm @@ -8,7 +8,7 @@ #import "TestMachine6502.h" #include -#include "6502AllRAM.hpp" +#include "../../../../Processors/6502/AllRAM/6502AllRAM.hpp" #import "TestMachine+ForSubclassEyesOnly.h" const uint8_t CSTestMachine6502JamOpcode = CPU::MOS6502::JamOpcode; @@ -39,7 +39,7 @@ static CPU::MOS6502::Register registerForRegister(CSTestMachine6502Register reg) self = [super init]; if(self) { - _processor = CPU::MOS6502::AllRAMProcessor::Processor(); + _processor = CPU::MOS6502::AllRAMProcessor::Processor(CPU::MOS6502::Personality::P6502); } return self; diff --git a/Processors/6502/AllRAM/6502AllRAM.cpp b/Processors/6502/AllRAM/6502AllRAM.cpp index 8c9424576..a8c0f8a6b 100644 --- a/Processors/6502/AllRAM/6502AllRAM.cpp +++ b/Processors/6502/AllRAM/6502AllRAM.cpp @@ -17,8 +17,8 @@ namespace { class ConcreteAllRAMProcessor: public AllRAMProcessor, public BusHandler { public: - ConcreteAllRAMProcessor() : - mos6502_(*this) { + ConcreteAllRAMProcessor(Personality personality) : + mos6502_(personality, *this) { mos6502_.set_power_on(false); } @@ -68,6 +68,6 @@ class ConcreteAllRAMProcessor: public AllRAMProcessor, public BusHandler { } -AllRAMProcessor *AllRAMProcessor::Processor() { - return new ConcreteAllRAMProcessor; +AllRAMProcessor *AllRAMProcessor::Processor(Personality personality) { + return new ConcreteAllRAMProcessor(personality); } diff --git a/Processors/6502/AllRAM/6502AllRAM.hpp b/Processors/6502/AllRAM/6502AllRAM.hpp index 617edac36..41dc61245 100644 --- a/Processors/6502/AllRAM/6502AllRAM.hpp +++ b/Processors/6502/AllRAM/6502AllRAM.hpp @@ -19,7 +19,7 @@ class AllRAMProcessor: public ::CPU::AllRAMProcessor { public: - static AllRAMProcessor *Processor(); + static AllRAMProcessor *Processor(Personality personality); virtual ~AllRAMProcessor() {} virtual void run_for(const Cycles cycles) = 0;