6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-05 10:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Attempted implementation of (zp) addressing mode.

Browse Source
This commit is contained in:
Thomas Harte 2018-08-09 21:51:14 -04:00
parent 6f838fe190
commit 95164b79c9
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift
View File

@ -83,6 +83,10 @@ class KlausDormannTests: XCTestCase {
case 0x177b: return "INC A didn't function"
case 0x1834: return "LDA (zp) acted as JAM"
case 0x183a: return "STA (zp) acted as JAM"
case 0x1849: return "LDA/STA (zp) left flags in incorrect state"
case 0: return "Didn't find tests"
default: return "Unknown error at \(String(format:"%04x", address))"
}

13
Processors/6502/Implementation/6502Storage.cpp
View File

@ -22,6 +22,7 @@ using namespace CPU::MOS6502;
#define Zero OperationLoadAddressZeroPage
#define ZeroX CycleLoadAddessZeroX
#define ZeroY CycleLoadAddessZeroY
#define ZeroIndirect OperationLoadAddressZeroPage, CycleIncrementPCFetchAddressLowFromOperand, CycleIncrementOperandFetchAddressHigh
#define IndexedIndirect CycleIncrementPCFetchAddressLowFromOperand, CycleAddXToOperandFetchAddressLow, CycleIncrementOperandFetchAddressHigh
#define IndirectIndexedr CycleIncrementPCFetchAddressLowFromOperand, CycleIncrementOperandFetchAddressHigh, CycleAddYToAddressLow, OperationCorrectAddressHigh
#define IndirectIndexed CycleIncrementPCFetchAddressLowFromOperand, CycleIncrementOperandFetchAddressHigh, CycleAddYToAddressLowRead, OperationCorrectAddressHigh
@ -36,6 +37,7 @@ using namespace CPU::MOS6502;
#define ZeroRead(...) Program(Zero, Read(__VA_ARGS__))
#define ZeroXRead(op) Program(ZeroX, Read(op))
#define ZeroYRead(op) Program(ZeroY, Read(op))
#define ZeroIndirectRead(op) Program(ZeroIndirect, Read(op))
#define IndexedIndirectRead(op) Program(IndexedIndirect, Read(op))
#define IndirectIndexedRead(op) Program(IndirectIndexedr, Read(op))
@ -45,6 +47,7 @@ using namespace CPU::MOS6502;
#define ZeroWrite(op) Program(Zero, Write(op))
#define ZeroXWrite(op) Program(ZeroX, Write(op))
#define ZeroYWrite(op) Program(ZeroY, Write(op))
#define ZeroIndirectWrite(op) Program(ZeroIndirect, Write(op))
#define IndexedIndirectWrite(op) Program(IndexedIndirect, Write(op))
#define IndirectIndexedWrite(op) Program(IndirectIndexed, Write(op))
@ -273,6 +276,16 @@ ProcessorStorage::ProcessorStorage(Personality personality) {
// Add INA and DEA.
Install(0x1a, Program(OperationINA));
Install(0x3a, Program(OperationDEA));
// Add (zp) operations.
Install(0x12, ZeroIndirectRead(OperationORA));
Install(0x32, ZeroIndirectRead(OperationAND));
Install(0x52, ZeroIndirectRead(OperationEOR));
Install(0x72, ZeroIndirectRead(OperationADC));
Install(0x92, ZeroIndirectRead(OperationSTA));
Install(0xb2, ZeroIndirectRead(OperationLDA));
Install(0xd2, ZeroIndirectWrite(OperationCMP));
Install(0xd2, ZeroIndirectRead(OperationSBC));
}
#undef Install
}