Correct a couple of small compilation issues.

Signed-off-by: Adrian.Conlon <adrian.conlon@arup.com>
This commit is contained in:
Adrian.Conlon 2017-06-19 18:08:13 +01:00
parent 67fa2a7afe
commit a4f8770eb0
5 changed files with 8 additions and 4 deletions

View File

@ -591,7 +591,7 @@ void EightBit::Disassembler::disassembleOther(
specification = "JP (HL)";
break;
case 3: // LD SP,HL
specification = "LD SP,Hl";
specification = "LD SP,HL";
break;
}
}

View File

@ -798,7 +798,7 @@ void EightBit::Z80::rrd() {
auto memory = memptrReference();
m_memory.reference() = promoteNibble(a) | highNibble(memory);
a = (a & 0xf0) | lowNibble(memory);
adjustSZPXY(f, A());
adjustSZPXY(f, a);
clearFlag(f, NF | HC);
}

View File

@ -5,7 +5,8 @@
Board::Board(const Configuration& configuration)
: m_configuration(configuration),
m_memory(0x3fff),
m_cpu(EightBit::Z80(m_memory, m_ports)) {
m_cpu(EightBit::Z80(m_memory, m_ports)),
m_profiler(m_cpu, m_disassembler) {
}
void Board::initialise() {

View File

@ -25,8 +25,8 @@ private:
EightBit::Memory m_memory;
EightBit::InputOutput m_ports;
EightBit::Z80 m_cpu;
EightBit::Profiler m_profiler;
EightBit::Disassembler m_disassembler;
EightBit::Profiler m_profiler;
void Cpu_ExecutingInstruction_Cpm(const EightBit::Z80& cpu);

View File

@ -1,5 +1,8 @@
#pragma once
#include <cstdint>
#include <array>
#include "Processor.h"
namespace EightBit {