From b9de1a44df3eb4586a24f825f35c5085fa3db640 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Thu, 27 Oct 2022 23:26:44 -0700
Subject: [PATCH] jit: Reduce some include pollution.

Usually no need for all of MIPSAnalyst.
---
 Core/MIPS/ARM/ArmCompALU.cpp        | 1 +
 Core/MIPS/ARM/ArmJit.cpp            | 1 +
 Core/MIPS/ARM/ArmRegCache.h         | 7 +++++--
 Core/MIPS/ARM/ArmRegCacheFPU.h      | 7 +++++--
 Core/MIPS/ARM64/Arm64CompALU.cpp    | 1 +
 Core/MIPS/ARM64/Arm64Jit.cpp        | 1 +
 Core/MIPS/ARM64/Arm64RegCache.h     | 5 ++++-
 Core/MIPS/ARM64/Arm64RegCacheFPU.h  | 7 +++++--
 Core/MIPS/JitCommon/JitBlockCache.h | 1 -
 Core/MIPS/x86/CompALU.cpp           | 1 +
 Core/MIPS/x86/Jit.cpp               | 1 +
 Core/MIPS/x86/JitSafeMem.cpp        | 1 +
 Core/MIPS/x86/RegCache.h            | 5 ++++-
 Core/MIPS/x86/RegCacheFPU.h         | 5 ++++-
 unittest/TestArmEmitter.cpp         | 1 +
 15 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/Core/MIPS/ARM/ArmCompALU.cpp b/Core/MIPS/ARM/ArmCompALU.cpp
index 0b5bf067f8..01bf94203e 100644
--- a/Core/MIPS/ARM/ArmCompALU.cpp
+++ b/Core/MIPS/ARM/ArmCompALU.cpp
@@ -24,6 +24,7 @@
 #include "Common/CPUDetect.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Core/MIPS/MIPS.h"
+#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/ARM/ArmJit.h"
 #include "Core/MIPS/ARM/ArmRegCache.h"
diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp
index 74675a6ae4..3048773bb6 100644
--- a/Core/MIPS/ARM/ArmJit.cpp
+++ b/Core/MIPS/ARM/ArmJit.cpp
@@ -33,6 +33,7 @@
 #include "Core/MemMap.h"
 
 #include "Core/MIPS/MIPS.h"
+#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/MIPSInt.h"
 #include "Core/MIPS/MIPSTables.h"
diff --git a/Core/MIPS/ARM/ArmRegCache.h b/Core/MIPS/ARM/ArmRegCache.h
index bd85cc10b2..0a405a7158 100644
--- a/Core/MIPS/ARM/ArmRegCache.h
+++ b/Core/MIPS/ARM/ArmRegCache.h
@@ -17,8 +17,7 @@
 
 #pragma once
 
