diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-03-12 04:12:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 04:12:52 +0100 |
| commit | 551dcec0b147b8d5c9828017edfde64ca9b90594 (patch) | |
| tree | df7cf5e0300e8cee8c569adf3a1c7a7524074c83 /Source/Core/DolphinQt/Debugger/MemoryWidget.cpp | |
| parent | 6ccf35ad4df6fa54105e6e347eb9ae278efbbb56 (diff) | |
| parent | 26141eece81642d3c9c226cded768da6ddb9069c (diff) | |
Merge pull request #12602 from mitaclaw/qt-memory-global-system
Memory(View)Widget: Avoid Global System Accessor
Diffstat (limited to 'Source/Core/DolphinQt/Debugger/MemoryWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Debugger/MemoryWidget.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp index 3910d093aa..9b2fba6d29 100644 --- a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp @@ -40,7 +40,8 @@ using Type = MemoryViewWidget::Type; -MemoryWidget::MemoryWidget(QWidget* parent) : QDockWidget(parent) +MemoryWidget::MemoryWidget(Core::System& system, QWidget* parent) + : QDockWidget(parent), m_system(system) { setWindowTitle(tr("Memory")); setObjectName(QStringLiteral("memory")); @@ -287,7 +288,7 @@ void MemoryWidget::CreateWidgets() sidebar_scroll->setWidget(sidebar); sidebar_scroll->setWidgetResizable(true); - m_memory_view = new MemoryViewWidget(this); + m_memory_view = new MemoryViewWidget(m_system, this); m_splitter->addWidget(m_memory_view); m_splitter->addWidget(sidebar_scroll); @@ -496,7 +497,7 @@ void MemoryWidget::SetAddress(u32 address) AddressSpace::Accessors* accessors = AddressSpace::GetAccessors(m_memory_view->GetAddressSpace()); - Core::CPUThreadGuard guard(Core::System::GetInstance()); + const Core::CPUThreadGuard guard(m_system); good = accessors->IsValidAddress(guard, current_addr); } @@ -653,7 +654,7 @@ void MemoryWidget::OnSetValue() return; } - Core::CPUThreadGuard guard(Core::System::GetInstance()); + const Core::CPUThreadGuard guard(m_system); 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::System::GetInstance()); + const Core::CPUThreadGuard guard(m_system); 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::System::GetInstance()); + const Core::CPUThreadGuard guard(m_system); return accessors->Search(guard, target_addr.address, reinterpret_cast<const u8*>(search_for.data()), static_cast<u32>(search_for.size()), next); |