Debugger: Implement boot and debug

Creates a breakpoint automatically on the ELF entry point

pcsx2-qt/Debugger/DebuggerWindow.cpp

@@ -88,16 +88,18 @@ void DebuggerWindow::onVMStateChanged()
 		m_actionStepInto->setEnabled(true);
 		m_actionStepOver->setEnabled(true);
 		m_actionStepOut->setEnabled(true);
-		CBreakPoints::ClearTemporaryBreakPoints();
+		Host::RunOnCPUThread([] {
-
 			if (CBreakPoints::GetBreakpointTriggered())
 			{
+				CBreakPoints::ClearTemporaryBreakPoints();
 				CBreakPoints::SetBreakpointTriggered(false);
 				// Our current PC is on a breakpoint.
 				// When we run the core again, we want to skip this breakpoint and run
 				CBreakPoints::SetSkipFirst(BREAKPOINT_EE, r5900Debug.getPC());
 				CBreakPoints::SetSkipFirst(BREAKPOINT_IOP, r3000Debug.getPC());
 			}
+		});
+		
 	}
 	return;
 }

pcsx2-qt/MainWindow.cpp

@@ -1489,6 +1489,7 @@ void MainWindow::onGameListEntryContextMenuRequested(const QPoint& point)
 			{
 				// TODO: Hook this up once it's implemented.
 				action = menu.addAction(tr("Boot and Debug"));
+				connect(action, &QAction::triggered, [this, entry]() { DebugInterface::setPauseOnEntry(true); startGameListEntry(entry); getDebuggerWindow()->show(); });
 			}
 
 			menu.addSeparator();

pcsx2/DebugTools/Breakpoints.cpp

@@ -19,6 +19,7 @@
 #include "MIPSAnalyst.h"
 #include <cstdio>
 #include "R5900.h"
+#include "R3000A.h"
 #include "System.h"
 
 std::vector<BreakPoint> CBreakPoints::breakPoints_;
@@ -432,7 +433,15 @@ void CBreakPoints::Update(BreakPointCpu cpu, u32 addr)
 		resume = true;
 	}
 
-	SysClearExecutionCache();
+	if (cpu & BREAKPOINT_EE)
+	{
+		Cpu->Reset();
+	}
+
+	if (cpu & BREAKPOINT_IOP)
+	{
+		psxCpu->Reset();
+	}
 
 	if (resume)
 		r5900Debug.resumeCpu();

pcsx2/DebugTools/DebugInterface.cpp

@@ -217,6 +217,8 @@ private:
 // DebugInterface
 //
 
+bool DebugInterface::m_pause_on_entry = false;
+
 bool DebugInterface::isAlive()
 {
 	return VMManager::HasValidVM() && g_FrameCount > 0;

pcsx2/DebugTools/DebugInterface.h

@@ -92,6 +92,12 @@ public:
 	void pauseCpu();
 	void resumeCpu();
 	char* stringFromPointer(u32 p);
+
+	static void setPauseOnEntry(bool pauseOnEntry) { m_pause_on_entry = pauseOnEntry; };
+	static bool getPauseOnEntry() { return m_pause_on_entry; }
+
+private:
+	static bool m_pause_on_entry;
 };
 
 class R5900DebugInterface : public DebugInterface

pcsx2/R5900OpcodeImpl.cpp

@@ -25,6 +25,8 @@
 #include "GS.h"
 #include "CDVD/CDVD.h"
 #include "ps2/BiosTools.h"
+#include "DebugTools/DebugInterface.h"
+#include "DebugTools/Breakpoints.h"
 
 GS_VideoMode gsVideoMode = GS_VideoMode::Uninitialized;
 bool gsIsInterlaced = false;
@@ -942,6 +944,15 @@ void SYSCALL()
 			DevCon.Warning("Set GS CRTC configuration. %s %s (%s)",mode.c_str(), inter, field);
 		}
 		break;
+		case Syscall::ExecPS2:
+		{
+			if (DebugInterface::getPauseOnEntry())
+			{
+				CBreakPoints::AddBreakPoint(BREAKPOINT_EE, cpuRegs.GPR.n.a0.UL[0], true);
+				DebugInterface::setPauseOnEntry(false);
+			}
+		}
+		break;
 		case Syscall::SetOsdConfigParam:
 			AllowParams1 = true;
 			break;

pcsx2/R5900OpcodeTables.h

@@ -19,6 +19,7 @@
 enum Syscall : u8
 {
 	SetGsCrt = 2,
+	ExecPS2 = 7,
 	SetVTLBRefillHandler = 13,
 	StartThread = 34,
 	ChangeThreadPriority = 41,