mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 03:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

debugger_frame: remove pause button

Browse source 
and move its functionality to run button
This commit is contained in:
Megamouse 2017-07-11 17:31:37 +02:00 • committed by Ani
parent 34709eb399
commit 06f6ac66fa
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
rpcs3/rpcs3qt/debugger_frame.cpp
View file

@ -31,8 +31,7 @@ debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), pa
m_go_to_addr = new QPushButton(tr("Go To Address"), this);
m_go_to_pc = new QPushButton(tr("Go To PC"), this);
m_btn_step = new QPushButton(tr("Step"), this);
m_btn_run = new QPushButton(tr("Run"), this);
m_btn_pause = new QPushButton(tr("Pause"), this);
m_btn_run = new QPushButton(Run, this);
EnableButtons(!Emu.IsStopped());
@ -40,7 +39,6 @@ debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), pa
hbox_b_main->addWidget(m_go_to_pc);
hbox_b_main->addWidget(m_btn_step);
hbox_b_main->addWidget(m_btn_run);
hbox_b_main->addWidget(m_btn_pause);
hbox_b_main->addWidget(m_choice_units);
hbox_b_main->addStretch();
@ -76,14 +74,20 @@ debugger_frame::debugger_frame(QWidget *parent) : QDockWidget(tr("Debugger"), pa
connect(m_go_to_pc, &QAbstractButton::clicked, this, &debugger_frame::Show_PC);
connect(m_btn_step, &QAbstractButton::clicked, this, &debugger_frame::DoStep);
connect(m_btn_run, &QAbstractButton::clicked, [=](){
const auto cpu = this->cpu.lock();
if (cpu && cpu->state.test_and_reset(cpu_flag::dbg_pause))
if (!test(cpu->state, cpu_flag::dbg_pause + cpu_flag::dbg_global_pause))
cpu->notify();
UpdateUI();
});
connect(m_btn_pause, &QAbstractButton::clicked, [=](){
if (const auto cpu = this->cpu.lock()) cpu->state += cpu_flag::dbg_pause;
if (const auto cpu = this->cpu.lock())
{
if (m_btn_run->text() == Run && cpu->state.test_and_reset(cpu_flag::dbg_pause))
{
if (!test(cpu->state, cpu_flag::dbg_pause + cpu_flag::dbg_global_pause))
{
cpu->notify();
}
}
else
{
cpu->state += cpu_flag::dbg_pause;
}
}
UpdateUI();
});
connect(m_choice_units, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, &debugger_frame::UpdateUI);
@ -147,7 +151,6 @@ void debugger_frame::UpdateUI()
m_btn_run->setEnabled(false);
m_btn_step->setEnabled(false);
m_btn_pause->setEnabled(false);
}
}
else
@ -163,15 +166,13 @@ void debugger_frame::UpdateUI()
if (test(state & cpu_flag::dbg_pause))
{
m_btn_run->setEnabled(true);
m_btn_run->setText(Run);
m_btn_step->setEnabled(true);
m_btn_pause->setEnabled(false);
}
else
{
m_btn_run->setEnabled(false);
m_btn_run->setText(Pause);
m_btn_step->setEnabled(false);
m_btn_pause->setEnabled(true);
}
}
}
@ -407,7 +408,6 @@ void debugger_frame::EnableButtons(bool enable)
m_go_to_pc->setEnabled(enable);
m_btn_step->setEnabled(enable);
m_btn_run->setEnabled(enable);
m_btn_pause->setEnabled(enable);
}
debugger_list::debugger_list(debugger_frame* parent) : QListWidget(parent)

5
rpcs3/rpcs3qt/debugger_frame.h
View file

@ -42,7 +42,6 @@ class debugger_frame : public QDockWidget
QPushButton* m_go_to_pc;
QPushButton* m_btn_step;
QPushButton* m_btn_run;
QPushButton* m_btn_pause;
QComboBox* m_choice_units;
QString m_current_choice;
bool m_noThreadSelected = true;
@ -54,7 +53,9 @@ class debugger_frame : public QDockWidget
QTimer* update;
const QString NoThread = "No Thread";
const QString NoThread = tr("No Thread");
const QString Run = tr("Run");
const QString Pause = tr("Pause");
public:
std::unique_ptr<CPUDisAsm> m_disasm;