From 60bcc5b0831bc7675531013e42896fa766c41fa0 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 2 Sep 2023 22:52:57 -0700
Subject: [PATCH] x86jit: Handle breakpoints.

Otherwise, we don't actually break until later, which isn't great.
Could be more optimal, "rewinding" regcache state.
---
 Core/MIPS/x86/X64IRCompSystem.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/Core/MIPS/x86/X64IRCompSystem.cpp b/Core/MIPS/x86/X64IRCompSystem.cpp
index 91d4730773..b4f9157c09 100644
--- a/Core/MIPS/x86/X64IRCompSystem.cpp
+++ b/Core/MIPS/x86/X64IRCompSystem.cpp
@@ -23,6 +23,7 @@
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/ReplaceTables.h"
 #include "Core/MemMap.h"
+#include "Core/MIPS/IR/IRInterpreter.h"
 #include "Core/MIPS/x86/X64IRJit.h"
 #include "Core/MIPS/x86/X64IRRegCache.h"
 
@@ -88,10 +89,26 @@ void X64JitBackend::CompIR_Breakpoint(IRInst inst) {
 
 	switch (inst.op) {
 	case IROp::Breakpoint:
-	case IROp::MemoryCheck:
-		CompIR_Generic(inst);
+		FlushAll();
+		// Note: the constant could be a delay slot.
+		ABI_CallFunctionC((const void *)&IRRunBreakpoint, inst.constant);
+		TEST(32, R(EAX), R(EAX));
+		J_CC(CC_NZ, dispatcherCheckCoreState_, true);
 		break;
 
+	case IROp::MemoryCheck:
+	{
+		X64Reg addrBase = regs_.MapGPR(inst.src1);
+		FlushAll();
+		LEA(32, addrBase, MDisp(addrBase, inst.constant));
+		MovFromPC(SCRATCH1);
+		LEA(32, SCRATCH1, MDisp(SCRATCH1, inst.dest));
+		ABI_CallFunctionRR((const void *)&IRRunMemCheck, SCRATCH1, addrBase);
+		TEST(32, R(EAX), R(EAX));
+		J_CC(CC_NZ, dispatcherCheckCoreState_, true);
+		break;
+	}
+
 	default:
 		INVALIDOP;
 		break;