From d14902700aeeb8916dec1f99892424ea63a94ad9 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Thu, 1 Jun 2017 22:33:05 -0400 Subject: [PATCH] Minor syntax and wiring fixes. --- OSBindings/Mac/Clock SignalTests/Bridges/TestMachineZ80.mm | 2 +- Processors/Z80/Z80AllRAM.cpp | 4 ++++ Processors/Z80/Z80AllRAM.hpp | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/OSBindings/Mac/Clock SignalTests/Bridges/TestMachineZ80.mm b/OSBindings/Mac/Clock SignalTests/Bridges/TestMachineZ80.mm index 2ba157c6f..73274866e 100644 --- a/OSBindings/Mac/Clock SignalTests/Bridges/TestMachineZ80.mm +++ b/OSBindings/Mac/Clock SignalTests/Bridges/TestMachineZ80.mm @@ -119,7 +119,7 @@ static CPU::Z80::Register registerForRegister(CSTestMachineZ80Register reg) { - (instancetype)init { if(self = [super init]) { _processor = CPU::Z80::AllRAMProcessor::Processor(); - _processor.reset_power_on(); + _processor->reset_power_on(); _cppTrapHandler = new MachineTrapHandler(self); _busOperationHandler = new BusOperationHandler(self); _busOperationCaptures = [[NSMutableArray alloc] init]; diff --git a/Processors/Z80/Z80AllRAM.cpp b/Processors/Z80/Z80AllRAM.cpp index d77f2514a..194fe0cb6 100644 --- a/Processors/Z80/Z80AllRAM.cpp +++ b/Processors/Z80/Z80AllRAM.cpp @@ -70,6 +70,10 @@ class ConcreteAllRAMProcessor: public AllRAMProcessor, public Processor::get_halt_line(); } + + void reset_power_on() { + return CPU::Z80::Processor::reset_power_on(); + } }; } diff --git a/Processors/Z80/Z80AllRAM.hpp b/Processors/Z80/Z80AllRAM.hpp index ba7ba3d41..5307b3bae 100644 --- a/Processors/Z80/Z80AllRAM.hpp +++ b/Processors/Z80/Z80AllRAM.hpp @@ -32,6 +32,7 @@ class AllRAMProcessor: virtual uint16_t get_value_of_register(Register r) = 0; virtual void set_value_of_register(Register r, uint16_t value) = 0; virtual bool get_halt_line() = 0; + virtual void reset_power_on() = 0; protected: MemoryAccessDelegate *delegate_;