diff options
| author | 2016-05-29 21:57:07 -0400 | |
|---|---|---|
| committer | 2016-05-29 21:57:07 -0400 | |
| commit | ab4b27f0f5760c7f378f29756d3ce631bafca1b2 (patch) | |
| tree | 6340ca66710e9603db24c051da0b8173b796d3c6 /src/citra_qt/debugger/callstack.cpp | |
| parent | Merge pull request #1756 from wwylele/config-cleanup (diff) | |
| parent | Memory: Handle RasterizerCachedMemory and RasterizerCachedSpecial page types ... (diff) | |
| download | yuzu-ab4b27f0f5760c7f378f29756d3ce631bafca1b2.tar.gz yuzu-ab4b27f0f5760c7f378f29756d3ce631bafca1b2.tar.xz yuzu-ab4b27f0f5760c7f378f29756d3ce631bafca1b2.zip | |
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() | |||
| 37 | int counter = 0; | 37 | int counter = 0; |
| 38 | for (u32 addr = 0x10000000; addr >= sp; addr -= 4) | 38 | for (u32 addr = 0x10000000; addr >= sp; addr -= 4) |
| 39 | { | 39 | { |
| 40 | if (!Memory::IsValidVirtualAddress(addr)) | ||
| 41 | break; | ||
| 42 | |||
| 40 | const u32 ret_addr = Memory::Read32(addr); | 43 | const u32 ret_addr = Memory::Read32(addr); |
| 41 | const u32 call_addr = ret_addr - 4; //get call address??? | 44 | const u32 call_addr = ret_addr - 4; //get call address??? |
| 42 | 45 | ||
| 43 | if (Memory::GetPointer(call_addr) == nullptr) | 46 | if (!Memory::IsValidVirtualAddress(call_addr)) |
| 44 | break; | 47 | break; |
| 45 | 48 | ||
| 46 | /* TODO (mattvail) clean me, move to debugger interface */ | 49 | /* TODO (mattvail) clean me, move to debugger interface */ |