Apple-2-SW/AppleSAWS
1
0
Fork 0
mirror of https://github.com/markdavidlong/AppleSAWS.git synced 2024-11-24 14:30:56 +00:00
Code Issues Projects Releases Wiki Activity

Greatly improved disassembler. Added multple entry points.

Browse Source
This commit is contained in:
Mark Long 2016-10-26 18:16:53 -05:00
parent 2517c6d605
commit b8ed5111fe
10 changed files with 75 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/binaryfile/binaryfile.h
View File

@ -9,12 +9,11 @@ public:
BinaryFile(QByteArray data = QByteArray());
void setData(QByteArray data);
quint16 length() { return m_length; }
virtual quint16 length() { return m_length; }
void dump();
protected:
quint16 m_length;
};
#endif // BINARYFILE_H

29
src/binaryfile/binaryfilemetadata.cpp
View File

@ -1,4 +1,7 @@
#include "binaryfilemetadata.h"
#include <QFile>
#include <QDataStream>
#include <QDebug>
BinaryFileMetadata::BinaryFileMetadata(GenericFile *file, quint16 defaultAddress, QObject *parent)
: QObject(parent)
@ -14,14 +17,32 @@ BinaryFileMetadata::BinaryFileMetadata(GenericFile *file, quint16 defaultAddress
void BinaryFileMetadata::load()
{
EntryPoint ep;
ep.note = "Default Entry Point";
ep.address = m_defaultAddress;
m_eps->addPoint(ep);
QFile infile(QString("%1%2").arg(m_file->filename()).arg(".bfm"));
if (infile.open(QIODevice::ReadOnly))
{
qDebug() << "Loading binary file metadata from" << QString("%1%2").arg(m_file->filename()).arg(".bfm");
QDataStream ds(&infile);
ds >> *m_eps;
ds >> *m_as;
infile.close();
}
else qDebug() << "Cannot open " << QString("%1%2").arg(m_file->filename()).arg(".bfm") << "for reading";
}
void BinaryFileMetadata::save()
{
QFile infile(QString("%1%2").arg(m_file->filename()).arg(".bfm"));
if (infile.open(QIODevice::WriteOnly))
{
qDebug() << "Saving binary file metadata to" << QString("%1%2").arg(m_file->filename()).arg(".bfm");
QDataStream ds(&infile);
ds << *m_eps;
ds << *m_as;
infile.close();
}
else qDebug() << "Cannot open " << QString("%1%2").arg(m_file->filename()).arg(".bfm") << "for writing";
}

11
src/binaryfile/disassembler.cxx
View File

@ -10,7 +10,9 @@ Disassembler::Disassembler(QByteArray memimage)
m_memusagemap.clearData();
}
QList<DisassembledItem> Disassembler::disassemble(quint16 from, quint16 to,bool processRecursively) {
QList<DisassembledItem> Disassembler::disassemble(quint16 from, quint16 to,
QList<quint16> entryPoints,
bool processRecursively) {
QList<DisassembledItem> retval;
qDebug() << "Disassemble: From"<<uint16ToHex(from)<<"to"<<uint16ToHex(to);
//#define OLDDISSEM
@ -32,6 +34,11 @@ QList<DisassembledItem> Disassembler::disassemble(quint16 from, quint16 to,bool
bool stopping = false;
quint16 next = from;
if (entryPoints.count())
{
next = entryPoints.takeFirst();
m_jumps.append(entryPoints);
}
while (!stopping)
{
@ -100,7 +107,7 @@ QList<DisassembledItem> Disassembler::disassemble(quint16 from, quint16 to,bool
if (num >= from && num <= to) // TODO: remove this to not limit disassembly to program range
{
qDebug() << "Calling recursively to"<<uint16ToHex(num);
retval.append(disassemble(num,to,false));
retval.append(disassemble(from,to,QList<quint16>() << num,false));
qDebug() << "Return from recursive call.";
}
}

5
src/binaryfile/disassembler.h
View File

@ -145,7 +145,10 @@ public:
P65C02
};
QList<DisassembledItem> disassemble(quint16 from, quint16 to,bool processRecursively = true);
QList<DisassembledItem> disassemble(quint16 from,
quint16 to,
QList<quint16> entryPoints,
bool processRecursively = true);
MemoryUsageMap *memoryUsageMap() { return &m_memusagemap; }

2
src/diskfiles/dos33/genericfile.cxx
View File

@ -6,9 +6,11 @@ GenericFile::GenericFile(QByteArray data)
setData(data);
}
m_address = 0x00;
m_length = 0x00;
}
void GenericFile::setData(QByteArray data)
{
m_data = data;
m_length = data.size();
}

5
src/diskfiles/dos33/genericfile.h
View File

@ -18,10 +18,15 @@ public:
virtual quint16 address() { return m_address; }
virtual QByteArray rawData() { return m_data; }
virtual void setLength(quint16 length) { m_length = length; }
virtual quint16 length() { return m_length; }
protected:
QByteArray m_data;
QString m_filename;
quint16 m_address;
qint16 m_length;
};

