x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

GUI: removed function+x at addresses + infobox now has relative addresses

This commit is contained in:
mrexodia 2016-05-21 18:30:35 +02:00
parent a5770cbf76
commit c780b40366
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/Src/Disassembler/capstone_gui.cpp
View File

@ -231,17 +231,7 @@ QString CapstoneTokenizer::printValue(const TokenValue & value, bool expandModul
QString moduleText;
duint addr = value.value;
bool bHasLabel = DbgGetLabelAt(addr, SEG_DEFAULT, label_);
if(!bHasLabel) //handle function+offset
{
duint start;
if(DbgFunctionGet(addr, &start, nullptr) && DbgGetLabelAt(start, SEG_DEFAULT, label_))
{
labelText = QString("%1+%2").arg(label_).arg(ToHexString(addr - start));
bHasLabel = true;
}
}
else
labelText = QString(label_);
labelText = QString(label_);
bool bHasModule = (expandModule && DbgGetModuleAt(addr, module_) && !QString(labelText).startsWith("JMP.&"));
moduleText = QString(module_);
if(maxModuleLength != -1)

8
src/gui/Src/Gui/CPUInfoBox.cpp
View File

@ -236,7 +236,13 @@ void CPUInfoBox::disasmSelectionChanged(dsint parVA)
// Function/label name
char label[MAX_LABEL_SIZE];
if(DbgGetLabelAt(parVA, SEG_DEFAULT, label))
info += "<" + QString(label) + ">";
info += QString("<%1>").arg(label);
else
{
duint start;
if(DbgFunctionGet(parVA, &start, nullptr) && DbgGetLabelAt(start, SEG_DEFAULT, label) && start != parVA)
info += QString("<%1+%2>").arg(label).arg(ToHexString(parVA - start));
}
setInfoLine(2, info);
}