From 4703b6cb56054f0b29ea2b93af7b4fa8a07a7b67 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 27 Nov 2021 16:27:52 -0800
Subject: [PATCH] softjit: Cleanup, add other arch types to regcache.

---
 GPU/Software/DrawPixel.cpp | 21 +++++++--------------
 GPU/Software/DrawPixel.h   | 12 ++++++++++--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/GPU/Software/DrawPixel.cpp b/GPU/Software/DrawPixel.cpp
index 67c91e0649..651c8e8762 100644
--- a/GPU/Software/DrawPixel.cpp
+++ b/GPU/Software/DrawPixel.cpp
@@ -645,9 +645,12 @@ void PixelRegCache::Reset(bool validate) {
 	regs.clear();
 }
 
-void PixelRegCache::Add(PixelRegCache::Reg r, PixelRegCache::Purpose p) {
-	RegStatus *status = FindReg(r, (p & FLAG_GEN) != 0);
-	_assert_msg_(status == nullptr, "softjit Add() reg duplicate (%04X)", p);
+void PixelRegCache::Add(Reg r, Purpose p) {
+	for (auto &reg : regs) {
+		if (reg.reg == r && (reg.purpose & FLAG_GEN) == (p & FLAG_GEN)) {
+			_assert_msg_(false, "softjit Add() reg duplicate (%04X)", p);
+		}
+	}
 	_assert_msg_(r != REG_INVALID_VALUE, "softjit Add() invalid reg (%04X)", p);
 
 	RegStatus newStatus;
@@ -696,7 +699,7 @@ void PixelRegCache::Unlock(Reg &r, Purpose p) {
 	_assert_msg_(false, "softjit Unlock() reg that isn't there (%04X)", p);
 }
 
-bool PixelRegCache::Has(PixelRegCache::Purpose p) {
+bool PixelRegCache::Has(Purpose p) {
 	for (auto &reg : regs) {
 		if (reg.purpose == p) {
 			return true;
@@ -824,14 +827,4 @@ PixelRegCache::RegStatus *PixelRegCache::FindReg(Reg r, Purpose p) {
 	return nullptr;
 }
 
-PixelRegCache::RegStatus *PixelRegCache::FindReg(Reg r, bool isGen) {
-	for (auto &reg : regs) {
-		if (reg.reg == r && (reg.purpose & FLAG_GEN) == (isGen ? FLAG_GEN : 0)) {
-			return &reg;
-		}
-	}
-
-	return nullptr;
-}
-
 };
diff --git a/GPU/Software/DrawPixel.h b/GPU/Software/DrawPixel.h
index 271aa839ec..dc6721eac2 100644
--- a/GPU/Software/DrawPixel.h
+++ b/GPU/Software/DrawPixel.h
@@ -100,9 +100,18 @@ struct PixelRegCache {
 		GEN_INVALID = 0xFFFF,
 	};
 
-#if PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64)
+#if PPSSPP_ARCH(ARM)
+	typedef ArmGen::ARMReg Reg;
+	static constexpr Reg REG_INVALID_VALUE = ArmGen::INVALID_REG;
+#elif PPSSPP_ARCH(ARM64)
+	typedef Arm64Gen::ARM64Reg Reg;
+	static constexpr Reg REG_INVALID_VALUE = Arm64Gen::INVALID_REG;
+#elif PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64)
 	typedef Gen::X64Reg Reg;
 	static constexpr Reg REG_INVALID_VALUE = Gen::INVALID_REG;
+#elif PPSSPP_ARCH(MIPS)
+	typedef MIPSGen::MIPSReg Reg;
+	static constexpr Reg REG_INVALID_VALUE = MIPSGen::INVALID_REG;
 #else
 	typedef int Reg;
 	static constexpr Reg REG_INVALID_VALUE = -1;
@@ -131,7 +140,6 @@ struct PixelRegCache {
 
 private:
 	RegStatus *FindReg(Reg r, Purpose p);
-	RegStatus *FindReg(Reg r, bool isGen);
 
 	std::vector<RegStatus> regs;
 };