empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Fixed profiler counting jsr/rts cycles in the wrong function

Browse source
This commit is contained in:
Souryo 2016-12-09 13:45:50 -05:00
parent 2cbae24ded
commit 7fe6ae6a0d
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Debugger.cpp
View file

@ -353,10 +353,10 @@ void Debugger::PrivateProcessRamOperation(MemoryOperationType type, uint16_t &ad
_disassembler->BuildCache(absoluteAddr, absoluteRamAddr, addr, isSubEntryPoint);
_lastInstruction = _memoryManager->DebugRead(addr);
UpdateCallstack(addr);
ProcessStepConditions(addr);
_profiler->ProcessInstructionStart(absoluteAddr);
UpdateCallstack(addr);
breakDone = SleepUntilResume();

20
Core/Profiler.cpp
View file

@ -7,6 +7,7 @@ Profiler::Profiler(Debugger * debugger)
{
_debugger = debugger;
_nextFunctionAddr = -1;
_currentCycleCount = 0;
_currentInstruction = 0;
@ -32,14 +33,8 @@ void Profiler::ProcessCycle()
void Profiler::StackFunction(int32_t instructionAddr, int32_t functionAddr)
{
if(functionAddr >= 0) {
_cycleCountStack.push(_currentCycleCount);
_functionStack.push(_currentFunction);
_currentFunction = functionAddr;
_currentCycleCount = 0;
_nextFunctionAddr = functionAddr;
_jsrStack.push(instructionAddr);
_functionCallCount[functionAddr]++;
}
}
@ -73,6 +68,17 @@ void Profiler::UnstackFunction()
void Profiler::ProcessInstructionStart(int32_t absoluteAddr)
{
if(_nextFunctionAddr >= 0) {
_cycleCountStack.push(_currentCycleCount);
_functionStack.push(_currentFunction);
_currentFunction = _nextFunctionAddr;
_currentCycleCount = 0;
_functionCallCount[_nextFunctionAddr]++;
_nextFunctionAddr = -1;
}
if(absoluteAddr >= 0) {
_currentInstruction = absoluteAddr;
ProcessCycle();

1
Core/Profiler.h
View file

@ -31,6 +31,7 @@ private:
int32_t _currentFunction;
int32_t _currentInstruction;
int32_t _nextFunctionAddr;
uint32_t _resetFunctionIndex;
uint32_t _inMemoryFunctionIndex;