diff --git a/M6502/inc/mos6502.h b/M6502/inc/mos6502.h index fc01145..ffc959d 100644 --- a/M6502/inc/mos6502.h +++ b/M6502/inc/mos6502.h @@ -616,6 +616,13 @@ namespace EightBit { EORA(operand); } + void RRA(int bbb) { + auto operand = AM_01(bbb); + ROR(operand); + setByte(operand); + A() = ADC(A(), operand); + } + void ROR(uint8_t& output); void LSR(uint8_t& output); diff --git a/M6502/src/Disassembly.cpp b/M6502/src/Disassembly.cpp index 9401b8d..ee42167 100644 --- a/M6502/src/Disassembly.cpp +++ b/M6502/src/Disassembly.cpp @@ -398,6 +398,9 @@ std::string EightBit::Disassembly::disassemble(uint16_t current) const { case 0b010: output << disassemble_AM_01(bbb, "*SRE"); break; + case 0b011: + output << disassemble_AM_01(bbb, "*RRA"); + break; case 0b100: output << disassemble_AM_11(bbb, "*SAX"); break; diff --git a/M6502/src/mos6502.cpp b/M6502/src/mos6502.cpp index 0e8346c..4406e93 100644 --- a/M6502/src/mos6502.cpp +++ b/M6502/src/mos6502.cpp @@ -11,8 +11,8 @@ EightBit::MOS6502::MOS6502(Bus& bus) /* 3 */ 2, 5, 0, 7, 4, 4, 6, 6, 2, 4, 2, 6, 4, 4, 7, 6, /* 4 */ 6, 6, 0, 8, 3, 3, 5, 5, 3, 2, 2, 0, 3, 4, 6, 6, /* 5 */ 2, 5, 0, 7, 4, 4, 6, 6, 2, 4, 2, 6, 4, 4, 7, 6, - /* 6 */ 6, 6, 0, 0, 3, 3, 5, 0, 4, 2, 2, 0, 5, 4, 6, 0, - /* 7 */ 2, 5, 0, 0, 4, 4, 6, 0, 2, 4, 2, 0, 4, 4, 7, 0, + /* 6 */ 6, 6, 0, 8, 3, 3, 5, 5, 4, 2, 2, 0, 5, 4, 6, 6, + /* 7 */ 2, 5, 0, 7, 4, 4, 6, 6, 2, 4, 2, 6, 4, 4, 7, 6, /* 8 */ 2, 6, 0, 6, 3, 3, 3, 3, 2, 0, 2, 0, 4, 4, 4, 4, /* 9 */ 2, 6, 0, 0, 4, 4, 4, 4, 2, 5, 2, 0, 0, 5, 0, 0, /* A */ 2, 6, 2, 6, 3, 3, 3, 3, 2, 2, 2, 0, 4, 4, 4, 4, @@ -420,6 +420,9 @@ int EightBit::MOS6502::execute(uint8_t cell) { case 0b010: // *SRE SRE(decoded.bbb); break; + case 0b011: // *RRA + RRA(decoded.bbb); + break; case 0b100: // *SAX AM_11(decoded.bbb, A() & X()); break;