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

Debugger: Fixed crash on games that never call RTI

Browse source
This commit is contained in:
Souryo 2017-08-02 18:43:38 -04:00
parent 3f58811a6b
commit d78aef2b77
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Core/Debugger.cpp
View file

@ -284,6 +284,17 @@ int32_t Debugger::EvaluateExpression(string expression, EvalResultType &resultTy
return _watchExpEval.Evaluate(expression, state, resultType);
}
void Debugger::RemoveExcessCallstackEntries()
{
while(_callstackRelative.size() >= 1022) {
//Ensure callstack stays below 512 entries - some games never call RTI, causing an infinite stack
_callstackRelative.pop_front();
_callstackRelative.pop_front();
_callstackAbsolute.pop_front();
_callstackAbsolute.pop_front();
}
}
void Debugger::UpdateCallstack(uint32_t addr)
{
_hideTopOfCallstack = false;
@ -295,8 +306,10 @@ void Debugger::UpdateCallstack(uint32_t addr)
_callstackAbsolute.pop_back();
_profiler->UnstackFunction();
} else if(_lastInstruction == 0x20 && _callstackRelative.size() < 1022) {
} else if(_lastInstruction == 0x20) {
//JSR
RemoveExcessCallstackEntries();
uint16_t targetAddr = _memoryManager->DebugRead(addr + 1) | (_memoryManager->DebugRead(addr + 2) << 8);
_callstackRelative.push_back(addr);
_callstackRelative.push_back(targetAddr);
@ -312,6 +325,8 @@ void Debugger::UpdateCallstack(uint32_t addr)
void Debugger::PrivateProcessInterrupt(uint16_t cpuAddr, uint16_t destCpuAddr, bool forNmi)
{
RemoveExcessCallstackEntries();
_callstackRelative.push_back(cpuAddr | (forNmi ? 0x40000 : 0x20000));
_callstackRelative.push_back(destCpuAddr);
@ -739,7 +754,7 @@ void Debugger::ProcessVramOperation(MemoryOperationType type, uint16_t addr, uin
void Debugger::GetCallstack(int32_t* callstackAbsolute, int32_t* callstackRelative)
{
int callstackSize = (int)_callstackRelative.size() - (_hideTopOfCallstack ? 2 : 0);
int callstackSize = std::min(1022, (int)_callstackRelative.size() - (_hideTopOfCallstack ? 2 : 0));
for(int i = 0; i < callstackSize; i++) {
callstackAbsolute[i] = _callstackAbsolute[i];

5
Core/Debugger.h
View file

@ -119,6 +119,8 @@ private:
void ProcessStepConditions(uint32_t addr);
bool SleepUntilResume();
void RemoveExcessCallstackEntries();
public:
Debugger(shared_ptr<Console> console, shared_ptr<CPU> cpu, shared_ptr<PPU> ppu, shared_ptr<MemoryManager> memoryManager, shared_ptr<BaseMapper> mapper);
~Debugger();
@ -165,9 +167,6 @@ public:
int32_t GetAbsoluteAddress(uint32_t addr);
void GetAbsoluteAddressAndType(uint32_t relativeAddr, AddressTypeInfo* info);
void StartTraceLogger(TraceLoggerOptions options);
void StopTraceLogger();
shared_ptr<Profiler> GetProfiler();
shared_ptr<Assembler> GetAssembler();
shared_ptr<TraceLogger> GetTraceLogger();