6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-12-23 15:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Refactor 6809 jsr/rts code a little. No functional changes.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2018-08-29 14:03:24 +01:00
parent 97272d650d
commit c85176431b
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MC6809/inc/mc6809.h
View File

@ -305,6 +305,7 @@ namespace EightBit {
uint8_t eor(uint8_t operand, uint8_t data);
void exg(uint8_t data);
uint8_t inc(uint8_t operand);
void jsr(register16_t address);
uint8_t ld(uint8_t data);
register16_t ld(register16_t data);
uint8_t lsr(uint8_t operand);

16
MC6809/src/mc6809.cpp
View File

@ -256,9 +256,9 @@ void EightBit::mc6809::executeUnprefixed(uint8_t opcode) {
case 0x7e: addCycles(7); jump(Address_extended()); break; // JMP (extended)
// JSR
case 0x9d: addCycles(6); call(Address_direct()); break; // JSR (direct)
case 0xad: addCycles(6); call(Address_indexed()); break; // JSR (indexed)
case 0xbd: addCycles(7); call(Address_extended()); break; // JSR (extended)
case 0x9d: addCycles(6); jsr(Address_direct()); break; // JSR (direct)
case 0xad: addCycles(6); jsr(Address_indexed()); break; // JSR (indexed)
case 0xbd: addCycles(7); jsr(Address_extended()); break; // JSR (extended)
// LD
@ -446,7 +446,7 @@ void EightBit::mc6809::executeUnprefixed(uint8_t opcode) {
// Branching
case 0x16: addCycles(5); jump(Address_relative_word()); break; // BRA (LBRA relative)
case 0x17: addCycles(9); call(Address_relative_word()); break; // BSR (LBSR relative)
case 0x17: addCycles(9); jsr(Address_relative_word()); break; // BSR (LBSR relative)
case 0x20: addCycles(3); jump(Address_relative_byte()); break; // BRA (relative)
case 0x21: addCycles(3); Address_relative_byte(); break; // BRN (relative)
case 0x22: addCycles(3); branchShort(BHI()); break; // BHI (relative)
@ -464,7 +464,7 @@ void EightBit::mc6809::executeUnprefixed(uint8_t opcode) {
case 0x2e: addCycles(3); branchShort(BGT()); break; // BGT (relative)
case 0x2f: addCycles(3); branchShort(BLE()); break; // BLE (relative)
case 0x8d: addCycles(7); call(Address_relative_byte()); break; // BSR (relative)
case 0x8d: addCycles(7); jsr(Address_relative_byte()); break; // BSR (relative)
default:
UNREACHABLE;
@ -897,6 +897,10 @@ uint8_t EightBit::mc6809::inc(uint8_t operand) {
return result;
}
void EightBit::mc6809::jsr(register16_t address) {
call(address);
}
uint8_t EightBit::mc6809::ld(uint8_t data) {
clearFlag(CC(), VF);
adjustNZ(data);
@ -1107,7 +1111,7 @@ void EightBit::mc6809::rti() {
Y() = popWordS();
U() = popWordS();
}
ret();
rts();
}
void EightBit::mc6809::rts() {