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

Continuing the switch around.

Browse Source
This commit is contained in:
Thomas Harte
2016-03-24 19:31:41 -04:00
parent 738186e323
commit f1caf62ff2
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Processors/6502/CPU6502.hpp
View File

@@ -550,7 +550,7 @@ template <class T> class Processor {
// to date in this stack frame only); which saves some complicated addressing // to date in this stack frame only); which saves some complicated addressing
unsigned int scheduleProgramsReadPointer = _scheduleProgramsReadPointer; unsigned int scheduleProgramsReadPointer = _scheduleProgramsReadPointer;
unsigned int scheduleProgramProgramCounter = _scheduleProgramProgramCounter; unsigned int scheduleProgramProgramCounter = _scheduleProgramProgramCounter;
uint8_t operation = _operation; RegisterPair nextAddress = _nextAddress;
#define checkSchedule(op) \ #define checkSchedule(op) \
if(!_scheduledPrograms[scheduleProgramsReadPointer]) {\ if(!_scheduledPrograms[scheduleProgramsReadPointer]) {\
@@ -601,7 +601,7 @@ template <class T> class Processor {
case CycleFetchOperation: { case CycleFetchOperation: {
_lastOperationPC = _pc; _lastOperationPC = _pc;
_pc.full++; _pc.full++;
read_op(operation, _lastOperationPC.full); read_op(_operation, _lastOperationPC.full);
// static int last_cycles_left_to_run = 0; // static int last_cycles_left_to_run = 0;
// static bool printed_map[256] = {false}; // static bool printed_map[256] = {false};
@@ -620,7 +620,7 @@ template <class T> class Processor {
break; break;
case OperationDecodeOperation: case OperationDecodeOperation:
decode_operation(operation); decode_operation(_operation);
break; break;
case OperationMoveToNextProgram: case OperationMoveToNextProgram:
@@ -894,31 +894,31 @@ template <class T> class Processor {
#pragma mark - Addressing Mode Work #pragma mark - Addressing Mode Work
case CycleAddXToAddressLow: case CycleAddXToAddressLow:
_nextAddress.full = _address.full + _x; nextAddress.full = _address.full + _x;
_address.bytes.low = _nextAddress.bytes.low; _address.bytes.low = nextAddress.bytes.low;
if (_address.bytes.high != _nextAddress.bytes.high) { if (_address.bytes.high != nextAddress.bytes.high) {
throwaway_read(_address.full); throwaway_read(_address.full);
} }
break; break;
case CycleAddXToAddressLowRead: case CycleAddXToAddressLowRead:
_nextAddress.full = _address.full + _x; nextAddress.full = _address.full + _x;
_address.bytes.low = _nextAddress.bytes.low; _address.bytes.low = nextAddress.bytes.low;
throwaway_read(_address.full); throwaway_read(_address.full);
break; break;
case CycleAddYToAddressLow: case CycleAddYToAddressLow:
_nextAddress.full = _address.full + _y; nextAddress.full = _address.full + _y;
_address.bytes.low = _nextAddress.bytes.low; _address.bytes.low = nextAddress.bytes.low;
if (_address.bytes.high != _nextAddress.bytes.high) { if (_address.bytes.high != nextAddress.bytes.high) {
throwaway_read(_address.full); throwaway_read(_address.full);
} }
break; break;
case CycleAddYToAddressLowRead: case CycleAddYToAddressLowRead:
_nextAddress.full = _address.full + _y; nextAddress.full = _address.full + _y;
_address.bytes.low = _nextAddress.bytes.low; _address.bytes.low = nextAddress.bytes.low;
throwaway_read(_address.full); throwaway_read(_address.full);
break; break;
case OperationCorrectAddressHigh: case OperationCorrectAddressHigh:
_address.full = _nextAddress.full; _address.full = nextAddress.full;
break; break;
case CycleIncrementPCFetchAddressLowFromOperand: case CycleIncrementPCFetchAddressLowFromOperand:
_pc.full++; _pc.full++;
@@ -989,11 +989,11 @@ template <class T> class Processor {
case OperationBEQ: BRA(!_zeroResult); break; case OperationBEQ: BRA(!_zeroResult); break;
case CycleAddSignedOperandToPC: case CycleAddSignedOperandToPC:
_nextAddress.full = (uint16_t)(_pc.full + (int8_t)_operand); nextAddress.full = (uint16_t)(_pc.full + (int8_t)_operand);
_pc.bytes.low = _nextAddress.bytes.low; _pc.bytes.low = nextAddress.bytes.low;
if(_nextAddress.bytes.high != _pc.bytes.high) { if(nextAddress.bytes.high != _pc.bytes.high) {
uint16_t halfUpdatedPc = _pc.full; uint16_t halfUpdatedPc = _pc.full;
_pc.full = _nextAddress.full; _pc.full = nextAddress.full;
throwaway_read(halfUpdatedPc); throwaway_read(halfUpdatedPc);
} }
break; break;
@@ -1048,7 +1048,7 @@ template <class T> class Processor {
_cycles_left_to_run = number_of_cycles; _cycles_left_to_run = number_of_cycles;
_scheduleProgramsReadPointer = scheduleProgramsReadPointer; _scheduleProgramsReadPointer = scheduleProgramsReadPointer;
_scheduleProgramProgramCounter = scheduleProgramProgramCounter; _scheduleProgramProgramCounter = scheduleProgramProgramCounter;
_operation = operation; _nextAddress = nextAddress;
} }
} }