6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-04-05 05:38:50 +00:00
Code Issues Projects Releases Wiki Activity

Simplify processor bus access a little by further allowing register16_t address access.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2018-08-29 13:52:25 +01:00
parent 46b140dda1
commit 97272d650d
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LR35902/src/IoRegisters.cpp
View File

@ -18,7 +18,7 @@ void EightBit::GameBoy::IoRegisters::reset() {
void EightBit::GameBoy::IoRegisters::transferDma() {
if (m_dmaTransferActive) {
m_bus.OAMRAM().poke(m_dmaAddress.low, m_bus.peek(m_dmaAddress.word));
m_bus.OAMRAM().poke(m_dmaAddress.low, m_bus.peek(m_dmaAddress));
m_dmaTransferActive = ++m_dmaAddress.low < 0xa0;
}
}

2
M6502/test/Board.cpp
View File

@ -128,6 +128,6 @@ void Board::Cpu_ExecutedInstruction_Poll(const EightBit::MOS6502& cpu) {
void Board::pollKeyboard() {
#ifdef _MSC_VER
if (_kbhit())
poke(m_configuration.getInputAddress().word, _getch());
poke(m_configuration.getInputAddress(), _getch());
#endif
}

2
Z80/test/Board.cpp
View File

@ -76,7 +76,7 @@ void Board::Cpu_ExecutingInstruction_Profile(EightBit::Z80& cpu) {
const auto pc = cpu.PC();
m_profiler.addAddress(pc.word);
m_profiler.addInstruction(peek(pc.word));
m_profiler.addInstruction(peek(pc));
}
void Board::Cpu_ExecutingInstruction_Debug(EightBit::Z80& cpu) {

5
inc/Bus.h
View File

@ -25,8 +25,10 @@ namespace EightBit {
uint8_t peek() { return reference(); }
uint8_t peek(uint16_t address) { return reference(address); }
uint8_t peek(register16_t address) { return reference(address.word); }
void poke(uint8_t value) { reference() = value; }
void poke(uint16_t address, uint8_t value) { reference(address) = value; }
void poke(register16_t address, uint8_t value) { reference(address.word) = value; }
uint8_t read();
template<class T> uint8_t read(const T address) {
@ -43,7 +45,8 @@ namespace EightBit {
protected:
virtual uint8_t& reference(uint16_t address) = 0;
uint8_t& reference() { return reference(ADDRESS().word); }
uint8_t& reference(register16_t address) { return reference(address.word); }
uint8_t& reference() { return reference(ADDRESS()); }
private:
uint8_t m_data = 0xff;

6
src/BigEndianProcessor.cpp
View File

@ -48,7 +48,7 @@ EightBit::register16_t EightBit::BigEndianProcessor::popWord() {
}
EightBit::register16_t EightBit::BigEndianProcessor::peekWord(const register16_t address) {
const auto high = BUS().peek(address.word);
const auto low = BUS().peek(address.word + 1);
return register16_t(low, high).word;
const auto high = BUS().peek(address);
const auto low = BUS().peek(address + 1);
return register16_t(low, high);
}

6
src/LittleEndianProcessor.cpp
View File

@ -48,7 +48,7 @@ EightBit::register16_t EightBit::LittleEndianProcessor::popWord() {
}
EightBit::register16_t EightBit::LittleEndianProcessor::peekWord(const register16_t address) {
const auto low = BUS().peek(address.word);
const auto high = BUS().peek(address.word + 1);
return register16_t(low, high).word;
const auto low = BUS().peek(address);
const auto high = BUS().peek(address + 1);
return register16_t(low, high);
}