diff --git a/Z80/src/Disassembler.cpp b/Z80/src/Disassembler.cpp index 725760f..6524d02 100644 --- a/Z80/src/Disassembler.cpp +++ b/Z80/src/Disassembler.cpp @@ -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; } } diff --git a/Z80/src/Z80.cpp b/Z80/src/Z80.cpp index f23eb1b..3e9d769 100644 --- a/Z80/src/Z80.cpp +++ b/Z80/src/Z80.cpp @@ -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); } diff --git a/Z80/test/Board.cpp b/Z80/test/Board.cpp index 8dec512..a6843e0 100644 --- a/Z80/test/Board.cpp +++ b/Z80/test/Board.cpp @@ -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() { diff --git a/Z80/test/Board.h b/Z80/test/Board.h index 0eda262..dfb4eaf 100644 --- a/Z80/test/Board.h +++ b/Z80/test/Board.h @@ -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); diff --git a/inc/IntelProcessor.h b/inc/IntelProcessor.h index 5924cf1..3927f07 100644 --- a/inc/IntelProcessor.h +++ b/inc/IntelProcessor.h @@ -1,5 +1,8 @@ #pragma once +#include +#include + #include "Processor.h" namespace EightBit {