6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-12-29 07:30:14 +00:00
Code Issues Projects Releases Wiki Activity

Correct a couple of small issues in the Z80 disassembler.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2019-11-02 17:29:21 +00:00
parent 717b0c70ad
commit b95614c65d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Z80/src/Disassembler.cpp
View File

@ -237,13 +237,7 @@ void EightBit::Disassembler::disassemble(std::ostringstream& output, Z80& cpu, u
for (int i = 0; i < dumpCount; ++i)
output << hex(BUS().peek(pc + i + 1));
auto outputFormatSpecification = !m_prefixDD;
if (m_prefixDD) {
if (m_opcode != 0xdd) {
outputFormatSpecification = true;
}
}
const auto outputFormatSpecification = !m_prefixDD || (m_prefixDD && m_opcode != 0xdd) && !specification.empty();
if (outputFormatSpecification) {
output << '\t';
m_formatter.parse(specification);
@ -331,6 +325,7 @@ void EightBit::Disassembler::disassembleED(
specification = "ADC HL," + RP(p);
break;
}
break;
case 3:
switch (q) {
case 0: // LD (nn),rp
@ -704,14 +699,17 @@ void EightBit::Disassembler::disassembleOther(
case 1: // DD prefix
m_displaced = m_prefixDD = true;
disassemble(output, cpu, pc + 1);
//m_prefixDD = false;
break;
case 2: // ED prefix
m_prefixED = true;
disassemble(output, cpu, pc + 1);
//m_prefixED = false;
break;
case 3: // FD prefix
m_displaced = m_prefixFD = true;
disassemble(output, cpu, pc + 1);
//m_prefixFD = false;
break;
}
}