6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-06-26 04:29:26 +00:00
Code Issues Projects Releases Wiki Activity

6502: Implement some more undocumented instructions (for the Blargg nes cpu tests)

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2018-01-21 10:45:25 +00:00
parent b5fee5b5d9
commit 9124f10008
4 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
M6502/inc/Disassembly.h
View File

@ -39,6 +39,10 @@ namespace EightBit {
return AM_Immediate_dump() + "\t" + instruction + " $" + dump_WordValue(address);
}
std::string disassemble_Immediate(const std::string& instruction) const {
return AM_Immediate_dump() + "\t" + instruction + " " + AM_Immediate();
}
std::string disassemble_AM_00(int bbb, const std::string& instruction) const {
return AM_00_dump(bbb) + "\t" + instruction + " " + AM_00(bbb);
}

20
M6502/inc/mos6502.h
View File

@ -260,6 +260,26 @@ namespace EightBit {
adjustNZ(X() = A() = value);
}
void AAC(uint8_t value) {
ANDA(value);
setFlag(P(), CF, A() & Bit7);
}
void ASR(uint8_t value) {
A() = LSR(A() & value);
}
void ARR(uint8_t value) {
}
void ATX(uint8_t value) {
ANDA(value);
X() = A();
}
void AXS(uint8_t value) {
}
//
uint8_t DEC(uint8_t value) {

19
M6502/src/Disassembly.cpp
View File

@ -390,10 +390,25 @@ std::string EightBit::Disassembly::disassemble(uint16_t current) const {
case 0b11:
switch (aaa) {
case 0b000:
output << disassemble_AM_01(bbb, "*SLO");
switch (bbb) {
case 0b010:
output << disassemble_Immediate("*AAC");
break;
default:
output << disassemble_AM_01(bbb, "*SLO");
break;
}
break;
case 0b001:
output << disassemble_AM_01(bbb, "*RLA");
switch (bbb) {
case 0b010:
output << disassemble_Immediate("*AAC");
break;
default:
output << disassemble_AM_01(bbb, "*RLA");
break;
}
break;
case 0b010:
output << disassemble_AM_01(bbb, "*SRE");

12
M6502/src/mos6502.cpp
View File

@ -91,7 +91,7 @@ int EightBit::MOS6502::execute(uint8_t cell) {
case 0x08: addCycles(3); PHP(); break;
case 0x09: addCycles(2); ORA(AM_Immediate()); break;
case 0x0a: addCycles(2); A() = ASL(A()); break;
case 0x0b: addCycles(0); break;
case 0x0b: addCycles(2); AAC(AM_Immediate()); break;
case 0x0c: addCycles(4); AM_Absolute(); break;
case 0x0d: addCycles(4); ORA(AM_Absolute()); break;
case 0x0e: addCycles(6); setByte(ASL(AM_Absolute())); break;
@ -125,7 +125,7 @@ int EightBit::MOS6502::execute(uint8_t cell) {
case 0x28: addCycles(4); PLP(); break;
case 0x29: addCycles(2); ANDA(AM_Immediate()); break;
case 0x2a: addCycles(2); A() = ROL(A()); break;
case 0x2b: addCycles(0); break;
case 0x2b: addCycles(2); AAC(AM_Immediate()); break;
case 0x2c: addCycles(4); BIT(AM_Absolute()); break;
case 0x2d: addCycles(4); ANDA(AM_Absolute()); break;
case 0x2e: addCycles(6); setByte(ROL(AM_Absolute())); break;
@ -159,7 +159,7 @@ int EightBit::MOS6502::execute(uint8_t cell) {
case 0x48: addCycles(3); push(A()); break;
case 0x49: addCycles(2); EORA(AM_Immediate()); break;
case 0x4a: addCycles(2); A() = LSR(A()); break;
case 0x4b: addCycles(0); break;
case 0x4b: addCycles(2); ASR(AM_Immediate()); break;
case 0x4c: addCycles(3); JMP_abs(); break;
case 0x4d: addCycles(4); EORA(AM_Absolute()); break;
case 0x4e: addCycles(6); setByte(LSR(AM_Absolute())); break;
@ -193,7 +193,7 @@ int EightBit::MOS6502::execute(uint8_t cell) {
case 0x68: addCycles(4); adjustNZ(A() = pop()); break;
case 0x69: addCycles(2); A() = ADC(A(), AM_Immediate()); break;
case 0x6a: addCycles(2); A() = ROR(A()); break;
case 0x6b: addCycles(0); break;
case 0x6b: addCycles(2); ARR(AM_Immediate()); break;
case 0x6c: addCycles(5); JMP_ind(); break;
case 0x6d: addCycles(4); A() = ADC(A(), AM_Absolute()); break;
case 0x6e: addCycles(6); setByte(ROR(AM_Absolute())); break;
@ -261,7 +261,7 @@ int EightBit::MOS6502::execute(uint8_t cell) {
case 0xa8: addCycles(2); adjustNZ(Y() = A()); break;
case 0xa9: addCycles(2); adjustNZ(A() = AM_Immediate()); break;
case 0xaa: addCycles(2); adjustNZ(X() = A()); break;
case 0xab: addCycles(0); break;
case 0xab: addCycles(2); ATX(AM_Immediate()); break;
case 0xac: addCycles(4); adjustNZ(Y() = AM_Absolute()); break;
case 0xad: addCycles(4); adjustNZ(A() = AM_Absolute()); break;
case 0xae: addCycles(4); adjustNZ(X() = AM_Absolute()); break;
@ -295,7 +295,7 @@ int EightBit::MOS6502::execute(uint8_t cell) {
case 0xc8: addCycles(2); adjustNZ(++Y()); break;
case 0xc9: addCycles(2); CMP(A(), AM_Immediate()); break;
case 0xca: addCycles(2); adjustNZ(--X()); break;
case 0xcb: addCycles(0); break;
case 0xcb: addCycles(2); AXS(AM_Immediate()); break;
case 0xcc: addCycles(4); CMP(Y(), AM_Absolute()); break;
case 0xcd: addCycles(4); CMP(A(), AM_Absolute()); break;
case 0xce: addCycles(6); setByte(DEC(AM_Absolute())); break;