From 9024ba69b46498122c6502b32982863413f0c16e Mon Sep 17 00:00:00 2001
From: Nick Renieris <velocityra@gmail.com>
Date: Tue, 31 Mar 2020 03:45:25 +0300
Subject: [PATCH] Qt/Debugger: Split register misc state info to separate
 panels

---
 rpcs3/rpcs3qt/debugger_frame.cpp | 25 ++++++++++++++++++++-----
 rpcs3/rpcs3qt/debugger_frame.h   |  3 ++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp
index df161b9d39..10864abee2 100644
--- a/rpcs3/rpcs3qt/debugger_frame.cpp
+++ b/rpcs3/rpcs3qt/debugger_frame.cpp
@@ -84,16 +84,23 @@ debugger_frame::debugger_frame(std::shared_ptr<gui_settings> settings, QWidget *
 	hbox_b_main->addWidget(m_choice_units);
 	hbox_b_main->addStretch();
 
-	//Registers
+	// Misc state
+	m_misc_state = new QTextEdit(this);
+	m_misc_state->setLineWrapMode(QTextEdit::NoWrap);
+	m_misc_state->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+
+	// Registers
 	m_regs = new QTextEdit(this);
 	m_regs->setLineWrapMode(QTextEdit::NoWrap);
 	m_regs->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
 
 	m_debugger_list->setFont(m_mono);
+	m_misc_state->setFont(m_mono);
 	m_regs->setFont(m_mono);
 
 	m_right_splitter = new QSplitter(this);
 	m_right_splitter->setOrientation(Qt::Vertical);
+	m_right_splitter->addWidget(m_misc_state);
 	m_right_splitter->addWidget(m_regs);
 	m_right_splitter->addWidget(m_breakpoint_list);
 	m_right_splitter->setStretchFactor(0, 1);
@@ -416,22 +423,30 @@ void debugger_frame::DoUpdate()
 	}
 
 	ShowPC();
-	WriteRegs();
+	WritePanels();
 }
 
-void debugger_frame::WriteRegs()
+void debugger_frame::WritePanels()
 {
 	const auto cpu = this->cpu.lock();
 
 	if (!cpu)
 	{
+		m_misc_state->clear();
 		m_regs->clear();
 		return;
 	}
 
-	int loc = m_regs->verticalScrollBar()->value();
+	int loc;
+
+	loc = m_regs->verticalScrollBar()->value();
+	m_misc_state->clear();
+	m_misc_state->setText(qstr(cpu->dump_misc()));
+	m_misc_state->verticalScrollBar()->setValue(loc);
+
+	loc = m_regs->verticalScrollBar()->value();
 	m_regs->clear();
-	m_regs->setText(qstr(cpu->dump()));
+	m_regs->setText(qstr(cpu->dump_regs()));
 	m_regs->verticalScrollBar()->setValue(loc);
 }
 
diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3qt/debugger_frame.h
index 3174157a82..9b9c877fb1 100644
--- a/rpcs3/rpcs3qt/debugger_frame.h
+++ b/rpcs3/rpcs3qt/debugger_frame.h
@@ -27,6 +27,7 @@ class debugger_frame : public custom_dock_widget
 	debugger_list* m_debugger_list;
 	QSplitter* m_right_splitter;
 	QFont m_mono;
+	QTextEdit* m_misc_state;
 	QTextEdit* m_regs;
 	QPushButton* m_go_to_addr;
 	QPushButton* m_go_to_pc;
@@ -65,7 +66,7 @@ public:
 
 	u32 GetPc() const;
 	void DoUpdate();
-	void WriteRegs();
+	void WritePanels();
 	void EnableButtons(bool enable);
 	void ShowGotoAddressDialog();
 	u64 EvaluateExpression(const QString& expression);