6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-01-11 02:29:50 +00:00
Code Issues Projects Releases Wiki Activity

Modify the 6809 disassembler a little to give output more like xroar (for comparison purposes)

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2018-08-30 01:37:09 +01:00
parent c85176431b
commit 8e0c1ebcde
4 changed files with 61 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MC6809/inc/Disassembly.h
View File

@ -10,11 +10,11 @@ namespace EightBit {
public:
Disassembly(mc6809& processor);
std::string disassemble(uint16_t current);
std::string disassemble(register16_t current);
std::string disassemble();
bool ignore();
std::string dumpState();
std::string trace(uint16_t current);
std::string trace(register16_t current);
std::string trace();
private:
mc6809& m_cpu;
@ -32,6 +32,10 @@ namespace EightBit {
static std::string dump_RelativeValue(int16_t value);
static std::string dump_RelativeValue(register16_t value);
std::string disassemble(uint16_t current);
std::string disassemble(register16_t current);
std::string disassemble();
static void dump(std::ostream& out, int value, int width);
mc6809& CPU() { return m_cpu; }

69
MC6809/src/Disassembly.cpp
View File

@ -25,7 +25,7 @@ std::string EightBit::Disassembly::dump_Flags(uint8_t value) {
}
void EightBit::Disassembly::dump(std::ostream& out, int value, int width) {
out << std::hex << std::uppercase << std::setw(width) << std::setfill('0') << value;
out << std::hex << std::nouppercase << std::setw(width) << std::setfill('0') << value;
}
std::string EightBit::Disassembly::dump_ByteValue(uint8_t value) {
@ -62,18 +62,30 @@ std::string EightBit::Disassembly::dump_RelativeValue(int16_t value) {
//
std::string EightBit::Disassembly::dumpState() {
std::string EightBit::Disassembly::trace() {
return trace(CPU().PC());
}
std::string EightBit::Disassembly::trace(register16_t current) {
return trace(current.word);
}
std::string EightBit::Disassembly::trace(uint16_t current) {
std::ostringstream output;
output << "PC=" << dump_WordValue(CPU().PC()) << ":";
output << "CC=" << dump_Flags(CPU().CC()) << ",";
output << "D=" << dump_WordValue(CPU().D()) << ",";
output << "X=" << dump_WordValue(CPU().X()) << ",";
output << "Y=" << dump_WordValue(CPU().Y()) << ",";
output << "U=" << dump_WordValue(CPU().U()) << ",";
output << "S=" << dump_WordValue(CPU().S()) << ",";
output << "DP=" << dump_ByteValue(CPU().DP()) << "\t";
output
<< dump_WordValue(current) << "| "
<< disassemble(current)
<< "\t\t"
<< "cc=" << dump_ByteValue(CPU().CC()) << " "
<< "a=" << dump_ByteValue(CPU().A()) << " "
<< "b=" << dump_ByteValue(CPU().B()) << " "
<< "dp=" << dump_ByteValue(CPU().DP()) << " "
<< "x=" << dump_WordValue(CPU().X()) << " "
<< "y=" << dump_WordValue(CPU().Y()) << " "
<< "u=" << dump_WordValue(CPU().U()) << " "
<< "s=" << dump_WordValue(CPU().S());
return output.str();
}
@ -88,28 +100,27 @@ std::string EightBit::Disassembly::disassemble(register16_t current) {
return disassemble(current.word);
}
bool EightBit::Disassembly::ignore() {
return
CPU().lowered(CPU().HALT())
|| CPU().lowered(CPU().RESET())
|| CPU().lowered(CPU().NMI())
|| (CPU().lowered(CPU().FIRQ()) && !(CPU().CC() & mc6809::FF))
|| (CPU().lowered(CPU().IRQ()) && !(CPU().CC() & mc6809::IF));
}
std::string EightBit::Disassembly::disassemble(uint16_t current) {
m_address = current;
std::ostringstream output;
if (CPU().powered()) {
const bool ignore =
CPU().lowered(CPU().HALT())
|| CPU().lowered(CPU().RESET())
|| CPU().lowered(CPU().NMI())
|| (CPU().lowered(CPU().FIRQ()) && !(CPU().CC() & mc6809::FF))
|| (CPU().lowered(CPU().IRQ()) && !(CPU().CC() & mc6809::IF));
if (!ignore) {
if (m_prefix10)
output << disassemble10();
else if (m_prefix11)
output << disassemble11();
else
output << disassembleUnprefixed();
}
if (m_prefix10)
output << disassemble10();
else if (m_prefix11)
output << disassemble11();
else
output << disassembleUnprefixed();
}
return output.str();
@ -851,12 +862,14 @@ std::string EightBit::Disassembly::tfr(std::string mnemomic) {
std::ostringstream output;
output << "\t" << mnemomic << "\t";
const auto data = getByte(++m_address);
const auto reg1 = Processor::highNibble(data);
const auto reg2 = Processor::lowNibble(data);
output
<< dump_ByteValue(data)
<< "\t" << mnemomic << "\t";
const bool type8 = !!(reg1 & Processor::Bit3); // 8 bit?
if (type8)
output << referenceTransfer8(reg1) << "," << referenceTransfer8(reg2);

14
MC6809/test/Board.cpp
View File

@ -21,6 +21,7 @@ void Board::initialise() {
if (m_configuration.isDebugMode()) {
CPU().ExecutingInstruction.connect(std::bind(&Board::Cpu_ExecutingInstruction_Debug, this, std::placeholders::_1));
CPU().ExecutedInstruction.connect(std::bind(&Board::Cpu_ExecutedInstruction_Debug, this, std::placeholders::_1));
}
CPU().powerOn();
@ -28,12 +29,13 @@ void Board::initialise() {
}
void Board::Cpu_ExecutingInstruction_Debug(EightBit::mc6809&) {
const auto disassembled = m_disassembler.disassemble();
if (!disassembled.empty())
std::cout
<< m_disassembler.dumpState()
<< disassembled
<< std::endl;
m_disassembleAt = CPU().PC();
m_ignoreDisassembly = m_disassembler.ignore();
}
void Board::Cpu_ExecutedInstruction_Debug(EightBit::mc6809&) {
if (!m_ignoreDisassembly)
std::cout << m_disassembler.trace(m_disassembleAt) << std::endl;
}
uint8_t& Board::reference(uint16_t address) {

4
MC6809/test/Board.h
View File

@ -33,7 +33,11 @@ private:
EightBit::mc6809 m_cpu;
EightBit::Disassembly m_disassembler;
EightBit::register16_t m_disassembleAt = 0x0000;
bool m_ignoreDisassembly = false;
void pollKeyboard();
void Cpu_ExecutingInstruction_Debug(EightBit::mc6809& cpu);
void Cpu_ExecutedInstruction_Debug(EightBit::mc6809& cpu);
};