mirror of
https://github.com/markdavidlong/AppleSAWS.git
synced 2024-12-21 07:29:23 +00:00
Added Disassembler and DisassemblyViewer
This commit is contained in:
Mark Long
parent
6d05dcf7ed
commit
c707b58f4a
@ -15,6 +15,7 @@ INCLUDEPATH += src/binaryfile
|
||||
INCLUDEPATH += src/ui
|
||||
INCLUDEPATH += src/ui/viewers
|
||||
INCLUDEPATH += src/imported
|
||||
INCLUDEPATH += src/internals
|
||||
|
||||
DEFINES += WS_VIDEO
|
||||
|
||||
@ -37,7 +38,9 @@ SOURCES += \
|
||||
src/ui/viewers/hiresviewwidget.cxx \
|
||||
src/ui/viewers/applesoftfileviewer.cxx \
|
||||
src/applesoftfile/applesoftformatter.cxx \
|
||||
src/applesoftfile/applesoftline.cpp
|
||||
src/applesoftfile/applesoftline.cpp \
|
||||
src/internals/memory.cxx \
|
||||
src/ui/viewers/disassemblerviewer.cpp
|
||||
|
||||
HEADERS += \
|
||||
src/diskfiles/dos33/diskfile.h \
|
||||
@ -58,9 +61,12 @@ HEADERS += \
|
||||
src/ui/viewers/hiresviewwidget.h \
|
||||
src/ui/viewers/applesoftfileviewer.h \
|
||||
src/applesoftfile/applesoftformatter.h \
|
||||
src/applesoftfile/applesoftline.h
|
||||
src/applesoftfile/applesoftline.h \
|
||||
src/internals/memory.h \
|
||||
src/ui/viewers/disassemblerviewer.h
|
||||
|
||||
FORMS += \
|
||||
src/ui/catalogwidget.ui \
|
||||
src/ui/mainwindow.ui \
|
||||
src/ui/viewers/applesoftfileviewer.ui
|
||||
src/ui/viewers/applesoftfileviewer.ui \
|
||||
src/ui/viewers/disassemblerviewer.ui
|
||||
|
||||
@ -16,13 +16,11 @@ class ApplesoftFile : public GenericFile
|
||||
public:
|
||||
ApplesoftFile(QByteArray data = QByteArray());
|
||||
void setData(QByteArray data);
|
||||
void setFilename(QString filename) { m_filename = filename; }
|
||||
QByteArray extraData();
|
||||
QStringList extraDataHexValues();
|
||||
|
||||
QVector<ApplesoftLine> getLines() const { return m_lines; }
|
||||
|
||||
QString filename() const { return m_filename; }
|
||||
|
||||
private:
|
||||
void parse(quint16 start_address = 0x0801);
|
||||
@ -30,7 +28,6 @@ private:
|
||||
QVector<ApplesoftLine> m_lines;
|
||||
int m_data_end;
|
||||
quint16 m_length;
|
||||
QString m_filename;
|
||||
|
||||
friend class Retokenizer;
|
||||
};
|
||||
|
||||
@ -18,7 +18,7 @@ void BinaryFile::setData(QByteArray data)
|
||||
m_data = data.mid(4);
|
||||
m_address = (quint8) metadata[0] + ((quint8) metadata[1]*256);
|
||||
m_length = (quint8) metadata[2] + ((quint8) metadata[3]*256);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void BinaryFile::dump()
|
||||
|
||||
@ -1,13 +1,153 @@
|
||||
#include "disassembler.h"
|
||||
#include <QByteArray>
|
||||
#include <QDebug>
|
||||
#include <math.h>
|
||||
|
||||
|
||||
QStringList Disassembler::disassemble(quint16 address)
|
||||
QList<QStringList> Disassembler::disassemble(quint16 from, quint16 to) {
|
||||
QList<QStringList> retval;
|
||||
|
||||
// qDebug() << "From: " << from << " To: " << to;
|
||||
|
||||
quint16 next = 0;
|
||||
for (int idx = from; idx <= to; )
|
||||
{
|
||||
QStringList line = disassembleOp(quint16(idx), &next);
|
||||
retval.append(line);
|
||||
// qDebug() << idx << line.join(" ");
|
||||
idx = next ;
|
||||
if (idx > 0xffff || (next < from)) { qDebug() << "Breaking." ; break; }
|
||||
}
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
||||
QStringList Disassembler::disassembleOp(quint16 address, quint16 *nextAddress)
|
||||
{
|
||||
quint8 opcode = m_memimage[address];
|
||||
AssyInstruction op = m_opcodeinfo.at(opcode);
|
||||
AssyInstruction op = m_opcodeinfo[opcode];
|
||||
|
||||
QString disassemblyLine;
|
||||
QString hexValueString;
|
||||
QByteArray hexValues;
|
||||
hexValues.append(opcode);
|
||||
|
||||
for (int idx = 1; idx < op.numArgs()+1; idx++) {
|
||||
quint8 val = m_memimage[address+idx];
|
||||
hexValues.append(val);
|
||||
}
|
||||
|
||||
QString addressStr = QString("%1 ").arg(address,4,16,QChar('0')).toUpper();
|
||||
|
||||
for (int idx = 0; idx < hexValues.length(); idx++) {
|
||||
hexValueString.append(QString("%1 ").arg((quint8) hexValues[idx],2,16,QChar('0')));
|
||||
}
|
||||
|
||||
if (nextAddress) {
|
||||
*nextAddress = address + 1 + op.numArgs();
|
||||
}
|
||||
|
||||
switch (op.addressMode()) {
|
||||
case AM_InvalidOp: {
|
||||
disassemblyLine = op.mnemonic();
|
||||
break;
|
||||
}
|
||||
case AM_Absolute:{
|
||||
disassemblyLine = QString("%1 $%2%3").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[2],2,16,QChar('0'))
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_AbsoluteIndexedIndirect:{
|
||||
disassemblyLine = QString("%1 ($%2%3,x)").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[2],2,16,QChar('0'))
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_AbsoluteIndexedWithX:{
|
||||
disassemblyLine = QString("%1 $%2%3,x").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[2],2,16,QChar('0'))
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_AbsoluteIndexedWithY:{
|
||||
disassemblyLine = QString("%1 $%2%3,y").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[2],2,16,QChar('0'))
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_AbsoluteIndirect:{
|
||||
disassemblyLine = QString("%1 ($%2%3)").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[2],2,16,QChar('0'))
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_Immediate:{
|
||||
disassemblyLine = QString("%1 #$%2").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_Implied:{
|
||||
disassemblyLine = op.mnemonic();
|
||||
break;
|
||||
}
|
||||
case AM_Accumulator:{
|
||||
disassemblyLine = op.mnemonic();
|
||||
break;
|
||||
}
|
||||
case AM_ProgramCounterRelative:{
|
||||
qint8 offset = (qint8) hexValues[1];
|
||||
quint16 offsetAddress = address+2+offset;
|
||||
|
||||
disassemblyLine = QString("%1 $%2 {%3%4}").arg(op.mnemonic())
|
||||
.arg((quint16) offsetAddress,4,16,QChar('0'))
|
||||
.arg((offset<0)?"-":"+")
|
||||
.arg(abs(offset));
|
||||
break;
|
||||
}
|
||||
case AM_ZeroPage:{
|
||||
disassemblyLine = QString("%1 $%2").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_ZeroPageIndirectIndexedWithY:{
|
||||
disassemblyLine = QString("%1 ($%2),y").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_ZeroPageIndexedIndirect:{
|
||||
disassemblyLine = QString("%1 ($%2,x)").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_ZeroPageIndexedWithX:{
|
||||
disassemblyLine = QString("%1 $%2,x").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_ZeroPageIndexedWithY:{
|
||||
disassemblyLine = QString("%1 $%2,y").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
case AM_ZeroPageIndirect:{
|
||||
disassemblyLine = QString("%1 ($%2)").arg(op.mnemonic())
|
||||
.arg((quint8) hexValues[1],2,16,QChar('0'));
|
||||
break;
|
||||
}
|
||||
default:{
|
||||
disassemblyLine = op.mnemonic();
|
||||
qDebug() << "Unhandled Address Mode: " << op.addressMode();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
QStringList retval;
|
||||
retval.append(addressStr.trimmed());
|
||||
retval.append(hexValueString.trimmed().toUpper().leftJustified(12,' '));
|
||||
retval.append(disassemblyLine.toUpper());
|
||||
return retval;
|
||||
}
|
||||
|
||||
void Disassembler::makeOpcodeTable()
|
||||
@ -284,5 +424,278 @@ void Disassembler::makeOpcodeTable()
|
||||
m_opcodeinfo[0xef] = AssyInstruction(0xef, "???", AM_InvalidOp);
|
||||
m_opcodeinfo[0xff] = AssyInstruction(0xff, "???", AM_InvalidOp);
|
||||
|
||||
#ifdef UNUSED_OPCODES
|
||||
m_opcodeinfo[0x00] = AssyInstruction(0x00, "BRK", AM_Implied);
|
||||
m_opcodeinfo[0x10] = AssyInstruction(0x10, "BPL", AM_ProgramCounterRelative);
|
||||
m_opcodeinfo[0x20] = AssyInstruction(0x20, "JSR", AM_Absolute);
|
||||
m_opcodeinfo[0x30] = AssyInstruction(0x30, "BMI", AM_ProgramCounterRelative);
|
||||
m_opcodeinfo[0x40] = AssyInstruction(0x40, "RTI", AM_Implied);
|
||||
m_opcodeinfo[0x50] = AssyInstruction(0x50, "BVC", AM_ProgramCounterRelative);
|
||||
m_opcodeinfo[0x60] = AssyInstruction(0x60, "RTS", AM_Implied);
|
||||
m_opcodeinfo[0x70] = AssyInstruction(0x70, "BVS", AM_ProgramCounterRelative);
|
||||
m_opcodeinfo[0x80] = AssyInstruction(0x80, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0x90] = AssyInstruction(0x90, "BCC", AM_ProgramCounterRelative);
|
||||
m_opcodeinfo[0xa0] = AssyInstruction(0xa0, "LDY", AM_Immediate);
|
||||
m_opcodeinfo[0xb0] = AssyInstruction(0xb0, "BCC", AM_ProgramCounterRelative);
|
||||
m_opcodeinfo[0xc0] = AssyInstruction(0xc0, "LDY", AM_Immediate);
|
||||
m_opcodeinfo[0xd0] = AssyInstruction(0xd0, "BCS", AM_ProgramCounterRelative);
|
||||
m_opcodeinfo[0xe0] = AssyInstruction(0xe0, "CPX", AM_Immediate);
|
||||
m_opcodeinfo[0xf0] = AssyInstruction(0xf0, "BEQ", AM_ProgramCounterRelative);
|
||||
|
||||
m_opcodeinfo[0x01] = AssyInstruction(0x01, "ORA", AM_AbsoluteIndexedIndirect);
|
||||
m_opcodeinfo[0x11] = AssyInstruction(0x11, "ORA", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x21] = AssyInstruction(0x21, "AND", AM_AbsoluteIndexedIndirect);
|
||||
m_opcodeinfo[0x31] = AssyInstruction(0x31, "AND", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x41] = AssyInstruction(0x41, "EOR", AM_AbsoluteIndexedIndirect);
|
||||
m_opcodeinfo[0x51] = AssyInstruction(0x51, "EOR", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x61] = AssyInstruction(0x61, "ADC", AM_AbsoluteIndexedIndirect);
|
||||
m_opcodeinfo[0x71] = AssyInstruction(0x71, "ADC", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x81] = AssyInstruction(0x81, "STA", AM_AbsoluteIndexedIndirect);
|
||||
m_opcodeinfo[0x91] = AssyInstruction(0x91, "STA", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xa1] = AssyInstruction(0xa1, "LDA", AM_AbsoluteIndexedIndirect);
|
||||
m_opcodeinfo[0xb1] = AssyInstruction(0xb1, "LDA", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xc1] = AssyInstruction(0xc1, "CMP", AM_AbsoluteIndexedIndirect);
|
||||
m_opcodeinfo[0xd1] = AssyInstruction(0xd1, "CMP", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xe1] = AssyInstruction(0xe1, "SBC", AM_AbsoluteIndexedIndirect);
|
||||
m_opcodeinfo[0xf1] = AssyInstruction(0xff, "SBC", AM_AbsoluteIndexedWithY);
|
||||
|
||||
m_opcodeinfo[0x02] = AssyInstruction(0x02, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0x12] = AssyInstruction(0x12, "asl-ora", AM_ZeroPageIndexedIndirect);
|
||||
m_opcodeinfo[0x22] = AssyInstruction(0x22, "and", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x32] = AssyInstruction(0x32, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0x42] = AssyInstruction(0x42, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0x52] = AssyInstruction(0x52, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0x62] = AssyInstruction(0x62, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0x72] = AssyInstruction(0x72, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0x82] = AssyInstruction(0x82, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0x92] = AssyInstruction(0x92, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0xa2] = AssyInstruction(0xa2, "LDX", AM_Immediate);
|
||||
m_opcodeinfo[0xb2] = AssyInstruction(0xb2, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0xc2] = AssyInstruction(0xc2, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0xd2] = AssyInstruction(0xd2, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0xe2] = AssyInstruction(0xe2, "halt", AM_Immediate);
|
||||
m_opcodeinfo[0xf2] = AssyInstruction(0xf2, "halt", AM_Immediate);
|
||||
|
||||
m_opcodeinfo[0x03] = AssyInstruction(0x03, "asl/ora", AM_ZeroPageIndexedIndirect);
|
||||
m_opcodeinfo[0x13] = AssyInstruction(0x13, "asl/ora", AM_ZeroPageIndirect);
|
||||
m_opcodeinfo[0x23] = AssyInstruction(0x23, "rol/and", AM_ZeroPageIndexedIndirect);
|
||||
m_opcodeinfo[0x33] = AssyInstruction(0x33, "rol/and", AM_ZeroPageIndexedWithY);
|
||||
m_opcodeinfo[0x43] = AssyInstruction(0x43, "lsr/eor", AM_ZeroPage);
|
||||
m_opcodeinfo[0x53] = AssyInstruction(0x53, "lsr/eor", AM_ZeroPageIndirectIndexedWithY);
|
||||
m_opcodeinfo[0x63] = AssyInstruction(0x63, "ror/adc", AM_ZeroPageIndexedIndirect);
|
||||
m_opcodeinfo[0x73] = AssyInstruction(0x73, "ror/adc", AM_ZeroPageIndirectIndexedWithY);
|
||||
m_opcodeinfo[0x83] = AssyInstruction(0x83, "sta/stx", AM_ZeroPageIndexedIndirect);
|
||||
m_opcodeinfo[0x93] = AssyInstruction(0x93, "sta/stx", AM_ZeroPageIndirectIndexedWithY);
|
||||
m_opcodeinfo[0xa3] = AssyInstruction(0xa3, "lda/ldx", AM_ZeroPageIndexedIndirect);
|
||||
m_opcodeinfo[0xb3] = AssyInstruction(0xb3, "lda/ldx", AM_ZeroPageIndirectIndexedWithY);
|
||||
m_opcodeinfo[0xc3] = AssyInstruction(0xc3, "dec/cmp", AM_ZeroPageIndexedIndirect);
|
||||
m_opcodeinfo[0xd3] = AssyInstruction(0xd3, "dec/cmp", AM_ZeroPageIndirectIndexedWithY);
|
||||
m_opcodeinfo[0xe3] = AssyInstruction(0xe3, "inc/sbc", AM_ZeroPageIndexedIndirect);
|
||||
m_opcodeinfo[0xf3] = AssyInstruction(0xf3, "inc/sbc", AM_ZeroPageIndirectIndexedWithY);
|
||||
|
||||
m_opcodeinfo[0x04] = AssyInstruction(0x04, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0x14] = AssyInstruction(0x14, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0x24] = AssyInstruction(0x24, "BIT", AM_ZeroPage);
|
||||
m_opcodeinfo[0x34] = AssyInstruction(0x34, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0x44] = AssyInstruction(0x44, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0x54] = AssyInstruction(0x54, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0x64] = AssyInstruction(0x64, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0x74] = AssyInstruction(0x74, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0x84] = AssyInstruction(0x84, "STY", AM_ZeroPage);
|
||||
m_opcodeinfo[0x94] = AssyInstruction(0x94, "STY", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0xa4] = AssyInstruction(0xa4, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0xb4] = AssyInstruction(0xb4, "LDY", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0xc4] = AssyInstruction(0xc4, "CPY", AM_ZeroPage);
|
||||
m_opcodeinfo[0xd4] = AssyInstruction(0xd4, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0xe4] = AssyInstruction(0xe4, "CPX", AM_ZeroPage);
|
||||
m_opcodeinfo[0xf4] = AssyInstruction(0xf4, "nop", AM_ZeroPage);
|
||||
|
||||
m_opcodeinfo[0x05] = AssyInstruction(0x05, "ORA", AM_ZeroPage);
|
||||
m_opcodeinfo[0x15] = AssyInstruction(0x15, "ORA", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x25] = AssyInstruction(0x25, "AND", AM_ZeroPage);
|
||||
m_opcodeinfo[0x35] = AssyInstruction(0x35, "AND", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x45] = AssyInstruction(0x45, "EOR", AM_ZeroPage);
|
||||
m_opcodeinfo[0x55] = AssyInstruction(0x55, "EOR", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x65] = AssyInstruction(0x65, "ADC", AM_ZeroPage);
|
||||
m_opcodeinfo[0x75] = AssyInstruction(0x75, "ADC", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x85] = AssyInstruction(0x85, "STA", AM_ZeroPage);
|
||||
m_opcodeinfo[0x95] = AssyInstruction(0x95, "STA", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0xa5] = AssyInstruction(0xa5, "LDA", AM_ZeroPage);
|
||||
m_opcodeinfo[0xb5] = AssyInstruction(0xb5, "LDA", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0xc5] = AssyInstruction(0xc5, "CMP", AM_ZeroPage);
|
||||
m_opcodeinfo[0xd5] = AssyInstruction(0xd5, "CMP", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0xe5] = AssyInstruction(0xe5, "SEC", AM_ZeroPage);
|
||||
m_opcodeinfo[0xf5] = AssyInstruction(0xf5, "SEC", AM_ZeroPageIndexedWithX);
|
||||
|
||||
m_opcodeinfo[0x06] = AssyInstruction(0x06, "ASL", AM_ZeroPage);
|
||||
m_opcodeinfo[0x16] = AssyInstruction(0x16, "ASL", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x26] = AssyInstruction(0x26, "ROL", AM_ZeroPage);
|
||||
m_opcodeinfo[0x36] = AssyInstruction(0x36, "ROL", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x46] = AssyInstruction(0x46, "LSR", AM_ZeroPage);
|
||||
m_opcodeinfo[0x56] = AssyInstruction(0x56, "LSR", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x66] = AssyInstruction(0x66, "ROR", AM_ZeroPage);
|
||||
m_opcodeinfo[0x76] = AssyInstruction(0x76, "ROR", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x86] = AssyInstruction(0x86, "STX", AM_ZeroPage);
|
||||
m_opcodeinfo[0x96] = AssyInstruction(0x96, "STX", AM_ZeroPageIndexedWithY);
|
||||
m_opcodeinfo[0xa6] = AssyInstruction(0xa6, "LDX", AM_ZeroPage);
|
||||
m_opcodeinfo[0xb6] = AssyInstruction(0xb6, "LDX", AM_ZeroPageIndexedWithY);
|
||||
m_opcodeinfo[0xc6] = AssyInstruction(0xc6, "DEC", AM_ZeroPage);
|
||||
m_opcodeinfo[0xd6] = AssyInstruction(0xd6, "DEC", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0xe6] = AssyInstruction(0xe6, "INC", AM_ZeroPage);
|
||||
m_opcodeinfo[0xf6] = AssyInstruction(0xf6, "INC", AM_ZeroPageIndexedWithX);
|
||||
|
||||
m_opcodeinfo[0x07] = AssyInstruction(0x07, "asl/ora", AM_ZeroPage);
|
||||
m_opcodeinfo[0x17] = AssyInstruction(0x17, "asl/ora", AM_ZeroPageIndirectIndexedWithY);
|
||||
m_opcodeinfo[0x27] = AssyInstruction(0x27, "rol/and", AM_ZeroPage);
|
||||
m_opcodeinfo[0x37] = AssyInstruction(0x37, "rol/and", AM_ZeroPageIndexedWithX);
|
||||
m_opcodeinfo[0x47] = AssyInstruction(0x47, "lsr/eor", AM_ZeroPage);
|
||||
m_opcodeinfo[0x57] = AssyInstruction(0x57, "lsr/eor", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x67] = AssyInstruction(0x67, "ror/adc", AM_ZeroPage);
|
||||
m_opcodeinfo[0x77] = AssyInstruction(0x77, "ror/adc", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x87] = AssyInstruction(0x87, "sta/stx", AM_ZeroPage);
|
||||
m_opcodeinfo[0x97] = AssyInstruction(0x97, "sta/stx", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xa7] = AssyInstruction(0xa7, "lda/ldx", AM_ZeroPage);
|
||||
m_opcodeinfo[0xb7] = AssyInstruction(0xb7, "ldx/ldx", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xc7] = AssyInstruction(0xc7, "dec/cmp", AM_ZeroPage);
|
||||
m_opcodeinfo[0xd7] = AssyInstruction(0xd7, "dec/cmp", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xe7] = AssyInstruction(0xe7, "inc/sbc", AM_ZeroPage);
|
||||
m_opcodeinfo[0xf7] = AssyInstruction(0xf7, "inc/sbc", AM_AbsoluteIndexedWithX);
|
||||
|
||||
m_opcodeinfo[0x08] = AssyInstruction(0x08, "PHP", AM_Implied);
|
||||
m_opcodeinfo[0x18] = AssyInstruction(0x18, "CLC", AM_Implied);
|
||||
m_opcodeinfo[0x28] = AssyInstruction(0x28, "PLP", AM_Implied);
|
||||
m_opcodeinfo[0x38] = AssyInstruction(0x38, "SEC", AM_Implied);
|
||||
m_opcodeinfo[0x48] = AssyInstruction(0x48, "PHA", AM_Implied);
|
||||
m_opcodeinfo[0x58] = AssyInstruction(0x58, "CLI", AM_Implied);
|
||||
m_opcodeinfo[0x68] = AssyInstruction(0x68, "PLA", AM_Implied);
|
||||
m_opcodeinfo[0x78] = AssyInstruction(0x78, "SEI", AM_Implied);
|
||||
m_opcodeinfo[0x88] = AssyInstruction(0x88, "DEY", AM_Implied);
|
||||
m_opcodeinfo[0x98] = AssyInstruction(0x98, "TYA", AM_Implied);
|
||||
m_opcodeinfo[0xa8] = AssyInstruction(0xa8, "TAY", AM_Implied);
|
||||
m_opcodeinfo[0xb8] = AssyInstruction(0xb8, "CLV", AM_Implied);
|
||||
m_opcodeinfo[0xc8] = AssyInstruction(0xc8, "INY", AM_Implied);
|
||||
m_opcodeinfo[0xd8] = AssyInstruction(0xd8, "CLD", AM_Implied);
|
||||
m_opcodeinfo[0xe8] = AssyInstruction(0xe8, "INX", AM_Implied);
|
||||
m_opcodeinfo[0xf8] = AssyInstruction(0xf8, "SED", AM_Implied);
|
||||
|
||||
m_opcodeinfo[0x09] = AssyInstruction(0x09, "ORA", AM_Immediate);
|
||||
m_opcodeinfo[0x19] = AssyInstruction(0x19, "ORA", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x29] = AssyInstruction(0x29, "AND", AM_Immediate);
|
||||
m_opcodeinfo[0x39] = AssyInstruction(0x39, "AND", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x49] = AssyInstruction(0x49, "EOR", AM_Immediate);
|
||||
m_opcodeinfo[0x59] = AssyInstruction(0x59, "EOR", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x69] = AssyInstruction(0x69, "ADC", AM_Immediate);
|
||||
m_opcodeinfo[0x79] = AssyInstruction(0x79, "ADC", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x89] = AssyInstruction(0x89, "nop", AM_ZeroPage);
|
||||
m_opcodeinfo[0x99] = AssyInstruction(0x99, "STA", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xa9] = AssyInstruction(0xa9, "LDA", AM_Immediate);
|
||||
m_opcodeinfo[0xb9] = AssyInstruction(0xb9, "LDA", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xc9] = AssyInstruction(0xc9, "CMP", AM_Immediate);
|
||||
m_opcodeinfo[0xd9] = AssyInstruction(0xd9, "CMP", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xe9] = AssyInstruction(0xe9, "SBC", AM_Immediate);
|
||||
m_opcodeinfo[0xf9] = AssyInstruction(0xf9, "SBC", AM_AbsoluteIndexedWithY);
|
||||
|
||||
m_opcodeinfo[0x0a] = AssyInstruction(0x0a, "ASL", AM_Accumulator);
|
||||
m_opcodeinfo[0x1a] = AssyInstruction(0x1a, "nop", AM_Implied);
|
||||
m_opcodeinfo[0x2a] = AssyInstruction(0x2a, "ROL", AM_Accumulator);
|
||||
m_opcodeinfo[0x3a] = AssyInstruction(0x3a, "nop", AM_Implied);
|
||||
m_opcodeinfo[0x4a] = AssyInstruction(0x4a, "LSR", AM_Accumulator);
|
||||
m_opcodeinfo[0x5a] = AssyInstruction(0x5a, "nop", AM_Implied);
|
||||
m_opcodeinfo[0x6a] = AssyInstruction(0x6a, "ROR", AM_Accumulator);
|
||||
m_opcodeinfo[0x7a] = AssyInstruction(0x7a, "nop", AM_Implied);
|
||||
m_opcodeinfo[0x8a] = AssyInstruction(0x8a, "TXA", AM_Implied);
|
||||
m_opcodeinfo[0x9a] = AssyInstruction(0x9a, "TXS", AM_Implied);
|
||||
m_opcodeinfo[0xaa] = AssyInstruction(0xaa, "TAX", AM_Implied);
|
||||
m_opcodeinfo[0xba] = AssyInstruction(0xba, "TSX", AM_Implied);
|
||||
m_opcodeinfo[0xca] = AssyInstruction(0xca, "DEX", AM_Implied);
|
||||
m_opcodeinfo[0xda] = AssyInstruction(0xda, "nop", AM_Implied);
|
||||
m_opcodeinfo[0xea] = AssyInstruction(0xea, "NOP", AM_Implied);
|
||||
m_opcodeinfo[0xfa] = AssyInstruction(0xfa, "nop", AM_Implied);
|
||||
|
||||
m_opcodeinfo[0x0b] = AssyInstruction(0x0b, "and/mov bit7->Cy", AM_Immediate);
|
||||
m_opcodeinfo[0x1b] = AssyInstruction(0x1b, "asl/ora", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x2b] = AssyInstruction(0x2b, "and/mov bit7->Cy", AM_Immediate);
|
||||
m_opcodeinfo[0x3b] = AssyInstruction(0x3b, "asl/ora", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x4b] = AssyInstruction(0x4b, "and/lsr A", AM_Immediate);
|
||||
m_opcodeinfo[0x5b] = AssyInstruction(0x5b, "lsr/eor", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x6b] = AssyInstruction(0x6b, "and/ror A", AM_Immediate);
|
||||
m_opcodeinfo[0x7b] = AssyInstruction(0x7b, "ror/adc", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0x8b] = AssyInstruction(0x8b, "txa/and", AM_Immediate);
|
||||
m_opcodeinfo[0x9b] = AssyInstruction(0x9b, "sta/stx", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xab] = AssyInstruction(0xab, "lda/ldx", AM_Implied);
|
||||
m_opcodeinfo[0xbb] = AssyInstruction(0xbb, "lda/ldx", AM_Implied);
|
||||
m_opcodeinfo[0xcb] = AssyInstruction(0xcb, "sbx", AM_Immediate);
|
||||
m_opcodeinfo[0xdb] = AssyInstruction(0xdb, "dec/cmp", AM_Absolute);
|
||||
m_opcodeinfo[0xeb] = AssyInstruction(0xeb, "sbc", AM_Immediate);
|
||||
m_opcodeinfo[0xfb] = AssyInstruction(0xfb, "inc/sbc", AM_Absolute);
|
||||
|
||||
m_opcodeinfo[0x0c] = AssyInstruction(0x0c, "nop", AM_Absolute);
|
||||
m_opcodeinfo[0x1c] = AssyInstruction(0x1c, "nop", AM_Absolute);
|
||||
m_opcodeinfo[0x2c] = AssyInstruction(0x2c, "BIT", AM_Absolute);
|
||||
m_opcodeinfo[0x3c] = AssyInstruction(0x3c, "nop", AM_Absolute);
|
||||
m_opcodeinfo[0x4c] = AssyInstruction(0x4c, "JMP", AM_Absolute);
|
||||
m_opcodeinfo[0x5c] = AssyInstruction(0x5c, "nop", AM_Absolute);
|
||||
m_opcodeinfo[0x6c] = AssyInstruction(0x6c, "JMP", AM_AbsoluteIndirect);
|
||||
m_opcodeinfo[0x7c] = AssyInstruction(0x7c, "nop", AM_Absolute);
|
||||
m_opcodeinfo[0x8c] = AssyInstruction(0x8c, "STY", AM_Absolute);
|
||||
m_opcodeinfo[0x9c] = AssyInstruction(0x9c, "sta/stx", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xac] = AssyInstruction(0xac, "LDY", AM_Absolute);
|
||||
m_opcodeinfo[0xbc] = AssyInstruction(0xbc, "LDY", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xcc] = AssyInstruction(0xcc, "CPY", AM_Absolute);
|
||||
m_opcodeinfo[0xdc] = AssyInstruction(0xdc, "???", AM_InvalidOp);
|
||||
m_opcodeinfo[0xec] = AssyInstruction(0xec, "CPX", AM_Absolute);
|
||||
m_opcodeinfo[0xfc] = AssyInstruction(0xfc, "???", AM_InvalidOp);
|
||||
|
||||
m_opcodeinfo[0x0d] = AssyInstruction(0x0d, "ORA", AM_Absolute);
|
||||
m_opcodeinfo[0x1d] = AssyInstruction(0x1d, "ORA", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x2d] = AssyInstruction(0x2d, "AND", AM_Absolute);
|
||||
m_opcodeinfo[0x3d] = AssyInstruction(0x3d, "AND", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x4d] = AssyInstruction(0x4d, "EOR", AM_Absolute);
|
||||
m_opcodeinfo[0x5d] = AssyInstruction(0x5d, "EOR", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x6d] = AssyInstruction(0x6d, "ADC", AM_Absolute);
|
||||
m_opcodeinfo[0x7d] = AssyInstruction(0x7d, "ADC", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x8d] = AssyInstruction(0x8d, "STA", AM_Absolute);
|
||||
m_opcodeinfo[0x9d] = AssyInstruction(0x9d, "STA", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xad] = AssyInstruction(0xad, "LDA", AM_Absolute);
|
||||
m_opcodeinfo[0xbd] = AssyInstruction(0xbd, "LDA", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xcd] = AssyInstruction(0xcd, "CMP", AM_Absolute);
|
||||
m_opcodeinfo[0xdd] = AssyInstruction(0xdd, "CMP", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xed] = AssyInstruction(0xed, "SBC", AM_Absolute);
|
||||
m_opcodeinfo[0xfd] = AssyInstruction(0xfd, "SBC", AM_AbsoluteIndexedWithX);
|
||||
|
||||
m_opcodeinfo[0x0e] = AssyInstruction(0x0e, "ASL", AM_Absolute);
|
||||
m_opcodeinfo[0x1e] = AssyInstruction(0x1e, "ASL", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x2e] = AssyInstruction(0x2e, "ROL", AM_Absolute);
|
||||
m_opcodeinfo[0x3e] = AssyInstruction(0x3e, "ROL", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x4e] = AssyInstruction(0x4e, "LSR", AM_Absolute);
|
||||
m_opcodeinfo[0x5e] = AssyInstruction(0x5e, "LSR", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x6e] = AssyInstruction(0x6e, "ROR", AM_Absolute);
|
||||
m_opcodeinfo[0x7e] = AssyInstruction(0x7e, "ROR", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x8e] = AssyInstruction(0x8e, "STX", AM_Absolute);
|
||||
m_opcodeinfo[0x9e] = AssyInstruction(0x9e, "sta/stx", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xae] = AssyInstruction(0xae, "LDX", AM_Absolute);
|
||||
m_opcodeinfo[0xbe] = AssyInstruction(0xbe, "LDX", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xce] = AssyInstruction(0xce, "DEC", AM_Absolute);
|
||||
m_opcodeinfo[0xde] = AssyInstruction(0xde, "DEC", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xee] = AssyInstruction(0xee, "INC", AM_Absolute);
|
||||
m_opcodeinfo[0xfe] = AssyInstruction(0xfe, "INC", AM_AbsoluteIndexedWithX);
|
||||
|
||||
m_opcodeinfo[0x0f] = AssyInstruction(0x0f, "asl/ora", AM_Absolute);
|
||||
m_opcodeinfo[0x1f] = AssyInstruction(0x1f, "asl/ora", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x2f] = AssyInstruction(0x2f, "rol/and", AM_Absolute);
|
||||
m_opcodeinfo[0x3f] = AssyInstruction(0x3f, "rol/and", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x4f] = AssyInstruction(0x4f, "lsr/eor", AM_Absolute);
|
||||
m_opcodeinfo[0x5f] = AssyInstruction(0x5f, "lsr/eor", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x6f] = AssyInstruction(0x6f, "ror/adc", AM_Absolute);
|
||||
m_opcodeinfo[0x7f] = AssyInstruction(0x7f, "ror/adc", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0x8f] = AssyInstruction(0x8f, "sta/stx", AM_Absolute);
|
||||
m_opcodeinfo[0x9f] = AssyInstruction(0x9f, "sta/stx", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xaf] = AssyInstruction(0xaf, "lda/ldx", AM_Absolute);
|
||||
m_opcodeinfo[0xbf] = AssyInstruction(0xbf, "ldx/ldx", AM_AbsoluteIndexedWithY);
|
||||
m_opcodeinfo[0xcf] = AssyInstruction(0xcf, "dec/cmp", AM_Absolute);
|
||||
m_opcodeinfo[0xdf] = AssyInstruction(0xdf, "dec/cmp", AM_AbsoluteIndexedWithX);
|
||||
m_opcodeinfo[0xef] = AssyInstruction(0xef, "inc/sbc", AM_Absolute);
|
||||
m_opcodeinfo[0xff] = AssyInstruction(0xff, "inc/sbc", AM_AbsoluteIndexedWithX);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ enum AddressMode {
|
||||
AM_ZeroPageIndexedWithX, // zp,x
|
||||
AM_ZeroPageIndexedWithY, // zp,y
|
||||
AM_ZeroPageIndirect, // (zp)
|
||||
AM_ZeroPageIndectIndexedWithY // (zp),y
|
||||
AM_ZeroPageIndirectIndexedWithY // (zp),y
|
||||
};
|
||||
|
||||
struct AssyInstruction {
|
||||
@ -33,6 +33,8 @@ public:
|
||||
m_addressMode = am;
|
||||
}
|
||||
|
||||
AddressMode addressMode() { return m_addressMode; }
|
||||
|
||||
QString mnemonic() { return m_mnemonic; }
|
||||
|
||||
quint8 opcode() { return m_opcode; }
|
||||
@ -47,11 +49,12 @@ public:
|
||||
return 2;
|
||||
case AM_ProgramCounterRelative:
|
||||
case AM_ZeroPage:
|
||||
case AM_ZeroPageIndectIndexedWithY:
|
||||
case AM_ZeroPageIndirectIndexedWithY:
|
||||
case AM_ZeroPageIndexedIndirect:
|
||||
case AM_ZeroPageIndexedWithX:
|
||||
case AM_ZeroPageIndexedWithY:
|
||||
case AM_ZeroPageIndirect:
|
||||
case AM_Immediate:
|
||||
return 1;
|
||||
case AM_InvalidOp:
|
||||
case AM_Implied:
|
||||
@ -79,10 +82,11 @@ public:
|
||||
P65C02
|
||||
};
|
||||
|
||||
QStringList disassemble(quint16 address);
|
||||
|
||||
QList<QStringList> disassemble(quint16 from, quint16 to);
|
||||
|
||||
private:
|
||||
|
||||
QStringList disassembleOp(quint16 address, quint16 *nextAddress = 0);
|
||||
void makeOpcodeTable();
|
||||
|
||||
QHash<quint8,AssyInstruction> m_opcodeinfo;
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
#define GENERICFILE_H
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QString>
|
||||
|
||||
class GenericFile
|
||||
{
|
||||
@ -9,10 +10,14 @@ public:
|
||||
GenericFile(QByteArray data = QByteArray());
|
||||
virtual ~GenericFile() { }
|
||||
virtual void setData(QByteArray data);
|
||||
|
||||
virtual QByteArray data() { return m_data; }
|
||||
void setFilename(QString filename) { m_filename = filename; }
|
||||
QString filename() const { return m_filename; }
|
||||
|
||||
protected:
|
||||
QByteArray m_data;
|
||||
QString m_filename;
|
||||
};
|
||||
|
||||
#endif // GENERICFILE_H
|
||||
|
||||
21
src/internals/memory.cxx
Normal file
21
src/internals/memory.cxx
Normal file
@ -0,0 +1,21 @@
|
||||
#include "memory.h"
|
||||
#include <QDebug>
|
||||
|
||||
Memory::Memory()
|
||||
{
|
||||
quint8 zero = 0;
|
||||
for (int idx = 0; idx < 65536; idx++) {
|
||||
m_memory.append(zero);
|
||||
}
|
||||
}
|
||||
|
||||
bool Memory::addFile(QByteArray data, quint16 start)
|
||||
{
|
||||
if (start+data.length() > 65536) {
|
||||
qDebug() << "Memory overflow adding data."; return false;
|
||||
}
|
||||
|
||||
m_memory.replace(start,data.length(),data);
|
||||
|
||||
return true;
|
||||
}
|
||||
20
src/internals/memory.h
Normal file
20
src/internals/memory.h
Normal file
@ -0,0 +1,20 @@
|
||||
#ifndef MEMORY_H
|
||||
#define MEMORY_H
|
||||
|
||||
#include <QByteArray>
|
||||
|
||||
class Memory {
|
||||
public:
|
||||
Memory();
|
||||
|
||||
bool addFile(QByteArray data, quint16 start);
|
||||
|
||||
QByteArray &values() { return m_memory; }
|
||||
|
||||
|
||||
private:
|
||||
QByteArray m_memory;
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
@ -5,8 +5,11 @@
|
||||
#include "hiresviewwidget.h"
|
||||
#include "applesoftfileviewer.h"
|
||||
#include <QMdiSubWindow>
|
||||
#include "binaryfile.h"
|
||||
#include "applesoftfile.h"
|
||||
#include "memory.h"
|
||||
#include "disassembler.h"
|
||||
#include "disassemblerviewer.h"
|
||||
|
||||
#include <QTextDocument>
|
||||
|
||||
MainWindow::MainWindow(QWidget *parent) :
|
||||
@ -78,19 +81,42 @@ void MainWindow::showLoadDialog()
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::openInHiresViewWidget(BinaryFile *file, QString filename) {
|
||||
HiresViewWidget *hvwma = new HiresViewWidget(0);
|
||||
|
||||
QString title = QString("Image: %1").arg(filename);
|
||||
hvwma->setWindowTitle(title);
|
||||
hvwma->show();
|
||||
hvwma->setData(file->data());
|
||||
}
|
||||
|
||||
void MainWindow::handleDiskItemSelectedDefaultOpen(DiskFile *disk, FileDescriptiveEntry fde)
|
||||
{
|
||||
GenericFile *file = disk->getFile(fde);
|
||||
|
||||
if (dynamic_cast<BinaryFile*>(file)) {
|
||||
if (fde.lengthInSectors == 34)
|
||||
{
|
||||
HiresViewWidget *hvwma = new HiresViewWidget(0);
|
||||
BinaryFile *binfile = dynamic_cast<BinaryFile*>(file);
|
||||
binfile->setFilename(AppleString(fde.filename).printable().trimmed());
|
||||
|
||||
if (fde.lengthInSectors == 34 && (binfile->address() == 0x2000 || binfile->address() == 0x4000))
|
||||
{
|
||||
openInHiresViewWidget(binfile, AppleString(fde.filename).printable().trimmed());
|
||||
}
|
||||
else
|
||||
{
|
||||
DisassemblerViewer *hvwma = new DisassemblerViewer(0);
|
||||
|
||||
// QString title = QString("Image: %1").arg(AppleString(fde.filename).printable().trimmed());
|
||||
// hvwma->setWindowTitle(title);
|
||||
|
||||
QString title = QString("Image: %1").arg(AppleString(fde.filename).printable().trimmed());
|
||||
hvwma->setWindowTitle(title);
|
||||
hvwma->show();
|
||||
hvwma->setData(file->data());
|
||||
hvwma->setFile(binfile);
|
||||
|
||||
// quint16 address = binfile->address();
|
||||
// Memory mem;
|
||||
// mem.addFile(binfile->data(), address);
|
||||
// Disassembler dis(mem.values());
|
||||
// dis.disassemble(binfile->address(), binfile->address()+binfile->length());
|
||||
}
|
||||
}
|
||||
else if (dynamic_cast<ApplesoftFile *>(file))
|
||||
@ -103,5 +129,4 @@ void MainWindow::handleDiskItemSelectedDefaultOpen(DiskFile *disk, FileDescripti
|
||||
afv->show();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
#include <QMainWindow>
|
||||
|
||||
#include "diskfile.h"
|
||||
#include "binaryfile.h"
|
||||
|
||||
namespace Ui {
|
||||
class MainWindow;
|
||||
@ -33,6 +34,8 @@ signals:
|
||||
void diskFileUnloading(DiskFile *file);
|
||||
void diskFileUnloaded();
|
||||
|
||||
protected:
|
||||
void openInHiresViewWidget(BinaryFile *file, QString filename);
|
||||
private:
|
||||
Ui::MainWindow *ui;
|
||||
|
||||
|
||||
@ -28,6 +28,9 @@
|
||||
<pointsize>10</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="acceptDrops">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
||||
54
src/ui/viewers/disassemblerviewer.cpp
Normal file
54
src/ui/viewers/disassemblerviewer.cpp
Normal file
@ -0,0 +1,54 @@
|
||||
#include "disassemblerviewer.h"
|
||||
#include "ui_disassemblerviewer.h"
|
||||
#include "disassembler.h"
|
||||
#include "memory.h"
|
||||
|
||||
DisassemblerViewer::DisassemblerViewer(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::DisassemblerViewer)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
QString title = QString("Disassembly Viewer");
|
||||
setWindowTitle(title);
|
||||
}
|
||||
|
||||
DisassemblerViewer::~DisassemblerViewer()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void DisassemblerViewer::setFile(BinaryFile *file) {
|
||||
m_file = file;
|
||||
|
||||
QString title = QString("Disassembler Viewer: %1").arg(m_file->filename());
|
||||
setWindowTitle(title);
|
||||
|
||||
quint16 address = file->address();
|
||||
Memory mem;
|
||||
mem.addFile(file->data(), address);
|
||||
Disassembler dis(mem.values());
|
||||
|
||||
QList<QStringList> lines = dis.disassemble(file->address(), file->address()+file->length());
|
||||
|
||||
QStringList formattedLines;
|
||||
|
||||
foreach (QStringList line, lines) {
|
||||
QString newline = QString("%1: %2 %3").arg(line[0]).arg(line[1]).arg(line[2]);
|
||||
formattedLines.append(newline);
|
||||
}
|
||||
|
||||
QByteArray joinedlines = qPrintable(formattedLines.join("\n"));
|
||||
setData(joinedlines);
|
||||
|
||||
}
|
||||
|
||||
void DisassemblerViewer::setData(QByteArray data)
|
||||
{
|
||||
ui->textArea->setText(data);
|
||||
}
|
||||
|
||||
void DisassemblerViewer::setText(QString text)
|
||||
{
|
||||
ui->textArea->setHtml(text);
|
||||
}
|
||||
30
src/ui/viewers/disassemblerviewer.h
Normal file
30
src/ui/viewers/disassemblerviewer.h
Normal file
@ -0,0 +1,30 @@
|
||||
#ifndef DISASSEMBLERVIEWER_H
|
||||
#define DISASSEMBLERVIEWER_H
|
||||
|
||||
#include <QWidget>
|
||||
#include <QByteArray>
|
||||
|
||||
#include "binaryfile.h"
|
||||
namespace Ui {
|
||||
class DisassemblerViewer;
|
||||
}
|
||||
|
||||
class DisassemblerViewer : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DisassemblerViewer(QWidget *parent = 0);
|
||||
~DisassemblerViewer();
|
||||
|
||||
void setFile(BinaryFile *file);
|
||||
void setData(QByteArray data);
|
||||
void setText(QString text);
|
||||
|
||||
private:
|
||||
Ui::DisassemblerViewer *ui;
|
||||
|
||||
BinaryFile *m_file;
|
||||
};
|
||||
|
||||
#endif // DISASSEMBLERVIEWER_H
|
||||
34
src/ui/viewers/disassemblerviewer.ui
Normal file
34
src/ui/viewers/disassemblerviewer.ui
Normal file
@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>DisassemblerViewer</class>
|
||||
<widget class="QWidget" name="DisassemblerViewer">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>749</width>
|
||||
<height>516</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QTextBrowser" name="textArea">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Courier</family>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="acceptRichText">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
Loading…
Reference in New Issue
Block a user