2
src/relocatablefile/relocatablefile.h
View File

@ -81,7 +81,7 @@ public:
RelocatableFile(QByteArray data = QByteArray());
void setData(QByteArray data);
quint16 length() { return m_data.length(); }
virtual quint16 length() { return m_data.length(); }
void dump();

48
src/ui/viewers/disassemblerviewer.cpp
View File

@ -73,7 +73,12 @@ void DisassemblerViewer::setFile(BinaryFile *file) {
quint16 address = file->address();
QStringList formattedLines = getDisassemblyStrings(address);
m_mem.addFile(m_file->data(), address);
QList<quint16> addresses = m_bfm->entryPoints()->getEntryPointAddresses();
if (!addresses.count()) { addresses.append(address); }
QStringList formattedLines = getDisassemblyStrings(addresses);
QByteArray joinedlines = qPrintable(formattedLines.join("\n"));
setData(joinedlines);
}
@ -91,7 +96,11 @@ void DisassemblerViewer::setFile(RelocatableFile *file) {
quint16 address = file->address() + 6 ; // Handle offset for relocatable metadata
QStringList formattedLines = getDisassemblyStrings(address);
m_mem.addFile(m_file->data(), address);
QList<quint16> addresses = m_bfm->entryPoints()->getEntryPointAddresses();
if (!addresses.count()) { addresses.append(address); }
QStringList formattedLines = getDisassemblyStrings(addresses);
QByteArray joinedlines = qPrintable(formattedLines.join("\n"));
QStringList rd = file->decodeRelocatableDict();
@ -102,10 +111,9 @@ void DisassemblerViewer::setFile(RelocatableFile *file) {
void DisassemblerViewer::handleDisassembleRequest(QList<quint16> addresses)
{
QStringList strings;
foreach (quint16 addr, addresses)
{
strings += getDisassemblyStrings(addr);
}
strings += getDisassemblyStrings(addresses);
qSort(strings);
strings.removeDuplicates();
@ -126,23 +134,15 @@ void DisassemblerViewer::handleDisassembleRequest(QList<quint16> addresses)
}
QStringList DisassemblerViewer::getDisassemblyStrings(quint16 address) {
Memory mem;
mem.addFile(m_file->data(), address);
Disassembler dis(mem.values());
QStringList DisassemblerViewer::getDisassemblyStrings(QList<quint16> entryPoints) {
int length = 0;
if (dynamic_cast<BinaryFile*>(m_file))
{
length = (dynamic_cast<BinaryFile*>(m_file))->length();
}
else
{
length = m_file->rawData().size();
}
Disassembler dis(m_mem.values());
int length = m_file->length();
QList<DisassembledItem> lines = dis.disassemble(m_file->address(),
m_file->address()+length);
m_file->address()+length,
entryPoints);
dis.setUnknownToData(m_file->address(),m_file->address()+length);
QStringList formattedLines;
@ -162,14 +162,14 @@ QStringList DisassemblerViewer::getDisassemblyStrings(quint16 address) {
formattedLines.append(newline);
}
for (int idx = address; idx < address+length; idx++)
for (int idx = m_file->address(); idx < m_file->address()+length; idx++)
{
if (dis.memoryUsageMap()->at(idx).testFlag(Data))
{
QString newline = QString("%1: %2 %3 (%4)").arg(uint16ToHex(idx))
.arg(uint8ToHex(mem.at(idx)))
.arg(makeDescriptorStringForVal(mem.at(idx)))
.arg(dis.getMnemonicForOp(mem.at(idx)));
.arg(uint8ToHex(m_mem.at(idx)))
.arg(makeDescriptorStringForVal(m_mem.at(idx)))
.arg(dis.getMnemonicForOp(m_mem.at(idx)));
formattedLines.append(newline);
}
}

4
src/ui/viewers/disassemblerviewer.h
View File

@ -4,6 +4,7 @@
#include <QWidget>
#include <QByteArray>
#include "memory.h"
#include "binaryfile.h"
#include "relocatablefile.h"
#include "fileviewerinterface.h"
@ -33,7 +34,7 @@ public:
QString makeDescriptorStringForVal(quint8 val);
QStringList getDisassemblyStrings(quint16 address);
QStringList getDisassemblyStrings(QList<quint16> entryPoints);
public slots:
void setFile(GenericFile *file);
@ -55,6 +56,7 @@ private:
BinaryFileMetadata *m_bfm;
Memory m_mem;
bool m_isRelo;
};

1
src/ui/widgets/DisassemblerMetadataDialog.cpp
View File

@ -52,6 +52,7 @@ void DisassemblerMetadataDialog::handleCancelButton()
void DisassemblerMetadataDialog::handleExitButton()
{
m_bfm->save();
this->close();
}