Debugger: Split out SymbolImporter into its own class

EmulationCollective · Dec 5, 2024 · 40a5b5f · 40a5b5f
1 parent 369b7b9
commit 40a5b5f
Show file tree

Hide file tree

Showing 12 changed files with 516 additions and 447 deletions.
diff --git a/pcsx2-qt/Debugger/SymbolTree/SymbolTreeDelegates.h b/pcsx2-qt/Debugger/SymbolTree/SymbolTreeDelegates.h
@@ -5,6 +5,7 @@
 
 #include <QtWidgets/QStyledItemDelegate>
 
+#include "DebugTools/DebugInterface.h"
 #include "DebugTools/SymbolGuardian.h"
 
 class SymbolTreeValueDelegate : public QStyledItemDelegate

diff --git a/pcsx2-qt/Debugger/SymbolTree/SymbolTreeWidgets.cpp b/pcsx2-qt/Debugger/SymbolTree/SymbolTreeWidgets.cpp
@@ -61,7 +61,7 @@ void SymbolTreeWidget::reset()
 
 	m_ui.treeView->setColumnHidden(SymbolTreeModel::SIZE, !m_show_size_column || !m_show_size_column->isChecked());
 
-	m_cpu.GetSymbolGuardian().UpdateFunctionHashes(m_cpu);
+	m_cpu.GetSymbolImporter().UpdateFunctionHashes(m_cpu);
 
 	SymbolFilters filters;
 	std::unique_ptr<SymbolTreeNode> root;

diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
@@ -789,6 +789,7 @@ set(pcsx2DebugToolsSources
 	DebugTools/MipsStackWalk.cpp
 	DebugTools/Breakpoints.cpp
 	DebugTools/SymbolGuardian.cpp
+	DebugTools/SymbolImporter.cpp
 	DebugTools/DisR3000A.cpp
 	DebugTools/DisR5900asm.cpp
 	DebugTools/DisVU0Micro.cpp
@@ -806,6 +807,7 @@ set(pcsx2DebugToolsHeaders
 	DebugTools/MipsStackWalk.h
 	DebugTools/Breakpoints.h
 	DebugTools/SymbolGuardian.h
+	DebugTools/SymbolImporter.h
 	DebugTools/Debug.h
 	DebugTools/DisASM.h
 	DebugTools/DisVUmicro.h

diff --git a/pcsx2/DebugTools/DebugInterface.cpp b/pcsx2/DebugTools/DebugInterface.cpp
@@ -894,6 +894,11 @@ SymbolGuardian& R5900DebugInterface::GetSymbolGuardian() const
 	return R5900SymbolGuardian;
 }
 
+SymbolImporter& R5900DebugInterface::GetSymbolImporter() const
+{
+	return R5900SymbolImporter;
+}
+
 std::vector<std::unique_ptr<BiosThread>> R5900DebugInterface::GetThreadList() const
 {
 	return getEEThreads();
@@ -1213,6 +1218,11 @@ SymbolGuardian& R3000DebugInterface::GetSymbolGuardian() const
 	return R3000SymbolGuardian;
 }
 
+SymbolImporter& R3000DebugInterface::GetSymbolImporter() const
+{
+	return R3000SymbolImporter;
+}
+
 std::vector<std::unique_ptr<BiosThread>> R3000DebugInterface::GetThreadList() const
 {
 	return getIOPThreads();

diff --git a/pcsx2/DebugTools/DebugInterface.h b/pcsx2/DebugTools/DebugInterface.h
@@ -6,6 +6,7 @@
 #include "MemoryTypes.h"
 #include "ExpressionParser.h"
 #include "SymbolGuardian.h"
+#include "SymbolImporter.h"
 
 #include <string>
 
@@ -81,8 +82,9 @@ class DebugInterface : public MemoryReader
 	virtual bool isValidAddress(u32 address) = 0;
 	virtual u32 getCycles() = 0;
 	virtual BreakPointCpu getCpuType() = 0;
-	[[nodiscard]] virtual SymbolGuardian& GetSymbolGuardian() const = 0;
-	[[nodiscard]] virtual std::vector<std::unique_ptr<BiosThread>> GetThreadList() const = 0;
+	virtual SymbolGuardian& GetSymbolGuardian() const = 0;
+	virtual SymbolImporter& GetSymbolImporter() const = 0;
+	virtual std::vector<std::unique_ptr<BiosThread>> GetThreadList() const = 0;
 
 	bool evaluateExpression(const char* expression, u64& dest);
 	bool initExpression(const char* exp, PostfixExpression& dest);
@@ -136,8 +138,9 @@ class R5900DebugInterface : public DebugInterface
 	bool getCPCOND0() override;
 	void setPc(u32 newPc) override;
 	void setRegister(int cat, int num, u128 newValue) override;
-	[[nodiscard]] SymbolGuardian& GetSymbolGuardian() const override;
-	[[nodiscard]] std::vector<std::unique_ptr<BiosThread>> GetThreadList() const override;
+	SymbolGuardian& GetSymbolGuardian() const override;
+	SymbolImporter& GetSymbolImporter() const override;
+	std::vector<std::unique_ptr<BiosThread>> GetThreadList() const override;
 
 	std::string disasm(u32 address, bool simplify) override;
 	bool isValidAddress(u32 address) override;
@@ -178,8 +181,9 @@ class R3000DebugInterface : public DebugInterface
 	bool getCPCOND0() override;
 	void setPc(u32 newPc) override;
 	void setRegister(int cat, int num, u128 newValue) override;
-	[[nodiscard]] SymbolGuardian& GetSymbolGuardian() const override;
-	[[nodiscard]] std::vector<std::unique_ptr<BiosThread>> GetThreadList() const override;
+	SymbolGuardian& GetSymbolGuardian() const override;
+	SymbolImporter& GetSymbolImporter() const override;
+	std::vector<std::unique_ptr<BiosThread>> GetThreadList() const override;
 
 	std::string disasm(u32 address, bool simplify) override;
 	bool isValidAddress(u32 address) override;