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

Add some comments and small fixes to trace browser

This commit is contained in:
torusrxxx 2020-05-24 23:17:22 +08:00 committed by Duncan Ogilvie
parent 82ba40e6ec
commit b058db685c
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/Src/Tracer/TraceBrowser.cpp
View File

@ -167,7 +167,7 @@ QString TraceBrowser::paintContent(QPainter* painter, dsint rowBase, int rowOffs
painter->drawRect(rect);
}
int index = rowBase + rowOffset;
duint index = rowBase + rowOffset;
duint cur_addr;
cur_addr = mTraceFile->Registers(index).regcontext.cip;
bool wIsSelected = (index >= mSelection.fromIndex && index <= mSelection.toIndex);
@ -382,7 +382,7 @@ NotDebuggingLabel:
if(mHighlightToken.text.length())
ZydisTokenizer::TokenToRichText(fakeInstruction, richText, &mHighlightToken);
else
ZydisTokenizer::TokenToRichText(fakeInstruction, richText, 0);
ZydisTokenizer::TokenToRichText(fakeInstruction, richText, nullptr);
RichTextPainter::paintRichText(painter, x + 0, y, getColumnWidth(col) - 0, getRowHeight(), 4, richText, mFontMetrics);
return "";
@ -440,7 +440,7 @@ NotDebuggingLabel:
}
}
ZydisTokenizer::InstructionToken TraceBrowser::memoryTokens(int atIndex)
ZydisTokenizer::InstructionToken TraceBrowser::memoryTokens(unsigned long long atIndex)
{
duint MemoryAddress[MAX_MEMORY_OPERANDS];
duint MemoryOldContent[MAX_MEMORY_OPERANDS];
@ -466,7 +466,7 @@ ZydisTokenizer::InstructionToken TraceBrowser::memoryTokens(int atIndex)
return fakeInstruction;
}
ZydisTokenizer::InstructionToken TraceBrowser::registersTokens(int atIndex)
ZydisTokenizer::InstructionToken TraceBrowser::registersTokens(unsigned long long atIndex)
{
ZydisTokenizer::InstructionToken fakeInstruction = ZydisTokenizer::InstructionToken();
REGDUMP now = mTraceFile->Registers(atIndex);
@ -843,8 +843,8 @@ void TraceBrowser::mouseMoveEvent(QMouseEvent* event)
void TraceBrowser::keyPressEvent(QKeyEvent* event)
{
int key = event->key();
int curindex = getInitialSelection();
int visibleindex = curindex;
auto curindex = getInitialSelection();
auto visibleindex = curindex;
if((key == Qt::Key_Up || key == Qt::Key_Down) && mTraceFile && mTraceFile->Progress() == 100)
{
if(key == Qt::Key_Up)

4
src/gui/Src/Tracer/TraceBrowser.h
View File

@ -54,8 +54,8 @@ private:
void mouseDoubleClickEvent(QMouseEvent* event) override;
void keyPressEvent(QKeyEvent* event) override;
ZydisTokenizer::InstructionToken memoryTokens(int atIndex);
ZydisTokenizer::InstructionToken registersTokens(int atIndex);
ZydisTokenizer::InstructionToken memoryTokens(unsigned long long atIndex);
ZydisTokenizer::InstructionToken registersTokens(unsigned long long atIndex);
VaHistory mHistory;
MenuBuilder* mMenuBuilder;
bool mRvaDisplayEnabled;

18
src/gui/Src/Tracer/TraceFileReader.cpp
View File

@ -92,31 +92,37 @@ void TraceFileReader::parseFinishedSlot()
//GuiAddLogMessage(QString("%1;%2;%3\r\n").arg(i.first).arg(i.second.first).arg(i.second.second).toUtf8().constData());
}
// Return if the file read was error
bool TraceFileReader::isError() const
{
return error;
}
// Return 100 when loading is completed
int TraceFileReader::Progress() const
{
return progress.load();
}
// Return the count of instructions
unsigned long long TraceFileReader::Length() const
{
return length;
}
// Return the hash value of executable to be matched against current executable
duint TraceFileReader::HashValue() const
{
return hashValue;
}
// Return the executable name of executable
QString TraceFileReader::ExePath() const
{
return EXEPath;
}
// Return the registers context at a given index
REGDUMP TraceFileReader::Registers(unsigned long long index)
{
unsigned long long base;
@ -131,6 +137,7 @@ REGDUMP TraceFileReader::Registers(unsigned long long index)
return page->Registers(index - base);
}
// Return the opcode at a given index. buffer must be 16 bytes long.
void TraceFileReader::OpCode(unsigned long long index, unsigned char* buffer, int* opcodeSize)
{
unsigned long long base;
@ -144,6 +151,7 @@ void TraceFileReader::OpCode(unsigned long long index, unsigned char* buffer, in
page->OpCode(index - base, buffer, opcodeSize);
}
// Return the thread id at a given index
DWORD TraceFileReader::ThreadId(unsigned long long index)
{
unsigned long long base;
@ -154,6 +162,7 @@ DWORD TraceFileReader::ThreadId(unsigned long long index)
return page->ThreadId(index - base);
}
// Return the number of recorded memory accesses at a given index
int TraceFileReader::MemoryAccessCount(unsigned long long index)
{
unsigned long long base;
@ -164,6 +173,7 @@ int TraceFileReader::MemoryAccessCount(unsigned long long index)
return page->MemoryAccessCount(index - base);
}
// Return the memory access info at a given index
void TraceFileReader::MemoryAccessInfo(unsigned long long index, duint* address, duint* oldMemory, duint* newMemory, bool* isValid)
{
unsigned long long base;
@ -174,8 +184,10 @@ void TraceFileReader::MemoryAccessInfo(unsigned long long index, duint* address,
return page->MemoryAccessInfo(index - base, address, oldMemory, newMemory, isValid);
}
// Used internally to get the page for the given index and read from disk if necessary
TraceFilePage* TraceFileReader::getPage(unsigned long long index, unsigned long long* base)
{
// Try to access the most recent used page
if(lastAccessedPage)
{
if(index >= lastAccessedIndexOffset && index < lastAccessedIndexOffset + lastAccessedPage->Length())
@ -184,6 +196,7 @@ TraceFilePage* TraceFileReader::getPage(unsigned long long index, unsigned long
return lastAccessedPage;
}
}
// Try to access pages in memory
const auto cache = pages.find(Range(index, index));
if(cache != pages.cend())
{
@ -200,7 +213,7 @@ TraceFilePage* TraceFileReader::getPage(unsigned long long index, unsigned long
}
else if(index >= Length()) //Out of bound
return nullptr;
//page in
// Remove an oldest page from system memory to make room for a new one.
if(pages.size() >= 2048) //TODO: trim resident pages based on system memory usage, instead of a hard limit.
{
FILETIME pageOutTime = pages.begin()->second.lastAccessed;
@ -241,7 +254,7 @@ TraceFilePage* TraceFileReader::getPage(unsigned long long index, unsigned long
start = middle;
middle = (start + end) / 2;
}
// Read the requested page from disk and return
if(fileOffset->second.second + fileOffset->first >= index && fileOffset->first <= index)
{
pages.insert(std::make_pair(Range(fileOffset->first, fileOffset->first + fileOffset->second.second - 1), TraceFilePage(this, fileOffset->second.first, fileOffset->second.second)));
@ -428,6 +441,7 @@ void TraceFileParser::run()
that->traceFile.moveToThread(that->thread());
}
// Remove last page from memory and read from disk again to show updates
void TraceFileReader::purgeLastPage()
{
unsigned long long index = 0;