Skip to content

Commit d1dfdeb

Browse files
committed
GUI: Change infobar address line format (x64dbg#428)
1 parent 2a8252e commit d1dfdeb

File tree

1 file changed

+31
-11
lines changed

1 file changed

+31
-11
lines changed

src/gui/Src/Gui/CPUInfoBox.cpp

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,24 +179,44 @@ void CPUInfoBox::disasmSelectionChanged(dsint parVA)
179179
}
180180
if(getInfoLine(0) == getInfoLine(1)) //check for duplicate info line
181181
setInfoLine(1, "");
182-
//set last line
182+
183+
// Set last line
184+
//
185+
// Format: SECTION:VA MODULE+RVA FILE_OFFSET FUNCTION
183186
QString info;
184-
char mod[MAX_MODULE_SIZE] = "";
187+
188+
// Section
189+
char section[MAX_SECTION_SIZE];
190+
if(DbgFunctions()->SectionFromAddr(parVA, section))
191+
info += QString(section) + ":";
192+
193+
// VA
194+
info += AddressToString(parVA) + " ";
195+
196+
// Module name, RVA, and file offset
197+
char mod[MAX_MODULE_SIZE];
185198
if(DbgFunctions()->ModNameFromAddr(parVA, mod, true))
186199
{
187200
dsint modbase = DbgFunctions()->ModBaseFromAddr(parVA);
201+
202+
// Append modname
203+
info += mod;
204+
188205
if(modbase)
189-
info = QString(mod) + "[" + QString("%1").arg(parVA - modbase, 0, 16, QChar('0')).toUpper() + "] | ";
190-
else
191-
info = QString(mod) + " | ";
206+
info += ":" + QString("%1").arg(parVA - modbase, 0, 16, QChar('0')).toUpper();
207+
208+
// Append space afterwards
209+
info += " ";
210+
211+
// File offset
212+
info += QString("%1").arg(DbgFunctions()->VaToFileOffset(parVA), 0, 16, QChar('0')).toUpper() + " ";
192213
}
193-
char section[MAX_SECTION_SIZE] = "";
194-
if(DbgFunctions()->SectionFromAddr(parVA, section))
195-
info += "\"" + QString(section) + "\":";
196-
info += AddressToString(parVA);
197-
char label[MAX_LABEL_SIZE] = "";
214+
215+
// Function/label name
216+
char label[MAX_LABEL_SIZE];
198217
if(DbgGetLabelAt(parVA, SEG_DEFAULT, label))
199-
info += " <" + QString(label) + ">";
218+
info += "<" + QString(label) + ">";
219+
200220
setInfoLine(2, info);
201221
}
202222

0 commit comments

Comments
 (0)