mirror of
https://github.com/MoleskiCoder/EightBit.git
synced 2024-12-23 00:29:47 +00:00
Correct a couple of inconsistencies in the test harness.
Signed-off-by: Adrian.Conlon <adrian.conlon@gmail.com>
This commit is contained in:
parent
983639d530
commit
0e7ad4dd01
@ -14,9 +14,8 @@ class Board {
|
||||
public:
|
||||
Board(const Configuration& configuration);
|
||||
|
||||
EightBit::Memory& getMemory() { return m_memory; }
|
||||
const EightBit::Intel8080& getCPU() const { return m_cpu; }
|
||||
EightBit::Intel8080& getCPUMutable() { return m_cpu; }
|
||||
EightBit::Memory& Memory() { return m_memory; }
|
||||
EightBit::Intel8080& CPU() { return m_cpu; }
|
||||
|
||||
void initialise();
|
||||
|
||||
|
@ -14,9 +14,8 @@ class Board {
|
||||
public:
|
||||
Board(const Configuration& configuration);
|
||||
|
||||
EightBit::Memory& getMemory() { return m_memory; }
|
||||
const EightBit::Z80& getCPU() const { return m_cpu; }
|
||||
EightBit::Z80& getCPUMutable() { return m_cpu; }
|
||||
EightBit::Memory& Memory() { return m_memory; }
|
||||
EightBit::Z80& CPU() { return m_cpu; }
|
||||
|
||||
void initialise();
|
||||
|
||||
|
@ -12,7 +12,7 @@ namespace EightBit {
|
||||
}
|
||||
|
||||
~TestHarness() {
|
||||
std::cout << std::endl;
|
||||
std::cout << std::dec << std::endl;
|
||||
std::cout.imbue(std::locale(""));
|
||||
|
||||
std::cout << "Guest cycles = " << m_totalCycles << std::endl;
|
||||
@ -44,7 +44,7 @@ namespace EightBit {
|
||||
m_totalCycles = 0UL;
|
||||
m_startHostCycles = currentHostCycles();
|
||||
|
||||
auto& cpu = m_board.getCPUMutable();
|
||||
auto& cpu = m_board.CPU();
|
||||
while (!cpu.isHalted()) {
|
||||
m_totalCycles += cpu.step();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user