log frame support / parse_hex_qstring

rpcs3/rpcs3qt/debugger_frame.cpp

@@ -1730,21 +1730,13 @@ void debugger_frame::RegsShowMemoryViewerAction()
 	}
 
 	const QTextDocumentFragment frag(cursor);
-	QString selected = frag.toPlainText().trimmed();
+	const QString selected = frag.toPlainText().trimmed();
-
+	quint64 pc = 0;
-	int pos = 0;
+	if (!parse_hex_qstring(selected, &pc))
-	const HexValidator validator(this);
-	const QValidator::State st = validator.validate(selected, pos);
-	if (st != QValidator::Acceptable)
 	{
 		QMessageBox::critical(this, tr("Invalid Hex"), tr("“%0” is not a valid 32-bit hex value.").arg(selected));
 		return;
 	}
 
-	const QString norm = normalize_hex_qstring(selected);
+	memory_viewer_panel::ShowAtPC(static_cast<u32>(pc));
-	bool ok = false;
-	const quint64 value = norm.toULongLong(&ok, 16);
-	const u32 pc = static_cast<u32>(value);
-
-	memory_viewer_panel::ShowAtPC(pc);
 }

rpcs3/rpcs3qt/hex_validator.h

@@ -69,3 +69,23 @@ inline QString normalize_hex_qstring(const QString& input)
 		s.chop(1);
 	return s;
 }
+
+inline bool parse_hex_qstring(const QString& input, quint64* result, int max_bits = 32)
+{
+	QString s = input;
+	int pos = 0;
+	const HexValidator validator(nullptr, max_bits);
+	const QValidator::State st = validator.validate(s, pos);
+
+	if (st != QValidator::Acceptable)
+		return false;
+
+	const QString norm = normalize_hex_qstring(input);
+	bool ok = false;
+	const quint64 value = norm.toULongLong(&ok, 16);
+
+	if (ok)
+		*result = static_cast<u64>(value);
+
+	return ok;
+}

rpcs3/rpcs3qt/log_frame.cpp

@@ -1,6 +1,8 @@
 #include "log_frame.h"
 #include "qt_utils.h"
 #include "gui_settings.h"
+#include "hex_validator.h"
+#include "memory_viewer_panel.h"
 
 #include "Utilities/lockless.h"
 #include "util/asm.hpp"
@@ -250,6 +252,21 @@ void log_frame::CreateAndConnectActions()
 		Q_EMIT PerformGoToOnDebugger(pte->textCursor().selectedText(), true);
 	});
 
+	m_perform_show_in_mem_viewer = new QAction(tr("Show in Memory Viewer"), this);
+	connect(m_perform_show_in_mem_viewer, &QAction::triggered, [this]()
+	{
+		QPlainTextEdit* pte = (m_tabWidget->currentIndex() == 1 ? m_tty : m_log);
+		const QString selected = pte->textCursor().selectedText();
+		quint64 pc = 0;
+		if (!parse_hex_qstring(selected, &pc))
+		{
+			QMessageBox::critical(this, tr("Invalid Hex"), tr("“%0” is not a valid 32-bit hex value.").arg(selected));
+			return;
+		}
+
+		memory_viewer_panel::ShowAtPC(static_cast<u32>(pc));
+	});
+
 	m_perform_goto_thread_on_debugger = new QAction(tr("Show Thread On The Debugger"), this);
 	connect(m_perform_goto_thread_on_debugger, &QAction::triggered, [this]()
 	{
@@ -354,13 +371,16 @@ void log_frame::CreateAndConnectActions()
 		menu->addAction(m_clear_act);
 		menu->addAction(m_perform_goto_on_debugger);
 		menu->addAction(m_perform_goto_thread_on_debugger);
+		menu->addAction(m_perform_show_in_mem_viewer);
 
 		std::shared_ptr<bool> goto_signal_accepted = std::make_shared<bool>(false);
 		Q_EMIT PerformGoToOnDebugger("", true, true, goto_signal_accepted);
 		m_perform_goto_on_debugger->setEnabled(m_log->textCursor().hasSelection() && *goto_signal_accepted);
 		m_perform_goto_thread_on_debugger->setEnabled(m_log->textCursor().hasSelection() && *goto_signal_accepted);
+		m_perform_show_in_mem_viewer->setEnabled(m_log->textCursor().hasSelection() && *goto_signal_accepted);
 		m_perform_goto_on_debugger->setToolTip(tr("Jump to the selected hexadecimal address from the log text on the debugger."));
 		m_perform_goto_thread_on_debugger->setToolTip(tr("Show the thread that corresponds to the thread ID from the log text on the debugger."));
+		m_perform_show_in_mem_viewer->setToolTip(tr("Jump to the selected hexadecimal address from the log text on the memory viewer."));
 
 		menu->addSeparator();
 		menu->addActions(m_log_level_acts->actions());
@@ -376,11 +396,14 @@ void log_frame::CreateAndConnectActions()
 		QMenu* menu = m_tty->createStandardContextMenu();
 		menu->addAction(m_clear_tty_act);
 		menu->addAction(m_perform_goto_on_debugger);
+		menu->addAction(m_perform_show_in_mem_viewer);
 
 		std::shared_ptr<bool> goto_signal_accepted = std::make_shared<bool>(false);
 		Q_EMIT PerformGoToOnDebugger("", false, true, goto_signal_accepted);
 		m_perform_goto_on_debugger->setEnabled(m_tty->textCursor().hasSelection() && *goto_signal_accepted);
+		m_perform_show_in_mem_viewer->setEnabled(m_tty->textCursor().hasSelection() && *goto_signal_accepted);
 		m_perform_goto_on_debugger->setToolTip(tr("Jump to the selected hexadecimal address from the TTY text on the debugger."));
+		m_perform_show_in_mem_viewer->setToolTip(tr("Jump to the selected hexadecimal address from the TTY text on the memory viewer."));
 
 		menu->addSeparator();
 		menu->addAction(m_tty_act);

rpcs3/rpcs3qt/log_frame.h

@@ -74,6 +74,7 @@ private:
 	QAction* m_clear_tty_act = nullptr;
 	QAction* m_perform_goto_on_debugger = nullptr;
 	QAction* m_perform_goto_thread_on_debugger = nullptr;
+	QAction* m_perform_show_in_mem_viewer = nullptr;
 
 	QActionGroup* m_log_level_acts = nullptr;
 	QAction* m_nothing_act = nullptr;