Merge pull request #16290 from unknownbrackets/include-cleanup

jit: Reduce some include pollution
This commit is contained in:
Henrik Rydgård 2022-10-28 08:47:43 +02:00 committed by GitHub
commit 109db81eca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 35 additions and 10 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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?

View File

@ -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"

View File

@ -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"

View File

@ -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 {

View File

@ -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?

View File

@ -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)

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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;

View File

@ -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"