6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-01-08 11:29:26 +00:00
Code Issues Projects Releases Wiki Activity

Tidy up GameBoy processor (LR35902) with respect to C++14/17

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2018-10-27 19:23:02 +01:00
parent b9ca27feb3
commit 015071fcfb
8 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LR35902/inc/AbstractColourPalette.h
View File

@ -18,7 +18,7 @@ namespace EightBit {
: m_colours(4) {
}
uint32_t getColour(size_t index) const {
auto getColour(size_t index) const {
return m_colours[index];
}

8
LR35902/inc/GameBoyBus.h
View File

@ -34,10 +34,10 @@ namespace EightBit {
Bus() noexcept;
LR35902& CPU() { return m_cpu; }
Ram& VRAM() { return m_videoRam; }
Ram& OAMRAM() { return m_oamRam; }
IoRegisters& IO() { return m_ioPorts; }
auto& CPU() { return m_cpu; }
auto& VRAM() { return m_videoRam; }
auto& OAMRAM() { return m_oamRam; }
auto& IO() { return m_ioPorts; }
void reset();

8
LR35902/inc/IoRegisters.h
View File

@ -113,7 +113,7 @@ namespace EightBit {
void transferDma();
void triggerInterrupt(int cause) {
void triggerInterrupt(const int cause) {
poke(IF, peek(IF) | cause);
}
@ -136,8 +136,8 @@ namespace EightBit {
void disableBootRom() { m_disableBootRom = true; }
void enableBootRom() { m_disableBootRom = false; }
bool bootRomDisabled() const { return m_disableBootRom; }
bool bootRomEnabled() const { return !bootRomDisabled(); }
auto bootRomDisabled() const { return m_disableBootRom; }
auto bootRomEnabled() const { return !bootRomDisabled(); }
void pressRight() { m_p14 = m_p10 = false; triggerKeypadInterrupt(); }
void releaseRight() { m_p14 = m_p10 = true; }
@ -187,7 +187,7 @@ namespace EightBit {
void checkTimer(int cycles);
void mask(uint16_t address, uint8_t masking) {
void mask(const uint16_t address, const uint8_t masking) {
poke(address, peek(address) | ~masking);
}

12
LR35902/inc/LR35902.h
View File

@ -26,7 +26,7 @@ namespace EightBit {
Signal<LR35902> ExecutingInstruction;
Signal<LR35902> ExecutedInstruction;
int clockCycles() const {
auto clockCycles() const {
return cycles() * 4;
}
@ -61,7 +61,7 @@ namespace EightBit {
bool& IME() { return m_ime; }
uint8_t R(const int r) {
auto R(const int r) {
ASSUME(r >= 0);
ASSUME(r <= 7);
switch (r) {
@ -119,7 +119,7 @@ namespace EightBit {
}
}
register16_t& RP(const int rp) {
auto& RP(const int rp) {
ASSUME(rp >= 0);
ASSUME(rp <= 3);
switch (rp) {
@ -136,7 +136,7 @@ namespace EightBit {
}
}
register16_t& RP2(const int rp) {
auto& RP2(const int rp) {
ASSUME(rp >= 0);
ASSUME(rp <= 3);
switch (rp) {
@ -153,11 +153,11 @@ namespace EightBit {
}
}
void adjustHalfCarryAdd(uint8_t before, uint8_t value, int calculation) {
void adjustHalfCarryAdd(const uint8_t before, const uint8_t value, const int calculation) {
setFlag(F(), HC, calculateHalfCarryAdd(before, value, calculation));
}
void adjustHalfCarrySub(uint8_t before, uint8_t value, int calculation) {
void adjustHalfCarrySub(const uint8_t before, const uint8_t value, const int calculation) {
setFlag(F(), HC, calculateHalfCarrySub(before, value, calculation));
}

20
LR35902/inc/ObjectAttribute.h
View File

@ -14,18 +14,18 @@ namespace EightBit {
ObjectAttribute() = default;
ObjectAttribute(Ram& ram, uint16_t address);
uint8_t positionY() const { return m_positionY; }
uint8_t positionX() const { return m_positionX; }
uint8_t pattern() const { return m_pattern; }
uint8_t flags() const { return m_flags; }
auto positionY() const { return m_positionY; }
auto positionX() const { return m_positionX; }
auto pattern() const { return m_pattern; }
auto flags() const { return m_flags; }
uint8_t priority() const { return flags() & Chip::Bit7; }
auto priority() const { return flags() & Chip::Bit7; }
bool highPriority() const { return !!priority(); }
bool lowPriority() const { return !priority(); }
bool flipY() const { return !!(flags() & Chip::Bit6); }
bool flipX() const { return !!(flags() & Chip::Bit5); }
int palette() const { return (flags() & Chip::Bit4) >> 3; }
auto highPriority() const { return !!priority(); }
auto lowPriority() const { return !priority(); }
auto flipY() const { return !!(flags() & Chip::Bit6); }
auto flipX() const { return !!(flags() & Chip::Bit5); }
auto palette() const { return (flags() & Chip::Bit4) >> 3; }
private:
uint8_t m_positionY;

2
LR35902/src/IoRegisters.cpp
View File

@ -130,7 +130,7 @@ void EightBit::GameBoy::IoRegisters::Bus_WrittenByte(EightBit::EventArgs) {
case SCX:
break;
case DMA:
m_dmaAddress = register16_t(0, value);
m_dmaAddress = { 0, value };
m_dmaTransferActive = true;
break;
case LY: // R/O

68
LR35902/src/LR35902.cpp
View File

@ -10,14 +10,14 @@ EightBit::GameBoy::LR35902::LR35902(Bus& memory)
}
void EightBit::GameBoy::LR35902::handleRESET() {
Processor::handleRESET();
IntelProcessor::handleRESET();
di();
SP() = Mask16 - 1;
addCycles(4);
}
void EightBit::GameBoy::LR35902::handleINT() {
Processor::handleINT();
IntelProcessor::handleINT();
raise(HALT());
di();
restart(BUS().DATA());
@ -44,7 +44,7 @@ void EightBit::GameBoy::LR35902::decrement(uint8_t& operand) {
adjustZero<LR35902>(F(), --operand);
}
bool EightBit::GameBoy::LR35902::jrConditionalFlag(int flag) {
bool EightBit::GameBoy::LR35902::jrConditionalFlag(const int flag) {
switch (flag) {
case 0: // NZ
return jrConditional(!(F() & ZF));
@ -60,7 +60,7 @@ bool EightBit::GameBoy::LR35902::jrConditionalFlag(int flag) {
throw std::logic_error("Unhandled JR conditional");
}
bool EightBit::GameBoy::LR35902::jumpConditionalFlag(int flag) {
bool EightBit::GameBoy::LR35902::jumpConditionalFlag(const int flag) {
switch (flag) {
case 0: // NZ
return jumpConditional(!(F() & ZF));
@ -81,7 +81,7 @@ void EightBit::GameBoy::LR35902::reti() {
ei();
}
bool EightBit::GameBoy::LR35902::returnConditionalFlag(int flag) {
bool EightBit::GameBoy::LR35902::returnConditionalFlag(const int flag) {
switch (flag) {
case 0: // NZ
return returnConditional(!(F() & ZF));
@ -97,7 +97,7 @@ bool EightBit::GameBoy::LR35902::returnConditionalFlag(int flag) {
throw std::logic_error("Unhandled RET conditional");
}
bool EightBit::GameBoy::LR35902::callConditionalFlag(int flag) {
bool EightBit::GameBoy::LR35902::callConditionalFlag(const int flag) {
switch (flag) {
case 0: // NZ
return callConditional(!(F() & ZF));
@ -113,7 +113,7 @@ bool EightBit::GameBoy::LR35902::callConditionalFlag(int flag) {
throw std::logic_error("Unhandled CALL conditional");
}
void EightBit::GameBoy::LR35902::add(register16_t& operand, register16_t value) {
void EightBit::GameBoy::LR35902::add(register16_t& operand, const register16_t value) {
MEMPTR() = operand;
@ -126,7 +126,7 @@ void EightBit::GameBoy::LR35902::add(register16_t& operand, register16_t value)
adjustHalfCarryAdd(MEMPTR().high, value.high, operand.high);
}
void EightBit::GameBoy::LR35902::add(uint8_t& operand, uint8_t value, int carry) {
void EightBit::GameBoy::LR35902::add(uint8_t& operand, const uint8_t value, const int carry) {
const register16_t result = operand + value + carry;
@ -139,11 +139,11 @@ void EightBit::GameBoy::LR35902::add(uint8_t& operand, uint8_t value, int carry)
adjustZero<LR35902>(F(), operand);
}
void EightBit::GameBoy::LR35902::adc(uint8_t& operand, uint8_t value) {
void EightBit::GameBoy::LR35902::adc(uint8_t& operand, const uint8_t value) {
add(operand, value, (F() & CF) >> 4);
}
void EightBit::GameBoy::LR35902::subtract(uint8_t& operand, uint8_t value, int carry) {
void EightBit::GameBoy::LR35902::subtract(uint8_t& operand, const uint8_t value, const int carry) {
const register16_t result = operand - value - carry;
@ -156,82 +156,82 @@ void EightBit::GameBoy::LR35902::subtract(uint8_t& operand, uint8_t value, int c
adjustZero<LR35902>(F(), operand);
}
void EightBit::GameBoy::LR35902::sbc(uint8_t value) {
void EightBit::GameBoy::LR35902::sbc(const uint8_t value) {
subtract(A(), value, (F() & CF) >> 4);
}
void EightBit::GameBoy::LR35902::andr(uint8_t& operand, uint8_t value) {
void EightBit::GameBoy::LR35902::andr(uint8_t& operand, const uint8_t value) {
setFlag(F(), HC);
clearFlag(F(), CF | NF);
adjustZero<LR35902>(F(), operand &= value);
}
void EightBit::GameBoy::LR35902::xorr(uint8_t value) {
void EightBit::GameBoy::LR35902::xorr(const uint8_t value) {
clearFlag(F(), HC | CF | NF);
adjustZero<LR35902>(F(), A() ^= value);
}
void EightBit::GameBoy::LR35902::orr(uint8_t value) {
void EightBit::GameBoy::LR35902::orr(const uint8_t value) {
clearFlag(F(), HC | CF | NF);
adjustZero<LR35902>(F(), A() |= value);
}
void EightBit::GameBoy::LR35902::compare(uint8_t check, uint8_t value) {
void EightBit::GameBoy::LR35902::compare(uint8_t check, const uint8_t value) {
subtract(check, value);
}
uint8_t EightBit::GameBoy::LR35902::rlc(uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::rlc(const uint8_t operand) {
clearFlag(F(), NF | HC | ZF);
const auto carry = operand & Bit7;
setFlag(F(), CF, carry);
return (operand << 1) | (carry >> 7);
}
uint8_t EightBit::GameBoy::LR35902::rrc(uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::rrc(const uint8_t operand) {
clearFlag(F(), NF | HC | ZF);
const auto carry = operand & Bit0;
setFlag(F(), CF, carry);
return (operand >> 1) | (carry << 7);
}
uint8_t EightBit::GameBoy::LR35902::rl(uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::rl(const uint8_t operand) {
clearFlag(F(), NF | HC | ZF);
const auto carry = F() & CF;
setFlag(F(), CF, operand & Bit7);
return (operand << 1) | (carry >> 4); // CF at Bit4
}
uint8_t EightBit::GameBoy::LR35902::rr(uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::rr(const uint8_t operand) {
clearFlag(F(), NF | HC | ZF);
const auto carry = F() & CF;
setFlag(F(), CF, operand & Bit0);
return (operand >> 1) | (carry << 3); // CF at Bit4
}
uint8_t EightBit::GameBoy::LR35902::sla(uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::sla(const uint8_t operand) {
clearFlag(F(), NF | HC | ZF);
setFlag(F(), CF, operand & Bit7);
return operand << 1;
}
uint8_t EightBit::GameBoy::LR35902::sra(uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::sra(const uint8_t operand) {
clearFlag(F(), NF | HC | ZF);
setFlag(F(), CF, operand & Bit0);
return (operand >> 1) | (operand & Bit7);
}
uint8_t EightBit::GameBoy::LR35902::swap(uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::swap(const uint8_t operand) {
clearFlag(F(), NF | HC | CF);
return promoteNibble(operand) | demoteNibble(operand);
}
uint8_t EightBit::GameBoy::LR35902::srl(uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::srl(const uint8_t operand) {
clearFlag(F(), NF | HC | ZF);
setFlag(F(), CF, operand & Bit0);
return (operand >> 1) & ~Bit7;
}
uint8_t EightBit::GameBoy::LR35902::bit(int n, uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::bit(const int n, const uint8_t operand) {
const auto carry = F() & CF;
uint8_t discarded = operand;
andr(discarded, 1 << n);
@ -239,11 +239,11 @@ uint8_t EightBit::GameBoy::LR35902::bit(int n, uint8_t operand) {
return operand;
}
uint8_t EightBit::GameBoy::LR35902::res(int n, uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::res(const int n, const uint8_t operand) {
return operand & ~(1 << n);
}
uint8_t EightBit::GameBoy::LR35902::set(int n, uint8_t operand) {
uint8_t EightBit::GameBoy::LR35902::set(const int n, const uint8_t operand) {
return operand | (1 << n);
}
@ -295,7 +295,7 @@ int EightBit::GameBoy::LR35902::step() {
const auto interruptEnable = BUS().peek(IoRegisters::BASE + IoRegisters::IE);
const auto interruptFlags = m_bus.IO().peek(IoRegisters::IF);
auto masked = interruptEnable & interruptFlags;
const auto masked = interruptEnable & interruptFlags;
if (masked) {
if (IME()) {
m_bus.IO().poke(IoRegisters::IF, 0);
@ -326,7 +326,7 @@ int EightBit::GameBoy::LR35902::step() {
return clockCycles();
}
int EightBit::GameBoy::LR35902::execute(uint8_t opcode) {
int EightBit::GameBoy::LR35902::execute(const uint8_t opcode) {
const auto& decoded = getDecodedOpcode(opcode);
@ -348,7 +348,7 @@ int EightBit::GameBoy::LR35902::execute(uint8_t opcode) {
return clockCycles();
}
void EightBit::GameBoy::LR35902::executeCB(int x, int y, int z, int p, int q) {
void EightBit::GameBoy::LR35902::executeCB(const int x, const int y, const int z, const int p, const int q) {
switch (x) {
case 0: { // rot[y] r[z]
auto operand = R(z);
@ -409,7 +409,7 @@ void EightBit::GameBoy::LR35902::executeCB(int x, int y, int z, int p, int q) {
}
}
void EightBit::GameBoy::LR35902::executeOther(int x, int y, int z, int p, int q) {
void EightBit::GameBoy::LR35902::executeOther(const int x, const int y, const int z, const int p, const int q) {
switch (x) {
case 0:
switch (z) {
@ -712,8 +712,8 @@ void EightBit::GameBoy::LR35902::executeOther(int x, int y, int z, int p, int q)
addCycles(2);
break;
case 5: // GB: LD (nn),A
MEMPTR() = fetchWord();
BUS().write(MEMPTR(), A());
BUS().ADDRESS() = MEMPTR() = fetchWord();
BUS().write(A());
addCycles(4);
break;
case 6: // GB: LD A,(FF00 + C)
@ -721,8 +721,8 @@ void EightBit::GameBoy::LR35902::executeOther(int x, int y, int z, int p, int q)
addCycles(2);
break;
case 7: // GB: LD A,(nn)
MEMPTR() = fetchWord();
A() = BUS().read(MEMPTR());
BUS().ADDRESS() = MEMPTR() = fetchWord();
A() = BUS().read();
addCycles(4);
break;
default:

2
LR35902/src/Profiler.cpp
View File

@ -10,7 +10,7 @@ EightBit::GameBoy::Profiler::Profiler(Bus& bus, LR35902& cpu)
std::fill(m_addresses.begin(), m_addresses.end(), 0);
}
void EightBit::GameBoy::Profiler::add(uint16_t address, uint8_t instruction) {
void EightBit::GameBoy::Profiler::add(const uint16_t address, const uint8_t instruction) {
m_instructions[instruction]++;