citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

citra-qt: Show function names in disassembler based on bunnei's suggestion.

This commit is contained in:
Tony Wasserka 2014-07-23 00:58:52 +02:00
parent 456b9feb25
commit c131fb2c27
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/citra_qt/debugger/disassembler.cpp
View File

@ -39,16 +39,32 @@ QVariant DisassemblerModel::data(const QModelIndex& index, int role) const {
static char result[255]; static char result[255];
u32 address = base_address + index.row() * 4; u32 address = base_address + index.row() * 4;
ARM_Disasm::disasm(address, Memory::Read32(address), result); u32 instr = Memory::Read32(address);
ARM_Disasm::disasm(address, instr, result);
if (index.column() == 0) { if (index.column() == 0) {
return QString("0x%1").arg((uint)(address), 8, 16, QLatin1Char('0')); return QString("0x%1").arg((uint)(address), 8, 16, QLatin1Char('0'));
} else if (index.column() == 1) { } else if (index.column() == 1) {
return QString::fromLatin1(result); return QString::fromLatin1(result);
} else if (index.column() == 2 && Symbols::HasSymbol(address)) { } else if (index.column() == 2) {
TSymbol symbol = Symbols::GetSymbol(address); if(Symbols::HasSymbol(address)) {
return QString("%1 - Size:%2").arg(QString::fromStdString(symbol.name)) TSymbol symbol = Symbols::GetSymbol(address);
.arg(symbol.size / 4); // divide by 4 to get instruction count return QString("%1 - Size:%2").arg(QString::fromStdString(symbol.name))
.arg(symbol.size / 4); // divide by 4 to get instruction count
} else if (ARM_Disasm::decode(instr) == OP_BL) {
u32 offset = instr & 0xFFFFFF;
// Sign-extend the 24-bit offset
if ((offset >> 23) & 1)
offset |= 0xFF000000;
// Pre-compute the left-shift and the prefetch offset
offset <<= 2;
offset += 8;
TSymbol symbol = Symbols::GetSymbol(address + offset);
return QString(" --> %1").arg(QString::fromStdString(symbol.name));
}
} }
break; break;