Просмотр исходного кода

Debugger/Callstack: Replace Memory::GetPointer with Memory::IsValidVirtualAddress

MerryMage 10 лет назад
Родитель
Сommit
b3b3dd7591
1 измененных файлов с 4 добавлено и 1 удалено
  1. 4 1
      src/citra_qt/debugger/callstack.cpp

+ 4 - 1
src/citra_qt/debugger/callstack.cpp

@@ -37,10 +37,13 @@ void CallstackWidget::OnDebugModeEntered()
     int counter = 0;
     int counter = 0;
     for (u32 addr = 0x10000000; addr >= sp; addr -= 4)
     for (u32 addr = 0x10000000; addr >= sp; addr -= 4)
     {
     {
+        if (!Memory::IsValidVirtualAddress(addr))
+            break;
+
         const u32 ret_addr = Memory::Read32(addr);
         const u32 ret_addr = Memory::Read32(addr);
         const u32 call_addr = ret_addr - 4; //get call address???
         const u32 call_addr = ret_addr - 4; //get call address???
 
 
-        if (Memory::GetPointer(call_addr) == nullptr)
+        if (!Memory::IsValidVirtualAddress(call_addr))
             break;
             break;
 
 
         /* TODO (mattvail) clean me, move to debugger interface */
         /* TODO (mattvail) clean me, move to debugger interface */