-#include "../MIPS.h"
-#include "../MIPSAnalyst.h"
+#include "Core/MIPS/MIPS.h"
 #include "ArmEmitter.h"
 
 namespace ArmJitConstants {
@@ -52,6 +51,10 @@ enum {
 
 }
 
+namespace MIPSAnalyst {
+struct AnalysisResults;
+};
+
 // R1 to R6: mapped MIPS regs
 // R8 = flags (maybe we could do better here?)
 // R9 = code pointers
diff --git a/Core/MIPS/ARM/ArmRegCacheFPU.h b/Core/MIPS/ARM/ArmRegCacheFPU.h
index 3e08d719bb..f572c84a97 100644
--- a/Core/MIPS/ARM/ArmRegCacheFPU.h
+++ b/Core/MIPS/ARM/ArmRegCacheFPU.h
@@ -19,8 +19,7 @@
 
 #pragma once
 
-#include "../MIPS.h"
-#include "../MIPSAnalyst.h"
+#include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/ARM/ArmRegCache.h"
 #include "Core/MIPS/MIPSVFPUUtils.h"
 #include "Common/ArmEmitter.h"
@@ -46,6 +45,10 @@ enum {
 
 }
 
+namespace MIPSAnalyst {
+struct AnalysisResults;
+};
+
 struct FPURegARM {
 	int mipsReg;  // if -1, no mipsreg attached.
 	bool isDirty;  // Should the register be written back?
diff --git a/Core/MIPS/ARM64/Arm64CompALU.cpp b/Core/MIPS/ARM64/Arm64CompALU.cpp
index afb8d2b4a8..13a2361d86 100644
--- a/Core/MIPS/ARM64/Arm64CompALU.cpp
+++ b/Core/MIPS/ARM64/Arm64CompALU.cpp
@@ -24,6 +24,7 @@
 #include "Common/CPUDetect.h"
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Core/MIPS/MIPS.h"
+#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/ARM64/Arm64Jit.h"
 #include "Core/MIPS/ARM64/Arm64RegCache.h"
diff --git a/Core/MIPS/ARM64/Arm64Jit.cpp b/Core/MIPS/ARM64/Arm64Jit.cpp
index b111784c1a..f9d7e2d684 100644
--- a/Core/MIPS/ARM64/Arm64Jit.cpp
+++ b/Core/MIPS/ARM64/Arm64Jit.cpp
@@ -34,6 +34,7 @@
 #include "Core/MemMap.h"
 
 #include "Core/MIPS/MIPS.h"
+#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/MIPSInt.h"
 #include "Core/MIPS/MIPSTables.h"
diff --git a/Core/MIPS/ARM64/Arm64RegCache.h b/Core/MIPS/ARM64/Arm64RegCache.h
index 62f7771192..5528120098 100644
--- a/Core/MIPS/ARM64/Arm64RegCache.h
+++ b/Core/MIPS/ARM64/Arm64RegCache.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include "Core/MIPS/MIPS.h"
-#include "Core/MIPS/MIPSAnalyst.h"
 #include "Common/Arm64Emitter.h"
 
 namespace Arm64JitConstants {
@@ -55,6 +54,10 @@ enum {
 
 }  // namespace
 
+namespace MIPSAnalyst {
+struct AnalysisResults;
+};
+
 typedef int MIPSReg;
 
 struct RegARM64 {
diff --git a/Core/MIPS/ARM64/Arm64RegCacheFPU.h b/Core/MIPS/ARM64/Arm64RegCacheFPU.h
index 13284d2389..657d218611 100644
--- a/Core/MIPS/ARM64/Arm64RegCacheFPU.h
+++ b/Core/MIPS/ARM64/Arm64RegCacheFPU.h
@@ -19,8 +19,7 @@
 
 #pragma once
 
-#include "../MIPS.h"
-#include "../MIPSAnalyst.h"
+#include "Core/MIPS/MIPS.h"
 #include "Core/MIPS/ARM64/Arm64RegCache.h"
 #include "Core/MIPS/MIPSVFPUUtils.h"
 #include "Common/Arm64Emitter.h"
@@ -46,6 +45,10 @@ enum {
 
 }
 
+namespace MIPSAnalyst {
+struct AnalysisResults;
+};
+
 struct FPURegARM64 {
 	int mipsReg;  // if -1, no mipsreg attached.
 	bool isDirty;  // Should the register be written back?
diff --git a/Core/MIPS/JitCommon/JitBlockCache.h b/Core/MIPS/JitCommon/JitBlockCache.h
index 28a432fafe..f8836160ea 100644
--- a/Core/MIPS/JitCommon/JitBlockCache.h
+++ b/Core/MIPS/JitCommon/JitBlockCache.h
@@ -26,7 +26,6 @@
 #include "ppsspp_config.h"
 #include "Common/CommonTypes.h"
 #include "Common/CodeBlock.h"
-#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPS.h"
 
 #if PPSSPP_ARCH(ARM) || PPSSPP_ARCH(ARM64)
diff --git a/Core/MIPS/x86/CompALU.cpp b/Core/MIPS/x86/CompALU.cpp
index e3534b39fe..c8319efcb0 100644
--- a/Core/MIPS/x86/CompALU.cpp
+++ b/Core/MIPS/x86/CompALU.cpp
@@ -23,6 +23,7 @@
 #include "Common/BitSet.h"
 #include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
+#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/x86/Jit.h"
 #include "Core/MIPS/x86/RegCache.h"
diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp
index c27ee3b502..266b97da00 100644
--- a/Core/MIPS/x86/Jit.cpp
+++ b/Core/MIPS/x86/Jit.cpp
@@ -34,6 +34,7 @@
 #include "Core/Reporting.h"
 #include "Core/Debugger/SymbolMap.h"
 #include "Core/MIPS/MIPS.h"
+#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/MIPS/MIPSInt.h"
 #include "Core/MIPS/MIPSTables.h"
diff --git a/Core/MIPS/x86/JitSafeMem.cpp b/Core/MIPS/x86/JitSafeMem.cpp
index 38c6c75554..0fedb39882 100644
--- a/Core/MIPS/x86/JitSafeMem.cpp
+++ b/Core/MIPS/x86/JitSafeMem.cpp
@@ -23,6 +23,7 @@
 #include "Core/Debugger/Breakpoints.h"
 #include "Core/MemMap.h"
 #include "Core/MIPS/JitCommon/JitCommon.h"
+#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/x86/Jit.h"
 #include "Core/MIPS/x86/JitSafeMem.h"
 #include "Core/System.h"
diff --git a/Core/MIPS/x86/RegCache.h b/Core/MIPS/x86/RegCache.h
index 218677485d..f852401f8d 100644
--- a/Core/MIPS/x86/RegCache.h
+++ b/Core/MIPS/x86/RegCache.h
@@ -20,7 +20,6 @@
 #include "ppsspp_config.h"
 #include "Common/x64Emitter.h"
 #include "Core/MIPS/MIPS.h"
-#include "Core/MIPS/MIPSAnalyst.h"
 
 namespace X64JitConstants {
 #if PPSSPP_ARCH(AMD64)
@@ -42,6 +41,10 @@ namespace X64JitConstants {
 #endif
 }
 
+namespace MIPSAnalyst {
+struct AnalysisResults;
+};
+
 struct MIPSCachedReg {
 	Gen::OpArg location;
 	bool away;  // value not in source register
diff --git a/Core/MIPS/x86/RegCacheFPU.h b/Core/MIPS/x86/RegCacheFPU.h
index 04faf64cdd..0e63de5a68 100644
--- a/Core/MIPS/x86/RegCacheFPU.h
+++ b/Core/MIPS/x86/RegCacheFPU.h
@@ -19,7 +19,6 @@
 
 #include "Common/x64Emitter.h"
 #include "Core/MIPS/MIPS.h"
-#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSVFPUUtils.h"
 
 #undef MAP_NOINIT
@@ -56,6 +55,10 @@ enum {
 #define NUM_X_FPREGS 8
 #endif
 
+namespace MIPSAnalyst {
+struct AnalysisResults;
+};
+
 struct X64CachedFPReg {
 	union {
 		int mipsReg;
diff --git a/unittest/TestArmEmitter.cpp b/unittest/TestArmEmitter.cpp
index 94acdbdb1f..8932ba7c9c 100644
--- a/unittest/TestArmEmitter.cpp
+++ b/unittest/TestArmEmitter.cpp
@@ -2,6 +2,7 @@
 #include "Core/MIPS/ARM/ArmRegCacheFPU.h"
 #include "Core/MIPS/ARM/ArmJit.h"
 #include "Core/MIPS/JitCommon/JitState.h"
+#include "Core/MIPS/MIPSAnalyst.h"
 #include "Core/MIPS/MIPSVFPUUtils.h"
 #include "ext/disarm.h"