diff options
Diffstat (limited to 'src/cpu/table.c')
| -rw-r--r-- | src/cpu/table.c | 512 |
1 files changed, 262 insertions, 250 deletions
diff --git a/src/cpu/table.c b/src/cpu/table.c index 052fce7..a5c1c41 100644 --- a/src/cpu/table.c +++ b/src/cpu/table.c @@ -2,283 +2,295 @@ #include"table.h" - void* InstructionTable; +void (*Instruction)(Addressing); -void (*func)(Addressing); +// Macros for accessing the InstructionTable +#define InstructionTableFunction(x) ((uintptr_t*)(InstructionTable + (sizeof(uintptr_t) * x))) +#define InstructionTableAddressing(x) ((Addressing*)(InstructionTable + (sizeof(uintptr_t) * 256) + (sizeof(Addressing) * x))) +#define InstructionTableCycles(x) ((int*)(InstructionTable + (sizeof(uintptr_t) * 256) + (sizeof(Addressing) * 256) + (sizeof(int) * x))) -uintptr_t* GetInstructionTableFunction(int i){ //Segmentation fault is occurring here, likely in next one too - uintptr_t* r = (InstructionTable + (sizeof(uintptr_t)*i)); - return r; -} +const InstructionTableSize = (256 * (sizeof(uintptr_t) + sizeof(Addressing) + sizeof(int))); -Addressing* GetInstructionTableAddressing(int i){ - Addressing* r = (InstructionTable + (sizeof(uintptr_t)*256) + (sizeof(Addressing)*i)); - return r; -} -void CallInstructionTable(){ - int val = 0; - // Setup to call the correct function. - int i = (int)GetMemory(PC); - uintptr_t a = GetInstructionTableFunction(i); - memcpy(&func, a, sizeof(uintptr_t)); - // Find the correct addressing mode. - Addressing r = *(Addressing*)(InstructionTable + ((sizeof(uintptr_t)*256) + (sizeof(Addressing) * i))); +void CallInstructionTable() +{ + // Set function. + memcpy(&Instruction, + InstructionTableFunction((int)GetMemory(PC)), + sizeof(uintptr_t)); + + // Find the addressing mode. + Addressing r = *InstructionTableAddressing(GetMemory(PC)); // Set val + int val = 0; if (fAddressGetLength(r) >= 2) - val += (address)GetMemory(PC+1); + val += GetMemory(PC+1); if (fAddressGetLength(r) == 3) - val += (address)GetMemory(PC+2) << 8; + val += ((address)GetMemory(PC+2)) << 8; - // Set idata - idata = fAddress(r, val); + // Set state + state = fAddress(r, val); // Perform function - func(r); + Instruction(r); - - PC += idata.length; + // Incrememt the program counter. + PC += state.length; } -void SetInstructionTable(int i, uintptr_t p, Addressing r){ - uintptr_t* p1 = ( InstructionTable + (sizeof(uintptr_t) * i) ); - *p1 = p; - Addressing* r1 = ( InstructionTable + (sizeof(uintptr_t) * 256) + (sizeof(Addressing) * i) ); - *r1 = r; +void SetInstructionTable(int index, void* function, Addressing addressing, int cycles) +{ + *InstructionTableFunction(index) = (uintptr_t)function; + *InstructionTableAddressing(index) = addressing; + *InstructionTableCycles(index) = cycles; } -void InitInstructionTable(){ + +void InitInstructionTable() +{ + // Create InstructionTable InstructionTable = malloc(InstructionTableSize); - // Load and Store Instructions - // fLDA(Addressing, address); - SetInstructionTable(0xA9, (uintptr_t)&fLDA, eImmediate); - SetInstructionTable(0xA5, (uintptr_t)&fLDA, eZeroPage); - SetInstructionTable(0xB5, (uintptr_t)&fLDA, eZeroPageIndexedX); - SetInstructionTable(0xAD, (uintptr_t)&fLDA, eAbsolute); - SetInstructionTable(0xBD, (uintptr_t)&fLDA, eAbsoluteIndexedX); - SetInstructionTable(0xB9, (uintptr_t)&fLDA, eAbsoluteIndexedY); - SetInstructionTable(0xA1, (uintptr_t)&fLDA, eIndexedIndirect); - SetInstructionTable(0xB1, (uintptr_t)&fLDA, eIndirectIndexed); - // fLDX(Addressing, address); - SetInstructionTable(0xA2, (uintptr_t)&fLDX, eImmediate); - SetInstructionTable(0xA6, (uintptr_t)&fLDX, eZeroPage); - SetInstructionTable(0xB6, (uintptr_t)&fLDX, eZeroPageIndexedY); - SetInstructionTable(0xAE, (uintptr_t)&fLDX, eAbsolute); - SetInstructionTable(0xBE, (uintptr_t)&fLDX, eAbsoluteIndexedY); - // fLDY(Addressing, address); - SetInstructionTable(0xA0, (uintptr_t)&fLDY, eImmediate); - SetInstructionTable(0xA4, (uintptr_t)&fLDY, eZeroPage); - SetInstructionTable(0xB4, (uintptr_t)&fLDY, eZeroPageIndexedX); - SetInstructionTable(0xAC, (uintptr_t)&fLDY, eAbsolute); - SetInstructionTable(0xBC, (uintptr_t)&fLDY, eAbsoluteIndexedX); - // fSTA(Addressing, address); - SetInstructionTable(0x85, (uintptr_t)&fSTA, eZeroPage); - SetInstructionTable(0x95, (uintptr_t)&fSTA, eZeroPageIndexedX); - SetInstructionTable(0x8D, (uintptr_t)&fSTA, eAbsolute); - SetInstructionTable(0x9D, (uintptr_t)&fSTA, eAbsoluteIndexedX); - SetInstructionTable(0x99, (uintptr_t)&fSTA, eAbsoluteIndexedY); - SetInstructionTable(0x81, (uintptr_t)&fSTA, eIndexedIndirect); - SetInstructionTable(0x91, (uintptr_t)&fSTA, eIndirectIndexed); - // fSTX(Addressing, address); - SetInstructionTable(0x86, (uintptr_t)&fSTX, eZeroPage); - SetInstructionTable(0x96, (uintptr_t)&fSTX, eZeroPageIndexedX); - SetInstructionTable(0x8E, (uintptr_t)&fSTX, eAbsolute); - // fSTY(Addressing, address); - SetInstructionTable(0x84, (uintptr_t)&fSTY, eZeroPage); - SetInstructionTable(0x94, (uintptr_t)&fSTY, eZeroPageIndexedY); - SetInstructionTable(0x8C, (uintptr_t)&fSTY, eAbsolute); + // Load and Store Instructions + + // LDA + SetInstructionTable(0xA9, &LDA, eImmediate, 2); + SetInstructionTable(0xA5, &LDA, eZeroPage, 3); + SetInstructionTable(0xB5, &LDA, eZeroPageIndexedX, 4); + SetInstructionTable(0xAD, &LDA, eAbsolute, 4); + SetInstructionTable(0xBD, &LDA, eAbsoluteIndexedX, 4); + SetInstructionTable(0xB9, &LDA, eAbsoluteIndexedY, 4); + SetInstructionTable(0xA1, &LDA, eIndexedIndirect, 6); + SetInstructionTable(0xB1, &LDA, eIndirectIndexed, 5); + // LDX + SetInstructionTable(0xA2, &LDX, eImmediate, 2); + SetInstructionTable(0xA6, &LDX, eZeroPage, 3); + SetInstructionTable(0xB6, &LDX, eZeroPageIndexedY, 4); + SetInstructionTable(0xAE, &LDX, eAbsolute, 4); + SetInstructionTable(0xBE, &LDX, eAbsoluteIndexedY, 4); + // LDY + SetInstructionTable(0xA0, &LDY, eImmediate, 2); + SetInstructionTable(0xA4, &LDY, eZeroPage, 3); + SetInstructionTable(0xB4, &LDY, eZeroPageIndexedX, 4); + SetInstructionTable(0xAC, &LDY, eAbsolute, 4); + SetInstructionTable(0xBC, &LDY, eAbsoluteIndexedX, 4); + // STA + SetInstructionTable(0x85, &STA, eZeroPage, 3); + SetInstructionTable(0x95, &STA, eZeroPageIndexedX, 4); + SetInstructionTable(0x8D, &STA, eAbsolute, 4); + SetInstructionTable(0x9D, &STA, eAbsoluteIndexedX, 5); + SetInstructionTable(0x99, &STA, eAbsoluteIndexedY, 5); + SetInstructionTable(0x81, &STA, eIndexedIndirect, 6); + SetInstructionTable(0x91, &STA, eIndirectIndexed, 6); + // STX + SetInstructionTable(0x86, &STX, eZeroPage, 3); + SetInstructionTable(0x96, &STX, eZeroPageIndexedX, 4); + SetInstructionTable(0x8E, &STX, eAbsolute, 4); + // STY + SetInstructionTable(0x84, &STY, eZeroPage, 3); + SetInstructionTable(0x94, &STY, eZeroPageIndexedY, 4); + SetInstructionTable(0x8C, &STY, eAbsolute, 4); + // Arithmetic Instructions - // fADC(Addressing, address); - SetInstructionTable(0x69, (uintptr_t)&fADC, eImmediate); - SetInstructionTable(0x65, (uintptr_t)&fADC, eZeroPage); - SetInstructionTable(0x75, (uintptr_t)&fADC, eZeroPageIndexedX); - SetInstructionTable(0x6D, (uintptr_t)&fADC, eAbsolute); - SetInstructionTable(0x7D, (uintptr_t)&fADC, eAbsoluteIndexedX); - SetInstructionTable(0x79, (uintptr_t)&fADC, eAbsoluteIndexedY); - SetInstructionTable(0x61, (uintptr_t)&fADC, eIndexedIndirect); - SetInstructionTable(0x71, (uintptr_t)&fADC, eIndirectIndexed); - // fSBC(Addressing, address); - SetInstructionTable(0xE9, (uintptr_t)&fSBC, eImmediate); - SetInstructionTable(0xE5, (uintptr_t)&fSBC, eZeroPage); - SetInstructionTable(0xF5, (uintptr_t)&fSBC, eZeroPageIndexedX); - SetInstructionTable(0xED, (uintptr_t)&fSBC, eAbsolute); - SetInstructionTable(0xFD, (uintptr_t)&fSBC, eAbsoluteIndexedX); - SetInstructionTable(0xF9, (uintptr_t)&fSBC, eAbsoluteIndexedY); - SetInstructionTable(0xE1, (uintptr_t)&fSBC, eIndexedIndirect); - SetInstructionTable(0xF1, (uintptr_t)&fSBC, eIndirectIndexed); - - //Increment and Decrement Instructions - //INC(Addressing, address); - SetInstructionTable(0xE6, (uintptr_t)&fINC, eZeroPage); - SetInstructionTable(0xF6, (uintptr_t)&fINC, eZeroPageIndexedX); - SetInstructionTable(0xEE, (uintptr_t)&fINC, eAbsolute); - SetInstructionTable(0xFE, (uintptr_t)&fINC, eAbsoluteIndexedX); - //INX(Addressing, address); - SetInstructionTable(0xE8, (uintptr_t)&fINX, eImplied); - //INY(Addressing, address); - SetInstructionTable(0xC8, (uintptr_t)&fINY, eImplied); - //DEC(Addressing, address); - SetInstructionTable(0xC6, (uintptr_t)&fDEC, eZeroPage); - SetInstructionTable(0xD6, (uintptr_t)&fDEC, eZeroPageIndexedX); - SetInstructionTable(0xCE, (uintptr_t)&fDEC, eAbsolute); - SetInstructionTable(0xDE, (uintptr_t)&fDEC, eAbsoluteIndexedX); - //DEX(Addressing, address); - SetInstructionTable(0xCA, (uintptr_t)&fDEX, eImplied); - //DEY(Addressing, address); - SetInstructionTable(0x88, (uintptr_t)&fDEY, eImplied); - + + // ADC + SetInstructionTable(0x69, &ADC, eImmediate, 2); + SetInstructionTable(0x65, &ADC, eZeroPage, 3); + SetInstructionTable(0x75, &ADC, eZeroPageIndexedX, 4); + SetInstructionTable(0x6D, &ADC, eAbsolute, 4); + SetInstructionTable(0x7D, &ADC, eAbsoluteIndexedX, 4); + SetInstructionTable(0x79, &ADC, eAbsoluteIndexedY, 4); + SetInstructionTable(0x61, &ADC, eIndexedIndirect, 6); + SetInstructionTable(0x71, &ADC, eIndirectIndexed, 5); + // SBC + SetInstructionTable(0xE9, &SBC, eImmediate, 2); + SetInstructionTable(0xE5, &SBC, eZeroPage, 3); + SetInstructionTable(0xF5, &SBC, eZeroPageIndexedX, 4); + SetInstructionTable(0xED, &SBC, eAbsolute, 4); + SetInstructionTable(0xFD, &SBC, eAbsoluteIndexedX, 4); + SetInstructionTable(0xF9, &SBC, eAbsoluteIndexedY, 4); + SetInstructionTable(0xE1, &SBC, eIndexedIndirect, 6); + SetInstructionTable(0xF1, &SBC, eIndirectIndexed, 5); + + // Increment and Decrement Instructions + + // INC + SetInstructionTable(0xE6, &INC, eZeroPage, 5); + SetInstructionTable(0xF6, &INC, eZeroPageIndexedX, 6); + SetInstructionTable(0xEE, &INC, eAbsolute, 6); + SetInstructionTable(0xFE, &INC, eAbsoluteIndexedX, 7); + // INX + SetInstructionTable(0xE8, &INX, eImplied, 2); + // INY + SetInstructionTable(0xC8, &INY, eImplied, 2); + // DEC + SetInstructionTable(0xC6, &DEC, eZeroPage, 5); + SetInstructionTable(0xD6, &DEC, eZeroPageIndexedX, 6); + SetInstructionTable(0xCE, &DEC, eAbsolute, 6); + SetInstructionTable(0xDE, &DEC, eAbsoluteIndexedX, 7); + // DEX + SetInstructionTable(0xCA, &DEX, eImplied, 2); + // DEY + SetInstructionTable(0x88, &DEY, eImplied, 2); + // Logical Instructions - //AND(Addressing, address); - SetInstructionTable(0x29, (uintptr_t)&fAND, eImmediate); - SetInstructionTable(0x25, (uintptr_t)&fAND, eZeroPage); - SetInstructionTable(0x35, (uintptr_t)&fAND, eZeroPageIndexedX); - SetInstructionTable(0x2D, (uintptr_t)&fAND, eAbsolute); - SetInstructionTable(0x3D, (uintptr_t)&fAND, eAbsoluteIndexedX); - SetInstructionTable(0x39, (uintptr_t)&fAND, eAbsoluteIndexedY); - SetInstructionTable(0x21, (uintptr_t)&fAND, eIndexedIndirect); - SetInstructionTable(0x31, (uintptr_t)&fAND, eIndirectIndexed); - //ORA(Addressing, address); - SetInstructionTable(0x09, (uintptr_t)&fORA, eImmediate); - SetInstructionTable(0x05, (uintptr_t)&fORA, eZeroPage); - SetInstructionTable(0x15, (uintptr_t)&fORA, eZeroPageIndexedX); - SetInstructionTable(0x0D, (uintptr_t)&fORA, eAbsolute); - SetInstructionTable(0x1D, (uintptr_t)&fORA, eAbsoluteIndexedX); - SetInstructionTable(0x19, (uintptr_t)&fORA, eAbsoluteIndexedY); - SetInstructionTable(0x01, (uintptr_t)&fORA, eIndexedIndirect); - SetInstructionTable(0x11, (uintptr_t)&fORA, eIndirectIndexed); - //EOR(Addressing, address); - SetInstructionTable(0x49, (uintptr_t)&fEOR, eImmediate); - SetInstructionTable(0x45, (uintptr_t)&fEOR, eZeroPage); - SetInstructionTable(0x55, (uintptr_t)&fEOR, eZeroPageIndexedX); - SetInstructionTable(0x4D, (uintptr_t)&fEOR, eAbsolute); - SetInstructionTable(0x5D, (uintptr_t)&fEOR, eAbsoluteIndexedX); - SetInstructionTable(0x59, (uintptr_t)&fEOR, eAbsoluteIndexedY); - SetInstructionTable(0x41, (uintptr_t)&fEOR, eIndexedIndirect); - SetInstructionTable(0x51, (uintptr_t)&fEOR, eIndirectIndexed); - + + // AND + SetInstructionTable(0x29, &AND, eImmediate, 2); + SetInstructionTable(0x25, &AND, eZeroPage, 3); + SetInstructionTable(0x35, &AND, eZeroPageIndexedX, 4); + SetInstructionTable(0x2D, &AND, eAbsolute, 4); + SetInstructionTable(0x3D, &AND, eAbsoluteIndexedX, 4); + SetInstructionTable(0x39, &AND, eAbsoluteIndexedY, 4); + SetInstructionTable(0x21, &AND, eIndexedIndirect, 6); + SetInstructionTable(0x31, &AND, eIndirectIndexed, 5); + // ORA + SetInstructionTable(0x09, &ORA, eImmediate, 2); + SetInstructionTable(0x05, &ORA, eZeroPage, 3); + SetInstructionTable(0x15, &ORA, eZeroPageIndexedX, 4); + SetInstructionTable(0x0D, &ORA, eAbsolute, 4); + SetInstructionTable(0x1D, &ORA, eAbsoluteIndexedX, 4); + SetInstructionTable(0x19, &ORA, eAbsoluteIndexedY, 4); + SetInstructionTable(0x01, &ORA, eIndexedIndirect, 6); + SetInstructionTable(0x11, &ORA, eIndirectIndexed, 5); + // EOR + SetInstructionTable(0x49, &EOR, eImmediate, 2); + SetInstructionTable(0x45, &EOR, eZeroPage, 3); + SetInstructionTable(0x55, &EOR, eZeroPageIndexedX, 4); + SetInstructionTable(0x4D, &EOR, eAbsolute, 4); + SetInstructionTable(0x5D, &EOR, eAbsoluteIndexedX, 4); + SetInstructionTable(0x59, &EOR, eAbsoluteIndexedY, 4); + SetInstructionTable(0x41, &EOR, eIndexedIndirect, 6); + SetInstructionTable(0x51, &EOR, eIndirectIndexed, 5); + // Jump, Branch, Compare, and Test Bits - //JMP(Addressing, address); - SetInstructionTable(0x4C, (uintptr_t)&fJMP, eAbsolute); - SetInstructionTable(0x6C, (uintptr_t)&fJMP, eIndirectAbsolute); - //BCC(Addressing, address); - SetInstructionTable(0x90, (uintptr_t)&fBCC, eRelative); - //BCS(Addressing, address); - SetInstructionTable(0xB0, (uintptr_t)&fBCS, eRelative); - //BEQ(Addressing, address); - SetInstructionTable(0xF0, (uintptr_t)&fBEQ, eRelative); - //BNE(Addressing, address); - SetInstructionTable(0xD0, (uintptr_t)&fBNE, eRelative); - //BMI(Addressing, address); - SetInstructionTable(0x30, (uintptr_t)&fBMI, eRelative); - //BPL(Addressing, address); - SetInstructionTable(0x10, (uintptr_t)&fBPL, eRelative); - //BVS(Addressing, address); - SetInstructionTable(0x70, (uintptr_t)&fBVS, eRelative); - //BVC(Addressing, address); - SetInstructionTable(0x50, (uintptr_t)&fBVC, eRelative); - //CMP(Addressing, address); - SetInstructionTable(0xC9, (uintptr_t)&fCMP, eImmediate); - SetInstructionTable(0xC5, (uintptr_t)&fCMP, eZeroPage); - SetInstructionTable(0xD5, (uintptr_t)&fCMP, eZeroPageIndexedX); - SetInstructionTable(0xCD, (uintptr_t)&fCMP, eAbsolute); - SetInstructionTable(0xDD, (uintptr_t)&fCMP, eAbsoluteIndexedX); - SetInstructionTable(0xD9, (uintptr_t)&fCMP, eAbsoluteIndexedY); - SetInstructionTable(0xC1, (uintptr_t)&fCMP, eIndexedIndirect); - SetInstructionTable(0xD1, (uintptr_t)&fCMP, eIndirectIndexed); - //CPX(Addressing, address); - SetInstructionTable(0xE0, (uintptr_t)&fCPX, eImmediate); - SetInstructionTable(0xE4, (uintptr_t)&fCPX, eZeroPage); - SetInstructionTable(0xEC, (uintptr_t)&fCPX, eAbsolute); - //CPY(Addressing, address); - SetInstructionTable(0xC0, (uintptr_t)&fCPY, eImmediate); - SetInstructionTable(0xC4, (uintptr_t)&fCPY, eZeroPage); - SetInstructionTable(0xCC, (uintptr_t)&fCPY, eAbsolute); - //BIT(Addressing, address); - SetInstructionTable(0x24, (uintptr_t)&fBIT, eZeroPage); - SetInstructionTable(0x2C, (uintptr_t)&fBIT, eAbsolute); - + + // JMP + SetInstructionTable(0x4C, &JMP, eAbsolute, 3); + SetInstructionTable(0x6C, &JMP, eIndirectAbsolute, 5); + // BCC + SetInstructionTable(0x90, &BCC, eRelative, 2); + // BCS + SetInstructionTable(0xB0, &BCS, eRelative, 2); + // BEQ + SetInstructionTable(0xF0, &BEQ, eRelative, 2); + // BNE + SetInstructionTable(0xD0, &BNE, eRelative, 2); + // BMI + SetInstructionTable(0x30, &BMI, eRelative, 2); + // BPL + SetInstructionTable(0x10, &BPL, eRelative, 2); + // BVS + SetInstructionTable(0x70, &BVS, eRelative, 2); + // BVC + SetInstructionTable(0x50, &BVC, eRelative, 2); + // CMP + SetInstructionTable(0xC9, &CMP, eImmediate, 2); + SetInstructionTable(0xC5, &CMP, eZeroPage, 3); + SetInstructionTable(0xD5, &CMP, eZeroPageIndexedX, 4); + SetInstructionTable(0xCD, &CMP, eAbsolute, 4); + SetInstructionTable(0xDD, &CMP, eAbsoluteIndexedX, 4); + SetInstructionTable(0xD9, &CMP, eAbsoluteIndexedY, 4); + SetInstructionTable(0xC1, &CMP, eIndexedIndirect, 6); + SetInstructionTable(0xD1, &CMP, eIndirectIndexed, 5); + // CPX + SetInstructionTable(0xE0, &CPX, eImmediate, 2); + SetInstructionTable(0xE4, &CPX, eZeroPage, 3); + SetInstructionTable(0xEC, &CPX, eAbsolute, 4); + // CPY + SetInstructionTable(0xC0, &CPY, eImmediate, 2); + SetInstructionTable(0xC4, &CPY, eZeroPage, 3); + SetInstructionTable(0xCC, &CPY, eAbsolute, 4); + // BIT + SetInstructionTable(0x24, &BIT, eZeroPage, 3); + SetInstructionTable(0x2C, &BIT, eAbsolute, 4); + // Shift and Rotate Instructions - //ASL(Addressing, address); - SetInstructionTable(0x0A, (uintptr_t)&fASL, eAccumulator); - SetInstructionTable(0x06, (uintptr_t)&fASL, eZeroPage); - SetInstructionTable(0x16, (uintptr_t)&fASL, eZeroPageIndexedX); - SetInstructionTable(0x0E, (uintptr_t)&fASL, eAbsolute); - SetInstructionTable(0x1E, (uintptr_t)&fASL, eAbsoluteIndexedX); - //LSR(Addressing, address); - SetInstructionTable(0x4A, (uintptr_t)&fLSR, eAccumulator); - SetInstructionTable(0x46, (uintptr_t)&fLSR, eZeroPage); - SetInstructionTable(0x56, (uintptr_t)&fLSR, eZeroPageIndexedX); - SetInstructionTable(0x4E, (uintptr_t)&fLSR, eAbsolute); - SetInstructionTable(0x5E, (uintptr_t)&fLSR, eAbsoluteIndexedX); - //ROL(Addressing, address); - SetInstructionTable(0x2A, (uintptr_t)&fROL, eAccumulator); - SetInstructionTable(0x26, (uintptr_t)&fROL, eZeroPage); - SetInstructionTable(0x36, (uintptr_t)&fROL, eZeroPageIndexedX); - SetInstructionTable(0x2E, (uintptr_t)&fROL, eAbsolute); - SetInstructionTable(0x3E, (uintptr_t)&fROL, eAbsoluteIndexedX); - //ROR(Addressing, address); - SetInstructionTable(0x6A, (uintptr_t)&fROR, eAccumulator); - SetInstructionTable(0x66, (uintptr_t)&fROR, eZeroPage); - SetInstructionTable(0x76, (uintptr_t)&fROR, eZeroPageIndexedX); - SetInstructionTable(0x6E, (uintptr_t)&fROR, eAbsolute); - SetInstructionTable(0x7E, (uintptr_t)&fROR, eAbsoluteIndexedX); - + + // ASL + SetInstructionTable(0x0A, &ASL, eAccumulator, 2); + SetInstructionTable(0x06, &ASL, eZeroPage, 5); + SetInstructionTable(0x16, &ASL, eZeroPageIndexedX, 6); + SetInstructionTable(0x0E, &ASL, eAbsolute, 6); + SetInstructionTable(0x1E, &ASL, eAbsoluteIndexedX, 7); + // LSR + SetInstructionTable(0x4A, &LSR, eAccumulator, 2); + SetInstructionTable(0x46, &LSR, eZeroPage, 5); + SetInstructionTable(0x56, &LSR, eZeroPageIndexedX, 6); + SetInstructionTable(0x4E, &LSR, eAbsolute, 6); + SetInstructionTable(0x5E, &LSR, eAbsoluteIndexedX, 7); + // ROL + SetInstructionTable(0x2A, &ROL, eAccumulator, 2); + SetInstructionTable(0x26, &ROL, eZeroPage, 5); + SetInstructionTable(0x36, &ROL, eZeroPageIndexedX, 6); + SetInstructionTable(0x2E, &ROL, eAbsolute, 6); + SetInstructionTable(0x3E, &ROL, eAbsoluteIndexedX, 7); + // ROR + SetInstructionTable(0x6A, &ROR, eAccumulator, 2); + SetInstructionTable(0x66, &ROR, eZeroPage, 5); + SetInstructionTable(0x76, &ROR, eZeroPageIndexedX, 6); + SetInstructionTable(0x6E, &ROR, eAbsolute, 6); + SetInstructionTable(0x7E, &ROR, eAbsoluteIndexedX, 7); + // Transfer Instructions - //TAX(Addressing, address); - SetInstructionTable(0xAA, (uintptr_t)&fTAX, eImplied); - //TAY(Addressing, address); - SetInstructionTable(0xA8, (uintptr_t)&fTAY, eImplied); - //TXA(Addressing, address); - SetInstructionTable(0x8A, (uintptr_t)&fTXA, eImplied); - //TYA(Addressing, address); - SetInstructionTable(0x98, (uintptr_t)&fTYA, eImplied); - + + // TAX + SetInstructionTable(0xAA, &TAX, eImplied, 2); + // TAY + SetInstructionTable(0xA8, &TAY, eImplied, 2); + // TXA + SetInstructionTable(0x8A, &TXA, eImplied, 2); + // TYA + SetInstructionTable(0x98, &TYA, eImplied, 2); + // Stack Instructions - //TSX(Addressing, address); - SetInstructionTable(0xBA, (uintptr_t)&fTSX, eImplied); - //TXS(Addressing, address); - SetInstructionTable(0x9A, (uintptr_t)&fTXS, eImplied); - //PHA(Addressing, address); - SetInstructionTable(0x48, (uintptr_t)&fPHA, eImplied); - //PHP(Addressing, address); - SetInstructionTable(0x08, (uintptr_t)&fPHP, eImplied); - //PLA(Addressing, address); - SetInstructionTable(0x68, (uintptr_t)&fPLA, eImplied); - //PLP(Addressing, address); - SetInstructionTable(0x28, (uintptr_t)&fPLP, eImplied); - + + // TSX + SetInstructionTable(0xBA, &TSX, eImplied, 2); + // TXS + SetInstructionTable(0x9A, &TXS, eImplied, 2); + // PHA + SetInstructionTable(0x48, &PHA, eImplied, 3); + // PHP + SetInstructionTable(0x08, &PHP, eImplied, 3); + // PLA + SetInstructionTable(0x68, &PLA, eImplied, 4); + // PLP + SetInstructionTable(0x28, &PLP, eImplied, 4); + // Subroutine Instructions - //JSR(Addressing, address); - SetInstructionTable(0x20, (uintptr_t)&fJSR, eAbsolute); - //RTS(Addressing, address); - SetInstructionTable(0x60, (uintptr_t)&fRTS, eImplied); - //RTI(Addressing, address); - SetInstructionTable(0x40, (uintptr_t)&fRTI, eImplied); - + + // JSR + SetInstructionTable(0x20, &JSR, eAbsolute, 6); + // RTS + SetInstructionTable(0x60, &RTS, eImplied, 6); + // RTI + SetInstructionTable(0x40, &RTI, eImplied, 6); + // Set/Reset Insutrctions - //CLC(Addressing, address); - SetInstructionTable(0x18, (uintptr_t)&fCLC, eImplied); - //CLD(Addressing, address); - SetInstructionTable(0xD8, (uintptr_t)&fCLD, eImplied); - //CLI(Addressing, address); - SetInstructionTable(0x58, (uintptr_t)&fCLI, eImplied); - //CLV(Addressing, address); - SetInstructionTable(0xB8, (uintptr_t)&fCLV, eImplied); - //SEC(Addressing, address); - SetInstructionTable(0x38, (uintptr_t)&fSEC, eImplied); - //SED(Addressing, address); - SetInstructionTable(0xF8, (uintptr_t)&fSED, eImplied); - //SEI(Addressing, address); - SetInstructionTable(0x78, (uintptr_t)&fSEI, eImplied); - + + // CLC + SetInstructionTable(0x18, &CLC, eImplied, 2); + // CLD + SetInstructionTable(0xD8, &CLD, eImplied, 2); + // CLI + SetInstructionTable(0x58, &CLI, eImplied, 2); + // CLV + SetInstructionTable(0xB8, &CLV, eImplied, 2); + // SEC + SetInstructionTable(0x38, &SEC, eImplied, 2); + // SED + SetInstructionTable(0xF8, &SED, eImplied, 2); + // SEI + SetInstructionTable(0x78, &SEI, eImplied, 2); + // NOP/BRK Instructions - //NOP(Addressing, address); - SetInstructionTable(0xEA, (uintptr_t)&fNOP, eImplied); - //BRK(Addressing, address); - SetInstructionTable(0x00, (uintptr_t)&fBRK, eImplied); + + // NOP + SetInstructionTable(0xEA, &NOP, eImplied, 2); + // BRK + SetInstructionTable(0x00, &BRK, eImplied, 7); } - |