Correct a couple of inconsistencies in the test harness.

Signed-off-by: Adrian.Conlon <adrian.conlon@gmail.com>
This commit is contained in:
Adrian.Conlon 2017-07-05 17:40:16 +01:00
parent 983639d530
commit 0e7ad4dd01
3 changed files with 6 additions and 8 deletions

View File

@ -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();

View File

@ -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();

View File

@ -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();
}