ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DebugInterface: Check visited addresses in GetThreads

This commit is contained in:
Sepalani 2021-02-25 19:39:55 +04:00
parent 1fe0953bd5
commit 8279613a49
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Debugger/PPCDebugInterface.cpp
View File

@ -4,9 +4,11 @@
#include "Core/Debugger/PPCDebugInterface.h" #include "Core/Debugger/PPCDebugInterface.h"
#include <algorithm>
#include <array> #include <array>
#include <cstddef> #include <cstddef>
#include <string> #include <string>
#include <vector>
#include <fmt/format.h> #include <fmt/format.h>
@ -181,9 +183,13 @@ Common::Debug::Threads PPCDebugInterface::GetThreads() const
if (!active_thread->IsValid()) if (!active_thread->IsValid())
return threads; return threads;
const auto insert_threads = [&threads](u32 addr, auto get_next_addr) { std::vector<u32> visited_addrs{{active_thread->GetAddress()}};
const auto insert_threads = [&threads, &visited_addrs](u32 addr, auto get_next_addr) {
while (addr != 0 && PowerPC::HostIsRAMAddress(addr)) while (addr != 0 && PowerPC::HostIsRAMAddress(addr))
{ {
if (std::find(visited_addrs.begin(), visited_addrs.end(), addr) != visited_addrs.end())
break;
visited_addrs.push_back(addr);
auto thread = std::make_unique<Core::Debug::OSThreadView>(addr); auto thread = std::make_unique<Core::Debug::OSThreadView>(addr);
if (!thread->IsValid()) if (!thread->IsValid())
break; break;