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

Small 6502 consolidation

Browse Source
This commit is contained in:
Adrian Conlon 2024-03-18 21:38:51 +00:00
parent c397b4c41b
commit ad1ab61f74
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
M6502/inc/mos6502.h
View File

@ -105,7 +105,7 @@ namespace EightBit {
// Addressing modes // Addressing modes
constexpr void noteFixedPage(uint8_t page) noexcept { m_fixed_page = page; } constexpr void noteFixedAddress(register16_t fixed) noexcept { m_fixed_page = fixed.high; BUS().ADDRESS().low = fixed.low; }
constexpr void Address_Immediate() noexcept { BUS().ADDRESS() = PC()++; } constexpr void Address_Immediate() noexcept { BUS().ADDRESS() = PC()++; }
void Address_Absolute() noexcept { BUS().ADDRESS() = fetchWord(); } void Address_Absolute() noexcept { BUS().ADDRESS() = fetchWord(); }
@ -115,23 +115,11 @@ namespace EightBit {
void Address_ZeroPageWithIndex(uint8_t index) noexcept { AM_ZeroPage(); BUS().ADDRESS().low += index; } void Address_ZeroPageWithIndex(uint8_t index) noexcept { AM_ZeroPage(); BUS().ADDRESS().low += index; }
void Address_ZeroPageX() noexcept { Address_ZeroPageWithIndex(X()); } void Address_ZeroPageX() noexcept { Address_ZeroPageWithIndex(X()); }
void Address_ZeroPageY() noexcept { Address_ZeroPageWithIndex(Y()); } void Address_ZeroPageY() noexcept { Address_ZeroPageWithIndex(Y()); }
void Address_AbsoluteWithIndex(uint8_t index) noexcept { Address_Absolute(); noteFixedAddress(BUS().ADDRESS() + index); }
void Address_AbsoluteX() noexcept { Address_AbsoluteWithIndex(X()); } void Address_AbsoluteX() noexcept { Address_AbsoluteWithIndex(X()); }
void Address_AbsoluteY() noexcept { Address_AbsoluteWithIndex(Y()); } void Address_AbsoluteY() noexcept { Address_AbsoluteWithIndex(Y()); }
void Address_IndexedIndirectX() noexcept { Address_ZeroPageX(); BUS().ADDRESS() = getWordPaged(); } void Address_IndexedIndirectX() noexcept { Address_ZeroPageX(); BUS().ADDRESS() = getWordPaged(); }
void Address_IndirectIndexedY() noexcept { Address_ZeroPageIndirect(); noteFixedAddress(BUS().ADDRESS() + Y()); }
void Address_AbsoluteWithIndex(uint8_t index) noexcept {
Address_Absolute();
const auto address = BUS().ADDRESS() + index;
noteFixedPage(address.high);
BUS().ADDRESS().low = address.low;
}
void Address_IndirectIndexedY() noexcept {
Address_ZeroPageIndirect();
const auto address = BUS().ADDRESS() + Y();
noteFixedPage(address.high);
BUS().ADDRESS().low = address.low;
}
// Addressing modes, with read // Addressing modes, with read

3
M6502/src/mos6502.cpp
View File

@ -428,9 +428,8 @@ void EightBit::MOS6502::branch(const int condition) noexcept {
if (condition) { if (condition) {
swallow(); swallow();
const auto address = PC() + relative; const auto address = PC() + relative;
noteFixedPage(address.high); noteFixedAddress(address);
jump(address); jump(address);
BUS().ADDRESS().low = address.low;
maybe_fixup(); maybe_fixup();
} }
} }