diff options
| author | JosJuice <josjuice@gmail.com> | 2023-04-01 18:02:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-01 18:02:04 +0200 |
| commit | 450ca0b69ea70f56e25670040f1dfdc01bf52ba9 (patch) | |
| tree | 061833f63b86e19169024afd9ca8179ecaff066f /Source/Core/DolphinQt/Debugger/ThreadWidget.cpp | |
| parent | 7e9a63b9873d56f0a2c1b814a04437374621fb24 (diff) | |
| parent | 8dabd1a0256e4761ad88494280d74397e16af9f5 (diff) | |
Merge pull request #11700 from AdmiralCurtiss/mmu-class
PowerPC/MMU: Refactor to class, move to System.
Diffstat (limited to 'Source/Core/DolphinQt/Debugger/ThreadWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Debugger/ThreadWidget.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/DolphinQt/Debugger/ThreadWidget.cpp b/Source/Core/DolphinQt/Debugger/ThreadWidget.cpp index 147efa3779..3905700f2b 100644 --- a/Source/Core/DolphinQt/Debugger/ThreadWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/ThreadWidget.cpp @@ -268,7 +268,8 @@ void ThreadWidget::Update() return QStringLiteral("%1").arg(value, 8, 16, QLatin1Char('0')); }; const auto format_hex_from = [&format_hex](const Core::CPUThreadGuard& guard, u32 addr) { - addr = PowerPC::HostIsRAMAddress(guard, addr) ? PowerPC::HostRead_U32(guard, addr) : 0; + addr = + PowerPC::MMU::HostIsRAMAddress(guard, addr) ? PowerPC::MMU::HostRead_U32(guard, addr) : 0; return format_hex(addr); }; const auto get_state = [](u16 thread_state) { @@ -449,13 +450,13 @@ void ThreadWidget::UpdateThreadCallstack(const Core::CPUThreadGuard& guard, u32 sp = context.gpr->at(1); for (int i = 0; i < 16; i++) { - if (sp == 0 || sp == 0xffffffff || !PowerPC::HostIsRAMAddress(guard, sp)) + if (sp == 0 || sp == 0xffffffff || !PowerPC::MMU::HostIsRAMAddress(guard, sp)) break; m_callstack_table->insertRow(i); m_callstack_table->setItem(i, 0, new QTableWidgetItem(format_hex(sp))); - if (PowerPC::HostIsRAMAddress(guard, sp + 4)) + if (PowerPC::MMU::HostIsRAMAddress(guard, sp + 4)) { - const u32 lr_save = PowerPC::HostRead_U32(guard, sp + 4); + const u32 lr_save = PowerPC::MMU::HostRead_U32(guard, sp + 4); m_callstack_table->setItem(i, 2, new QTableWidgetItem(format_hex(lr_save))); m_callstack_table->setItem(i, 3, new QTableWidgetItem(QString::fromStdString( @@ -465,7 +466,7 @@ void ThreadWidget::UpdateThreadCallstack(const Core::CPUThreadGuard& guard, { m_callstack_table->setItem(i, 2, new QTableWidgetItem(QStringLiteral("--------"))); } - sp = PowerPC::HostRead_U32(guard, sp); + sp = PowerPC::MMU::HostRead_U32(guard, sp); m_callstack_table->setItem(i, 1, new QTableWidgetItem(format_hex(sp))); } } |