archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 16:01:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Debugger: correctness fixes and cleanup

Browse source 
* Remove m_current_choice, it's not correct to rely on thread name entry. In extreme corner cases a newly thread can be created, old destroyed with the same entry name. (reoccuring LV2 SPU/PPU ID)
* Remove m_no_thread_selected, can be easily replaced with std::weak_ptr expired() function and is more accurate this way.
* In HandleBreakpointRequest: only remove breakpoint on valid PPU thread and not any thread! also fix potential nullptr deref if thread has recently been destroyed.
This commit is contained in:
Eladash 2020-12-16 16:44:41 +02:00 • committed by Ivan
parent ef884642e4
commit 2c06043617
5 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rpcs3/rpcs3qt/debugger_frame.cpp
View file

@ -226,7 +226,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
const auto cpu = this->cpu.lock();
int i = m_debugger_list->currentRow();
if (!isActiveWindow() || !cpu || m_no_thread_selected)
if (!isActiveWindow() || !cpu)
{
return;
}
@ -356,8 +356,6 @@ void debugger_frame::UpdateUI()
{
UpdateUnitList();
if (m_no_thread_selected) return;
const auto cpu = this->cpu.lock();
if (!cpu)
@ -449,18 +447,22 @@ void debugger_frame::UpdateUnitList()
void debugger_frame::OnSelectUnit()
{
if (m_choice_units->count() < 1 || m_current_choice == m_choice_units->currentText()) return;
if (m_choice_units->count() < 1) return;
m_current_choice = m_choice_units->currentText();
m_no_thread_selected = m_current_choice == NoThreadString;
m_debugger_list->m_no_thread_selected = m_no_thread_selected;
const auto weak = m_choice_units->currentData().value<std::weak_ptr<cpu_thread>>();
if (!weak.owner_before(cpu) && !cpu.owner_before(weak))
{
// They match, nothing to do.
return;
}
m_disasm.reset();
cpu.reset();
if (!m_no_thread_selected)
if (!weak.expired())
{
if (const auto cpu0 = m_choice_units->currentData().value<std::weak_ptr<cpu_thread>>().lock())
if (const auto cpu0 = weak.lock())
{
if (cpu0->id_type() == 1)
{
@ -481,7 +483,7 @@ void debugger_frame::OnSelectUnit()
}
}
EnableButtons(!m_no_thread_selected);
EnableButtons(true);
m_debugger_list->UpdateCPUData(this->cpu, m_disasm);
m_breakpoint_list->UpdateCPUData(this->cpu, m_disasm);
@ -698,7 +700,7 @@ void debugger_frame::EnableUpdateTimer(bool enable)
void debugger_frame::EnableButtons(bool enable)
{
if (m_no_thread_selected) enable = false;
if (cpu.expired()) enable = false;
m_go_to_addr->setEnabled(enable);
m_go_to_pc->setEnabled(enable);