aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMerryMage <MerryMage@users.noreply.github.com>2016-04-16 09:48:46 +0100
committerSubv <subv2112@gmail.com>2016-05-21 11:12:38 -0500
commitcbb1b25fe0d1728bb90bf4c1d3d4cf64053dcb1b (patch)
tree14397b458afe5c786d1d6919f10838db2a47d56e /src
parentc1c78c27c20be29bb7919028f0feb184814fc39a (diff)
Debugger/Callstack: Replace Memory::GetPointer with Memory::IsValidVirtualAddress
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/debugger/callstack.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp
index 793944639e..1a30774958 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 */