adding the window of the cgram debugger (-g to activate)

sources/Debugger/cgramDebug.cpp

@@ -22,13 +22,7 @@ namespace ComSquare::Debugger
 		this->_window->setAttribute(Qt::WA_QuitOnClose, false);
 		this->_window->setAttribute(Qt::WA_DeleteOnClose);
 
-		/*this->_ui.setupUi(this->_window);
-		this->_ui.log->setModel(&this->_model);
-		this->_ui.log->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
-		//this->_ui.log->horizontalHeader()->setStretchLastSection(true);
-		this->_ui.log->horizontalHeader()->setSectionsMovable(false);
-		for (int i = 0; i < this->_model.column; i++)
-			this->_ui.log->setColumnWidth(i, this->_ui.log->width());*/
+		this->_ui.setupUi(this->_window);
 
 		this->_window->show();
 	}
@@ -68,8 +62,14 @@ QVariant cgramModel::data(const QModelIndex &index, int role) const
 {
 	if (role == Qt::TextAlignmentRole)
 		return Qt::AlignCenter;
-	if (role != Qt::DisplayRole)
-		return QVariant();
 	if (role == Qt::BackgroundRole)
 		return 1;
+	this->_ppu.cgramRead(0);
+	if (role != Qt::DisplayRole)
+		return QVariant();
+}
+
+void cgramModel::ppu(const ComSquare::PPU::PPU &ppu)
+{
+	this->_ppu = ppu;
 }

sources/Debugger/cgramDebug.hpp

@@ -11,6 +11,38 @@
 #include <QtCore/QSortFilterProxyModel>
 #include "ClosableWindow.hpp"
 
+
+/*namespace ComSquare
+{
+	class SNES;
+	namespace Debugger
+	{
+		//! @brief Window that show the header of the currently running game.
+		class cgramViewer {
+		private:
+			//! @brief The QT window for this debugger.
+			ClosableWindow<cgramViewer> *_window{};
+			//! @brief A reference to the snes (to disable the debugger).
+			SNES &_snes;
+			//! @brief The layout of the viewer.
+			Ui::CgramView _ui;
+			//! @brief The ppu containing the cgram.
+			ComSquare::PPU::PPU &_ppu;
+		public slots:
+			//! @brief Called when the window is closed. Turn off the debugger and revert to a basic CPU.
+			void disableDebugger();
+		public:
+			//! @brief Focus the debugger's window.
+			void focus();
+
+			explicit cgramViewer(SNES &snes, ComSquare::PPU::PPU &ppu);
+			cgramViewer(const cgramViewer &) = delete;
+			cgramViewer &operator=(const cgramViewer &) = delete;
+			~cgramViewer() = default;
+		};
+	}
+}*/
+
 /*namespace ComSquare::cgramDebugger
 {
 	//! @brief The struct used to represent memory bus logs.
@@ -30,6 +62,9 @@
 class cgramModel : public QAbstractTableModel
 {
 Q_OBJECT
+private:
+	//! @brief The ppu to log the cgram.
+	ComSquare::PPU::PPU &_ppu;
 public:
 	//! @brief The number of columns
 	const int column = 16;
@@ -40,6 +75,8 @@ public:
 	const cgramModel &operator=(const cgramModel &) = delete;
 	~cgramModel() override = default;
 
+	//! @brief set the reference to the ppu
+	void ppu(const ComSquare::PPU::PPU &ppu);
 	//! @brief The number of row the table has.
 	int rowCount(const QModelIndex &parent) const override;
 	//! @brief The number of column the table has.

sources/SNES.cpp

@@ -131,25 +131,17 @@ namespace ComSquare
 	void SNES::enableCgramDebugging()
 	{
 		#ifdef DEBUGGER_ENABLED
-			if (this->_bus->isDebugger())
-				std::static_pointer_cast<Debugger::MemoryBusDebug>(this->_bus)->focus();
+			if (this->_cgramViewer)
+				this->_cgramViewer->focus();
 			else
-			{
-				this->_bus = std::make_shared<Debugger::MemoryBusDebug>(*this, *this->_bus);
-				this->cpu->setMemoryBus(this->_bus);
-			}
-	#else
-			std::cerr << "Debugging features are not enabled. You can't enable the debugger." << std::endl;
+				this->_cgramViewer = std::make_unique<Debugger::cgramDebug>(*this, *this->ppu);
 		#endif
 	}
 
 	void SNES::disableCgramDebugging()
 	{
 		#ifdef DEBUGGER_ENABLED
-			this->_bus = std::make_shared<Memory::MemoryBus>(*this->_bus);
-			this->cpu->setMemoryBus(this->_bus);
-	#else
-			std::cerr << "Debugging features are not enabled. You can't enable the debugger." << std::endl;
+				this->_cgramViewer = nullptr;
 		#endif
 	}
 }

sources/SNES.hpp

@@ -15,6 +15,7 @@
 #ifdef DEBUGGER_ENABLED
 #include "Debugger/MemoryViewer.hpp"
 #include "Debugger/HeaderViewer.hpp"
+#include "Debugger/cgramDebug.hpp"
 
 #endif
 
@@ -28,6 +29,8 @@ namespace ComSquare
 		std::unique_ptr<Debugger::MemoryViewer> _ramViewer;
 		//! @brief The window that allow the user to view the cartridge's header.
 		std::unique_ptr<Debugger::HeaderViewer> _headerViewer;
+		//! @brief The window that allow the user to view the CGRAM.
+		std::unique_ptr<Debugger::cgramDebug> _cgramViewer;
 #endif
 		//! @brief The memory bus that map addresses to components.
 		std::shared_ptr<Memory::MemoryBus> _bus;

sources/main.cpp

@@ -32,10 +32,11 @@ void parseArguments(int argc, char **argv, SNES &snes)
 			{"memory", no_argument, 0, 'm'},
 			{"header", no_argument, 0, 'h'},
 			{"bus",    no_argument, 0, 'b'},
+			{"cgram",  no_argument, 0, 'g'},
 			{0, 0,                  0, 0}
 		};
 
-		int c = getopt_long(argc, argv, "camhb", long_options, &option_index);
+		int c = getopt_long(argc, argv, "camhbg", long_options, &option_index);
 		if (c == -1)
 			break;
 		switch (c) {
@@ -57,6 +58,9 @@ void parseArguments(int argc, char **argv, SNES &snes)
 		case 'b':
 			snes.enableMemoryBusDebugging();
 			break;
+		case 'g':
+			snes.enableCgramDebugging();
+			break;
 		default:
 			break;
 		}