1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-03 11:30:02 +00:00

Corrected run call, and accepted that jam handling is gone forever.

This commit is contained in:
Thomas Harte 2017-07-22 22:21:26 -04:00
parent 2ff157cf7a
commit b0c2325adc

View File

@ -11,22 +11,6 @@
#include "6502AllRAM.hpp" #include "6502AllRAM.hpp"
#import "TestMachine+ForSubclassEyesOnly.h" #import "TestMachine+ForSubclassEyesOnly.h"
const uint8_t CSTestMachine6502JamOpcode = CPU::MOS6502::JamOpcode;
#pragma mark - C++ jam handler
//class MachineJamHandler: public CPU::MOS6502::AllRAMProcessor::JamHandler {
// public:
// MachineJamHandler(CSTestMachine6502 *targetMachine) : _targetMachine(targetMachine) {}
//
// void processor_did_jam(CPU::MOS6502::AllRAMProcessor::Processor *processor, uint16_t address) override {
// [_targetMachine.jamHandler testMachine:_targetMachine didJamAtAddress:address];
// }
//
// private:
// CSTestMachine6502 *_targetMachine;
//};
#pragma mark - Register enum map #pragma mark - Register enum map
static CPU::MOS6502::Register registerForRegister(CSTestMachine6502Register reg) { static CPU::MOS6502::Register registerForRegister(CSTestMachine6502Register reg) {
@ -45,7 +29,6 @@ static CPU::MOS6502::Register registerForRegister(CSTestMachine6502Register reg)
@implementation CSTestMachine6502 { @implementation CSTestMachine6502 {
CPU::MOS6502::AllRAMProcessor *_processor; CPU::MOS6502::AllRAMProcessor *_processor;
// MachineJamHandler *_cppJamHandler;
} }
#pragma mark - Lifecycle #pragma mark - Lifecycle
@ -117,7 +100,7 @@ static CPU::MOS6502::Register registerForRegister(CSTestMachine6502Register reg)
} }
- (void)runForNumberOfCycles:(int)cycles { - (void)runForNumberOfCycles:(int)cycles {
_processor->run_for_cycles(cycles); _processor->run_for(Cycles(cycles));
} }
@end @end