6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-09-27 02:54:59 +00:00
Code Issues Projects Releases Wiki Activity

Correct some possible one definition rule issues.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2017-11-05 14:48:15 +00:00
parent 7a0ebb9198
commit b3114ed520
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Z80/inc/Z80.h
View File

@ -4,15 +4,13 @@
#include <cassert>
#include <stdexcept>
#include <Bus.h>
#include <InputOutput.h>
#include <IntelProcessor.h>
#include <Signal.h>
#include <Register.h>
namespace EightBit {
class InputOutput;
class Bus;
class Z80 : public IntelProcessor {
public:
struct refresh_t {
@ -60,21 +58,10 @@ namespace EightBit {
virtual int execute(uint8_t opcode);
int step();
virtual register16_t& AF() override {
return m_accumulatorFlags[m_accumulatorFlagsSet];
}
virtual register16_t& BC() override {
return m_registers[m_registerSet][BC_IDX];
}
virtual register16_t& DE() override {
return m_registers[m_registerSet][DE_IDX];
}
virtual register16_t& HL() override {
return m_registers[m_registerSet][HL_IDX];
}
virtual register16_t& AF() override;
virtual register16_t& BC() override;
virtual register16_t& DE() override;
virtual register16_t& HL() override;
register16_t& IX() { return m_ix; }
uint8_t& IXH() { return IX().high; }
@ -103,10 +90,7 @@ namespace EightBit {
virtual void reset() override;
protected:
virtual int fetchExecute() override {
M1() = true;
return IntelProcessor::fetchExecute();
}
virtual int fetchExecute() override;
private:
InputOutput& m_ports;

21
Z80/src/Z80.cpp
View File

@ -24,6 +24,27 @@ EightBit::Z80::Z80(Bus& bus, InputOutput& ports)
IY().word = 0xffff;
}
EightBit::register16_t& EightBit::Z80::AF() {
return m_accumulatorFlags[m_accumulatorFlagsSet];
}
EightBit::register16_t& EightBit::Z80::BC() {
return m_registers[m_registerSet][BC_IDX];
}
EightBit::register16_t& EightBit::Z80::DE() {
return m_registers[m_registerSet][DE_IDX];
}
EightBit::register16_t& EightBit::Z80::HL() {
return m_registers[m_registerSet][HL_IDX];
}
int EightBit::Z80::fetchExecute() {
M1() = true;
return IntelProcessor::fetchExecute();
}
void EightBit::Z80::reset() {
IntelProcessor::reset();