From: notaz <notasas@gmail.com>
Date: Fri, 9 Sep 2022 22:58:53 +0000 (+0300)
Subject: psxinterpreter: sync with upstream
X-Git-Tag: r24l~396
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7254d73772d63a5babe4061cba61ffa3e4a9e1b6;p=pcsx_rearmed.git

psxinterpreter: sync with upstream

for easier merging
---

diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c
index e6f1587e..e7e32690 100644
--- a/libpcsxcore/psxinterpreter.c
+++ b/libpcsxcore/psxinterpreter.c
@@ -25,9 +25,10 @@
 #include "r3000a.h"
 #include "gte.h"
 #include "psxhle.h"
-#include "debug.h"
 #include "psxinterpreter.h"
 #include <assert.h>
+//#include "debug.h"
+#define ProcessDebug()
 
 static int branch = 0;
 static int branch2 = 0;
@@ -41,14 +42,6 @@ static u32 branchPC;
 #define debugI()
 #endif
 
-#ifndef NDEBUG
-#include "debug.h"
-#else
-void StartDebugger() {}
-void ProcessDebug() {}
-void StopDebugger() {}
-#endif
-
 // Subsets
 void (*psxBSC[64])();
 void (*psxSPC[64])();
@@ -60,7 +53,7 @@ void (*psxCP2BSC[32])();
 static u32 fetchNoCache(u32 pc)
 {
 	u32 *code = (u32 *)PSXM(pc);
-	return ((code == INVALID_PTR) ? 0 : SWAP32(*code));
+	return ((code == NULL) ? 0 : SWAP32(*code));
 }
 
 /*
@@ -83,7 +76,7 @@ static u32 fetchICache(u32 pc)
 		if (((entry->tag ^ pc) & 0xfffffff0) != 0 || pc < entry->tag)
 		{
 			u32 *code = (u32 *)PSXM(pc & ~0x0f);
-			if (code == INVALID_PTR)
+			if (!code)
 				return 0;
 
 			entry->tag = pc;