6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-08-10 23:25:02 +00:00
Code Issues Projects Releases Wiki Activity

Refactor the Intel 8080 core for C++17/14

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon
2018-10-27 18:51:30 +01:00
parent fac2da9ac4
commit b9ca27feb3
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Intel8080/inc/Intel8080.h
View File

@@ -49,7 +49,7 @@ namespace EightBit {
register16_t de = 0xffff; register16_t de = 0xffff;
register16_t hl = 0xffff; register16_t hl = 0xffff;
uint8_t R(int r) { auto R(const int r) {
switch (r) { switch (r) {
case 0b000: case 0b000:
return B(); return B();
@@ -72,7 +72,7 @@ namespace EightBit {
} }
} }
void R(int r, uint8_t value) { void R(int r, const uint8_t value) {
switch (r) { switch (r) {
case 0b000: case 0b000:
B() = value; B() = value;
@@ -103,7 +103,7 @@ namespace EightBit {
} }
} }
register16_t& RP(int rp) { auto& RP(const int rp) {
switch (rp) { switch (rp) {
case 0b00: case 0b00:
return BC(); return BC();
@@ -118,7 +118,7 @@ namespace EightBit {
} }
} }
register16_t& RP2(int rp) { auto& RP2(const int rp) {
switch (rp) { switch (rp) {
case 0b00: case 0b00:
return BC(); return BC();

38
Intel8080/src/Intel8080.cpp
View File

@@ -24,14 +24,14 @@ EightBit::register16_t& EightBit::Intel8080::HL() {
} }
void EightBit::Intel8080::handleRESET() { void EightBit::Intel8080::handleRESET() {
Processor::handleRESET(); IntelProcessor::handleRESET();
di(); di();
addCycles(3); addCycles(3);
} }
void EightBit::Intel8080::handleINT() { void EightBit::Intel8080::handleINT() {
Processor::handleINT(); IntelProcessor::handleINT();
raise(HALT()); raise(HALT());
if (m_interruptEnable) { if (m_interruptEnable) {
di(); di();
@@ -104,7 +104,7 @@ bool EightBit::Intel8080::returnConditionalFlag(const int flag) {
} }
} }
bool EightBit::Intel8080::callConditionalFlag(int flag) { bool EightBit::Intel8080::callConditionalFlag(const int flag) {
switch (flag) { switch (flag) {
case 0: // NZ case 0: // NZ
return callConditional(!(F() & ZF)); return callConditional(!(F() & ZF));
@@ -127,13 +127,13 @@ bool EightBit::Intel8080::callConditionalFlag(int flag) {
} }
} }
void EightBit::Intel8080::add(register16_t value) { void EightBit::Intel8080::add(const register16_t value) {
const auto result = HL().word + value.word; const auto result = HL().word + value.word;
HL() = result; HL() = result;
setFlag(F(), CF, result & Bit16); setFlag(F(), CF, result & Bit16);
} }
void EightBit::Intel8080::add(uint8_t value, int carry) { void EightBit::Intel8080::add(const uint8_t value, const int carry) {
const register16_t result = A() + value + carry; const register16_t result = A() + value + carry;
@@ -145,11 +145,11 @@ void EightBit::Intel8080::add(uint8_t value, int carry) {
adjustSZP<Intel8080>(F(), A()); adjustSZP<Intel8080>(F(), A());
} }
void EightBit::Intel8080::adc(uint8_t value) { void EightBit::Intel8080::adc(const uint8_t value) {
add(value, F() & CF); add(value, F() & CF);
} }
void EightBit::Intel8080::subtract(uint8_t& operand, uint8_t value, int carry) { void EightBit::Intel8080::subtract(uint8_t& operand, const uint8_t value, const int carry) {
const register16_t result = operand - value - carry; const register16_t result = operand - value - carry;
@@ -161,22 +161,22 @@ void EightBit::Intel8080::subtract(uint8_t& operand, uint8_t value, int carry) {
adjustSZP<Intel8080>(F(), operand); adjustSZP<Intel8080>(F(), operand);
} }
void EightBit::Intel8080::sbb(uint8_t value) { void EightBit::Intel8080::sbb(const uint8_t value) {
subtract(A(), value, F() & CF); subtract(A(), value, F() & CF);
} }
void EightBit::Intel8080::andr(uint8_t value) { void EightBit::Intel8080::andr(const uint8_t value) {
setFlag(F(), AC, (A() | value) & Bit3); setFlag(F(), AC, (A() | value) & Bit3);
clearFlag(F(), CF); clearFlag(F(), CF);
adjustSZP<Intel8080>(F(), A() &= value); adjustSZP<Intel8080>(F(), A() &= value);
} }
void EightBit::Intel8080::xorr(uint8_t value) { void EightBit::Intel8080::xorr(const uint8_t value) {
clearFlag(F(), AC | CF); clearFlag(F(), AC | CF);
adjustSZP<Intel8080>(F(), A() ^= value); adjustSZP<Intel8080>(F(), A() ^= value);
} }
void EightBit::Intel8080::orr(uint8_t value) { void EightBit::Intel8080::orr(const uint8_t value) {
clearFlag(F(), AC | CF); clearFlag(F(), AC | CF);
adjustSZP<Intel8080>(F(), A() |= value); adjustSZP<Intel8080>(F(), A() |= value);
} }
@@ -187,13 +187,13 @@ void EightBit::Intel8080::compare(const uint8_t value) {
} }
void EightBit::Intel8080::rlc() { void EightBit::Intel8080::rlc() {
auto carry = A() & Bit7; const auto carry = A() & Bit7;
A() = (A() << 1) | (carry >> 7); A() = (A() << 1) | (carry >> 7);
setFlag(F(), CF, carry); setFlag(F(), CF, carry);
} }
void EightBit::Intel8080::rrc() { void EightBit::Intel8080::rrc() {
auto carry = A() & Bit0; const auto carry = A() & Bit0;
A() = (A() >> 1) | (carry << 7); A() = (A() >> 1) | (carry << 7);
setFlag(F(), CF, carry); setFlag(F(), CF, carry);
} }
@@ -247,8 +247,8 @@ void EightBit::Intel8080::xhtl() {
H() = MEMPTR().high; H() = MEMPTR().high;
} }
void EightBit::Intel8080::writePort(uint8_t port) { void EightBit::Intel8080::writePort(const uint8_t port) {
BUS().ADDRESS() = register16_t(port, A()); BUS().ADDRESS() = { port, A() };
BUS().DATA() = A(); BUS().DATA() = A();
writePort(); writePort();
} }
@@ -257,8 +257,8 @@ void EightBit::Intel8080::writePort() {
m_ports.write(BUS().ADDRESS().low, BUS().DATA()); m_ports.write(BUS().ADDRESS().low, BUS().DATA());
} }
uint8_t EightBit::Intel8080::readPort(uint8_t port) { uint8_t EightBit::Intel8080::readPort(const uint8_t port) {
BUS().ADDRESS() = register16_t(port, A()); BUS().ADDRESS() = { port, A() };
return readPort(); return readPort();
} }
@@ -284,7 +284,7 @@ int EightBit::Intel8080::step() {
return cycles(); return cycles();
} }
int EightBit::Intel8080::execute(uint8_t opcode) { int EightBit::Intel8080::execute(const uint8_t opcode) {
const auto& decoded = getDecodedOpcode(opcode); const auto& decoded = getDecodedOpcode(opcode);
@@ -301,7 +301,7 @@ int EightBit::Intel8080::execute(uint8_t opcode) {
return cycles(); return cycles();
} }
void EightBit::Intel8080::execute(int x, int y, int z, int p, int q) { void EightBit::Intel8080::execute(const int x, const int y, const int z, const int p, const int q) {
switch (x) { switch (x) {
case 0: case 0:
switch (z) { switch (z) {