summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMerryMage <MerryMage@users.noreply.github.com>2016-04-16 10:48:46 +0200
committerSubv <subv2112@gmail.com>2016-05-21 18:12:38 +0200
commitb3b3dd7591416319ee0d6c4d32065bb5a7b1209f (patch)
tree14397b458afe5c786d1d6919f10838db2a47d56e
parentMemory: ReadBlock/WriteBlock (diff)
downloadyuzu-b3b3dd7591416319ee0d6c4d32065bb5a7b1209f.tar
yuzu-b3b3dd7591416319ee0d6c4d32065bb5a7b1209f.tar.gz
yuzu-b3b3dd7591416319ee0d6c4d32065bb5a7b1209f.tar.bz2
yuzu-b3b3dd7591416319ee0d6c4d32065bb5a7b1209f.tar.lz
yuzu-b3b3dd7591416319ee0d6c4d32065bb5a7b1209f.tar.xz
yuzu-b3b3dd7591416319ee0d6c4d32065bb5a7b1209f.tar.zst
yuzu-b3b3dd7591416319ee0d6c4d32065bb5a7b1209f.zip
-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 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 */