6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-14 23:27:26 +00:00
Code Issues Projects Releases Wiki Activity

Fixes test target.

Browse Source
This commit is contained in:
Thomas Harte
2018-08-06 21:15:13 -04:00
parent 633af4d404
commit ebce9a2e51
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OSBindings/Mac/Clock SignalTests/Bridges/C1540Bridge.mm
View File

@@ -32,8 +32,8 @@ class VanillaSerialPort: public Commodore::Serial::Port {
_serialBus.reset(new ::Commodore::Serial::Bus); _serialBus.reset(new ::Commodore::Serial::Bus);
_serialPort.reset(new VanillaSerialPort); _serialPort.reset(new VanillaSerialPort);
_c1540.reset(new Commodore::C1540::Machine(Commodore::C1540::Machine::C1540)); auto rom_fetcher = CSROMFetcher();
_c1540->set_rom_fetcher(CSROMFetcher()); _c1540.reset(new Commodore::C1540::Machine(Commodore::C1540::Personality::C1540, rom_fetcher));
_c1540->set_serial_bus(_serialBus); _c1540->set_serial_bus(_serialBus);
Commodore::Serial::AttachPortAndBus(_serialPort, _serialBus); Commodore::Serial::AttachPortAndBus(_serialPort, _serialBus);
} }

4
OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm
View File

@@ -8,7 +8,7 @@
#import "TestMachine6502.h" #import "TestMachine6502.h"
#include <stdint.h> #include <stdint.h>
#include "6502AllRAM.hpp" #include "../../../../Processors/6502/AllRAM/6502AllRAM.hpp"
#import "TestMachine+ForSubclassEyesOnly.h" #import "TestMachine+ForSubclassEyesOnly.h"
const uint8_t CSTestMachine6502JamOpcode = CPU::MOS6502::JamOpcode; const uint8_t CSTestMachine6502JamOpcode = CPU::MOS6502::JamOpcode;
@@ -39,7 +39,7 @@ static CPU::MOS6502::Register registerForRegister(CSTestMachine6502Register reg)
self = [super init]; self = [super init];
if(self) { if(self) {
_processor = CPU::MOS6502::AllRAMProcessor::Processor(); _processor = CPU::MOS6502::AllRAMProcessor::Processor(CPU::MOS6502::Personality::P6502);
} }
return self; return self;

8
Processors/6502/AllRAM/6502AllRAM.cpp
View File

@@ -17,8 +17,8 @@ namespace {
class ConcreteAllRAMProcessor: public AllRAMProcessor, public BusHandler { class ConcreteAllRAMProcessor: public AllRAMProcessor, public BusHandler {
public: public:
ConcreteAllRAMProcessor() : ConcreteAllRAMProcessor(Personality personality) :
mos6502_(*this) { mos6502_(personality, *this) {
mos6502_.set_power_on(false); mos6502_.set_power_on(false);
} }
@@ -68,6 +68,6 @@ class ConcreteAllRAMProcessor: public AllRAMProcessor, public BusHandler {
} }
AllRAMProcessor *AllRAMProcessor::Processor() { AllRAMProcessor *AllRAMProcessor::Processor(Personality personality) {
return new ConcreteAllRAMProcessor; return new ConcreteAllRAMProcessor(personality);
} }

2
Processors/6502/AllRAM/6502AllRAM.hpp
View File

@@ -19,7 +19,7 @@ class AllRAMProcessor:
public ::CPU::AllRAMProcessor { public ::CPU::AllRAMProcessor {
public: public:
static AllRAMProcessor *Processor(); static AllRAMProcessor *Processor(Personality personality);
virtual ~AllRAMProcessor() {} virtual ~AllRAMProcessor() {}
virtual void run_for(const Cycles cycles) = 0; virtual void run_for(const Cycles cycles) = 0;