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

Fixed labels on non-data members of assembly.

Browse Source
This commit is contained in:
mlong 2021-01-23 14:58:12 -06:00
parent c801897f58
commit 6d8efdd483
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/binaryfile/disassembler.cxx
View File

@ -1,6 +1,7 @@
#include "disassembler.h" #include "disassembler.h"
#include <QByteArray> #include <QByteArray>
#include <QDebug> #include <QDebug>
#include <QList>
#include <math.h> #include <math.h>
@ -134,7 +135,8 @@ QList<DisassembledItem> Disassembler::disassemble(quint16 from, quint16 to,
} }
#endif #endif
qSort(retval); // qSort(retval);
std::sort(retval.begin(),retval.end());
// QStringList hexdump; // QStringList hexdump;
// foreach (quint16 adr,m_memusagemap.addressesWhichContain(Operation)) // foreach (quint16 adr,m_memusagemap.addressesWhichContain(Operation))

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

@ -121,7 +121,7 @@ void DisassemblerViewer::handleDisassembleRequest(QList<quint16> addresses)
disassemble(addresses); disassemble(addresses);
strings += getDisassemblyStrings(); strings += getDisassemblyStrings();
// qSort(strings); // qSort(strings);
strings.sort(); strings.sort();
strings.removeDuplicates(); strings.removeDuplicates();
@ -180,9 +180,21 @@ void DisassemblerViewer::disassemble(QList<quint16> entryPoints) {
if (raw.contains("BRA")) { ds += "\n"; } //TODO: Temp for spacing if (raw.contains("BRA")) { ds += "\n"; } //TODO: Temp for spacing
if (raw.contains("BRK")) { ds += "\n"; } //TODO: Temp for spacing if (raw.contains("BRK")) { ds += "\n"; } //TODO: Temp for spacing
QString newline;
if (m_bfm->assemblerSymbols()->hasAssemSymbolAtAddress(di.address()))
QString newline = QString("%1: %2 %3").arg(di.hexAddress()).arg(di.hexString()).arg(ds); {
int loc = m_bfm->assemblerSymbols()->locationOfSymbolAtAddress(di.address());
newline += (QString("%1: [%2]\n %3 %4")
.arg(di.hexAddress())
.arg(m_bfm->assemblerSymbols()->at(loc).name)
.arg(di.hexString()).arg(ds)
);
}
else
{
newline += QString("%1: %2 %3").arg(di.hexAddress()).arg(di.hexString()).arg(ds);
}
formattedLines.append(newline); formattedLines.append(newline);
} }
@ -202,8 +214,8 @@ void DisassemblerViewer::disassemble(QList<quint16> entryPoints) {
newline = QString("%1: .Byte $%2 ; %3").arg(uint16ToHex(idx)) newline = QString("%1: .Byte $%2 ; %3").arg(uint16ToHex(idx))
.arg(uint8ToHex(m_mem.at(idx))) .arg(uint8ToHex(m_mem.at(idx)))
.arg(m_bfm->assemblerSymbols()->at(loc).name);; .arg(m_bfm->assemblerSymbols()->at(loc).name);;
} else }
if (m_bfm->assemblerSymbols()->at(loc).symbolsize == SizeWord) else if (m_bfm->assemblerSymbols()->at(loc).symbolsize == SizeWord)
{ {
newline = QString("%1: .Word $%2 ; %3").arg(uint16ToHex(idx)) newline = QString("%1: .Word $%2 ; %3").arg(uint16ToHex(idx))
.arg(uint16ToHex(m_mem.at(idx) + (m_mem.at(idx+1)*256))) .arg(uint16ToHex(m_mem.at(idx) + (m_mem.at(idx+1)*256)))
@ -215,14 +227,10 @@ void DisassemblerViewer::disassemble(QList<quint16> entryPoints) {
usedefault = true; usedefault = true;
} }
} }
else
{
usedefault = true;
}
if (usedefault) if (usedefault)
{ {
newline = QString("%1: %2 %3\t(%4)\t'%5'").arg(uint16ToHex(idx)) newline += QString("%1: %2 %3\t(%4)\t'%5'").arg(uint16ToHex(idx))
.arg(uint8ToHex(m_mem.at(idx))) .arg(uint8ToHex(m_mem.at(idx)))
.arg(makeDescriptorStringForVal(m_mem.at(idx))) .arg(makeDescriptorStringForVal(m_mem.at(idx)))
.arg(dis.getMnemonicForOp(m_mem.at(idx))) .arg(dis.getMnemonicForOp(m_mem.at(idx)))