summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
diff options
context:
space:
mode:
authorMai <mai.iam2048@gmail.com>2023-03-08 17:38:40 -0500
committerGitHub <noreply@github.com>2023-03-08 17:38:40 -0500
commit2856723bc1e15c3511d7f94b62fdbce98588ff86 (patch)
tree738b42d375ac31e1e0f0d52dbe965cfa89123758 /Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
parentc592c94395c8ef271eef331ba27d2afaa694c5e9 (diff)
parenta1c2651fee4b10ed5e7276b37669f4cd16aabf49 (diff)
Merge pull request #11632 from AdmiralCurtiss/pass-more-system
Pass System to Boot functions, CPUThreadGuard, IEXIDevice.
Diffstat (limited to 'Source/Core/DolphinQt/Debugger/MemoryWidget.cpp')
-rw-r--r--Source/Core/DolphinQt/Debugger/MemoryWidget.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
index ab3e269470..0c3646ec7a 100644
--- a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
@@ -32,6 +32,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/AddressSpace.h"
+#include "Core/System.h"
#include "DolphinQt/Debugger/MemoryViewWidget.h"
#include "DolphinQt/Host.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h"
@@ -496,7 +497,7 @@ void MemoryWidget::SetAddress(u32 address)
AddressSpace::Accessors* accessors =
AddressSpace::GetAccessors(m_memory_view->GetAddressSpace());
- Core::CPUThreadGuard guard;
+ Core::CPUThreadGuard guard(Core::System::GetInstance());
good = accessors->IsValidAddress(guard, current_addr);
}
@@ -653,7 +654,7 @@ void MemoryWidget::OnSetValue()
return;
}
- Core::CPUThreadGuard guard;
+ Core::CPUThreadGuard guard(Core::System::GetInstance());
AddressSpace::Accessors* accessors = AddressSpace::GetAccessors(m_memory_view->GetAddressSpace());
u32 end_address = target_addr.address + static_cast<u32>(bytes.size()) - 1;
@@ -715,7 +716,7 @@ void MemoryWidget::OnSetValueFromFile()
AddressSpace::Accessors* accessors = AddressSpace::GetAccessors(m_memory_view->GetAddressSpace());
- Core::CPUThreadGuard guard;
+ Core::CPUThreadGuard guard(Core::System::GetInstance());
for (u8 b : file_contents)
accessors->WriteU8(guard, target_addr.address++, b);
@@ -833,7 +834,7 @@ void MemoryWidget::FindValue(bool next)
AddressSpace::Accessors* accessors =
AddressSpace::GetAccessors(m_memory_view->GetAddressSpace());
- Core::CPUThreadGuard guard;
+ Core::CPUThreadGuard guard(Core::System::GetInstance());
return accessors->Search(guard, target_addr.address,
reinterpret_cast<const u8*>(search_for.data()),
static_cast<u32>(search_for.size()), next);