diff options
| author | bunnei <bunneidev@gmail.com> | 2016-05-29 21:57:07 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-05-29 21:57:07 -0400 |
| commit | ab4b27f0f5760c7f378f29756d3ce631bafca1b2 (patch) | |
| tree | 6340ca66710e9603db24c051da0b8173b796d3c6 /src/citra_qt/debugger/callstack.cpp | |
| parent | 1104913a8fc1181d946ade07907055f6b9cc1a88 (diff) | |
| parent | 0aef634a54f786c49241c24b8d0c7aa3555b0fa1 (diff) | |
Merge pull request #1692 from Subv/rm_getpointer2
Memory: Remove most usages of GetPointer
Diffstat (limited to 'src/citra_qt/debugger/callstack.cpp')
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index 793944639..1a3077495 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp @@ -37,10 +37,13 @@ void CallstackWidget::OnDebugModeEntered() int counter = 0; for (u32 addr = 0x10000000; addr >= sp; addr -= 4) { + if (!Memory::IsValidVirtualAddress(addr)) + break; + const u32 ret_addr = Memory::Read32(addr); const u32 call_addr = ret_addr - 4; //get call address??? - if (Memory::GetPointer(call_addr) == nullptr) + if (!Memory::IsValidVirtualAddress(call_addr)) break; /* TODO (mattvail) clean me, move to debugger interface */ |