diff --git a/CMakeLists.txt b/CMakeLists.txt
index d18eab9c1d..f208b4e9e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1389,8 +1389,6 @@ add_library(${CoreLibName} ${CoreLinkType}
Core/FileLoaders/RetryingFileLoader.h
Core/MIPS/JitCommon/JitCommon.cpp
Core/MIPS/JitCommon/JitCommon.h
- Core/MIPS/JitCommon/NativeJit.cpp
- Core/MIPS/JitCommon/NativeJit.h
Core/MIPS/JitCommon/JitBlockCache.cpp
Core/MIPS/JitCommon/JitBlockCache.h
Core/MIPS/JitCommon/JitState.cpp
diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj
index 7230ef2683..caa73aaa5e 100644
--- a/Core/Core.vcxproj
+++ b/Core/Core.vcxproj
@@ -426,7 +426,6 @@
-
@@ -667,7 +666,6 @@
-
diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters
index 1f5ca4951c..74b4939acc 100644
--- a/Core/Core.vcxproj.filters
+++ b/Core/Core.vcxproj.filters
@@ -631,9 +631,6 @@
FileLoaders
-
- MIPS\JitCommon
-
@@ -681,9 +678,6 @@
MIPS\JitCommon
-
- MIPS\JitCommon
-
FileSystems
diff --git a/Core/CwCheat.cpp b/Core/CwCheat.cpp
index 9fef3c0915..ca0bc3b90a 100644
--- a/Core/CwCheat.cpp
+++ b/Core/CwCheat.cpp
@@ -11,7 +11,7 @@
#include "Core/ELF/ParamSFO.h"
#include "Core/System.h"
#include "Core/HLE/sceCtrl.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#ifdef _WIN32
#include "util/text/utf8.h"
diff --git a/Core/Debugger/Breakpoints.cpp b/Core/Debugger/Breakpoints.cpp
index 0d1318d128..8eef12f831 100644
--- a/Core/Debugger/Breakpoints.cpp
+++ b/Core/Debugger/Breakpoints.cpp
@@ -23,7 +23,7 @@
#include "Core/Debugger/SymbolMap.h"
#include "Core/Host.h"
#include "Core/MIPS/MIPSAnalyst.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/CoreTiming.h"
std::vector CBreakPoints::breakPoints_;
diff --git a/Core/HLE/ReplaceTables.h b/Core/HLE/ReplaceTables.h
index ba512bde4f..84f85b7eea 100644
--- a/Core/HLE/ReplaceTables.h
+++ b/Core/HLE/ReplaceTables.h
@@ -34,7 +34,7 @@
#pragma once
#include "Common/CommonTypes.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
typedef int (* ReplaceFunc)();
diff --git a/Core/MIPS/ARM/ArmJit.h b/Core/MIPS/ARM/ArmJit.h
index 3129cf3771..07b70af968 100644
--- a/Core/MIPS/ARM/ArmJit.h
+++ b/Core/MIPS/ARM/ArmJit.h
@@ -22,7 +22,7 @@
#include "Common/ArmEmitter.h"
#include "Core/MIPS/JitCommon/JitState.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/MIPS/ARM/ArmRegCache.h"
#include "Core/MIPS/ARM/ArmRegCacheFPU.h"
#include "Core/MIPS/MIPSVFPUUtils.h"
diff --git a/Core/MIPS/ARM64/Arm64Jit.h b/Core/MIPS/ARM64/Arm64Jit.h
index 01d53504f3..e1c9cf5dec 100644
--- a/Core/MIPS/ARM64/Arm64Jit.h
+++ b/Core/MIPS/ARM64/Arm64Jit.h
@@ -22,7 +22,7 @@
#include "Common/Arm64Emitter.h"
#include "Core/MIPS/JitCommon/JitState.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/MIPS/ARM64/Arm64RegCache.h"
#include "Core/MIPS/ARM64/Arm64RegCacheFPU.h"
#include "Core/MIPS/MIPSVFPUUtils.h"
diff --git a/Core/MIPS/JitCommon/JitBlockCache.cpp b/Core/MIPS/JitCommon/JitBlockCache.cpp
index dce301c26d..29ca61296c 100644
--- a/Core/MIPS/JitCommon/JitBlockCache.cpp
+++ b/Core/MIPS/JitCommon/JitBlockCache.cpp
@@ -42,7 +42,6 @@
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "Core/MIPS/JitCommon/JitCommon.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
// #include "JitBase.h"
diff --git a/Core/MIPS/JitCommon/JitBlockCache.h b/Core/MIPS/JitCommon/JitBlockCache.h
index 69ac1f451a..3dc23e6f63 100644
--- a/Core/MIPS/JitCommon/JitBlockCache.h
+++ b/Core/MIPS/JitCommon/JitBlockCache.h
@@ -114,8 +114,7 @@ public:
int AllocateBlock(u32 em_address);
// When a proxy block is invalidated, the block located at the rootAddress
- // is invalidated too.
- void ProxyBlock(u32 rootAddress, u32 startAddress, u32 size, const u8 *codePtr);
+ void ProxyBlock(u32 rootAddress, u32 startAddress, u32 size, u8 *codePtr);
void FinalizeBlock(int block_num, bool block_link);
void Clear();
diff --git a/Core/MIPS/JitCommon/JitCommon.cpp b/Core/MIPS/JitCommon/JitCommon.cpp
index 5c356354e7..91ed4c10d6 100644
--- a/Core/MIPS/JitCommon/JitCommon.cpp
+++ b/Core/MIPS/JitCommon/JitCommon.cpp
@@ -15,17 +15,50 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
-#include
-
-#include "Core/MIPS/JitCommon/JitCommon.h"
-#include "Core/MIPS/JitCommon/JitState.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
-#include "Common/StringUtils.h"
+#include
#include "ext/disarm.h"
#include "ext/udis86/udis86.h"
+
+#include "Common/StringUtils.h"
#include "Core/Util/DisArm64.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
+#include "Core/MIPS/JitCommon/JitState.h"
+
+#if defined(ARM)
+#include "../ARM/ArmJit.h"
+#elif defined(ARM64)
+#include "../ARM64/Arm64Jit.h"
+#elif defined(_M_IX86) || defined(_M_X64)
+#include "../x86/Jit.h"
+#elif defined(MIPS)
+#include "../MIPS/MipsJit.h"
+#else
+#include "../fake/FakeJit.h"
+#endif
+
+namespace MIPSComp {
+ JitInterface *jit;
+ void JitAt() {
+ jit->Compile(currentMIPS->pc);
+ }
+
+ JitInterface *CreateNativeJit(MIPSState *mips) {
+#if defined(ARM)
+ return new MIPSComp::ArmJit(mips);
+#elif defined(ARM64)
+ return new MIPSComp::Arm64Jit(mips);
+#elif defined(_M_IX86) || defined(_M_X64)
+ return new MIPSComp::Jit(mips);
+#elif defined(MIPS)
+ return new MIPSComp::MipsJit(mips);
+#else
+ return new MIPSComp::FakeJit(mips);
+#endif
+ }
+
+}
#if (defined(_M_IX86) || defined(_M_X64)) && defined(_WIN32)
#define DISASM_ALL 1
#endif
diff --git a/Core/MIPS/JitCommon/JitCommon.h b/Core/MIPS/JitCommon/JitCommon.h
index a3a1c35828..9c440a6cdb 100644
--- a/Core/MIPS/JitCommon/JitCommon.h
+++ b/Core/MIPS/JitCommon/JitCommon.h
@@ -21,12 +21,120 @@
#include
#include "Common/Common.h"
+#include "Common/CommonTypes.h"
+#include "Core/MIPS/MIPS.h"
// TODO: Find a better place for these.
std::vector DisassembleArm2(const u8 *data, int size);
std::vector DisassembleArm64(const u8 *data, int size);
std::vector DisassembleX86(const u8 *data, int size);
+struct JitBlock;
+class JitBlockCache;
+class PointerWrap;
+
+#ifdef USING_QT_UI
+#undef emit
+#endif
+
+class MIPSState;
+
namespace MIPSComp {
void JitAt();
-}
\ No newline at end of file
+
+ class JitInterface {
+ public:
+ virtual ~JitInterface() {}
+
+ virtual bool DescribeCodePtr(const u8 *ptr, std::string &name) = 0;
+ virtual const u8 *GetDispatcher() const = 0;
+ virtual JitBlockCache *GetBlockCache() = 0;
+ virtual void InvalidateCache() = 0;
+ virtual void InvalidateCacheAt(u32 em_address, int length = 4) = 0;
+ virtual void DoState(PointerWrap &p) = 0;
+ virtual void DoDummyState(PointerWrap &p) = 0;
+ virtual void RunLoopUntil(u64 globalticks) = 0;
+ virtual void Compile(u32 em_address) = 0;
+ virtual void ClearCache() = 0;
+ virtual void EatPrefix() = 0;
+
+ // Block linking. This may need to work differently for whole-function JITs and stuff
+ // like that.
+ virtual void LinkBlock(u8 *exitPoint, const u8 *entryPoint) = 0;
+ virtual void UnlinkBlock(u8 *checkedEntry, u32 originalAddress) = 0;
+
+ virtual void Comp_Generic(MIPSOpcode op) = 0;
+ virtual void Comp_RunBlock(MIPSOpcode op) = 0;
+ virtual void Comp_ReplacementFunc(MIPSOpcode op) = 0;
+ virtual void Comp_ITypeMem(MIPSOpcode op) = 0;
+ virtual void Comp_Cache(MIPSOpcode op) = 0;
+ virtual void Comp_RelBranch(MIPSOpcode op) = 0;
+ virtual void Comp_RelBranchRI(MIPSOpcode op) = 0;
+ virtual void Comp_FPUBranch(MIPSOpcode op) = 0;
+ virtual void Comp_FPULS(MIPSOpcode op) = 0;
+ virtual void Comp_FPUComp(MIPSOpcode op) = 0;
+ virtual void Comp_Jump(MIPSOpcode op) = 0;
+ virtual void Comp_JumpReg(MIPSOpcode op) = 0;
+ virtual void Comp_Syscall(MIPSOpcode op) = 0;
+ virtual void Comp_Break(MIPSOpcode op) = 0;
+ virtual void Comp_IType(MIPSOpcode op) = 0;
+ virtual void Comp_RType2(MIPSOpcode op) = 0;
+ virtual void Comp_RType3(MIPSOpcode op) = 0;
+ virtual void Comp_ShiftType(MIPSOpcode op) = 0;
+ virtual void Comp_Allegrex(MIPSOpcode op) = 0;
+ virtual void Comp_Allegrex2(MIPSOpcode op) = 0;
+ virtual void Comp_VBranch(MIPSOpcode op) = 0;
+ virtual void Comp_MulDivType(MIPSOpcode op) = 0;
+ virtual void Comp_Special3(MIPSOpcode op) = 0;
+ virtual void Comp_FPU3op(MIPSOpcode op) = 0;
+ virtual void Comp_FPU2op(MIPSOpcode op) = 0;
+ virtual void Comp_mxc1(MIPSOpcode op) = 0;
+ virtual void Comp_SV(MIPSOpcode op) = 0;
+ virtual void Comp_SVQ(MIPSOpcode op) = 0;
+ virtual void Comp_VPFX(MIPSOpcode op) = 0;
+ virtual void Comp_VVectorInit(MIPSOpcode op) = 0;
+ virtual void Comp_VMatrixInit(MIPSOpcode op) = 0;
+ virtual void Comp_VDot(MIPSOpcode op) = 0;
+ virtual void Comp_VecDo3(MIPSOpcode op) = 0;
+ virtual void Comp_VV2Op(MIPSOpcode op) = 0;
+ virtual void Comp_Mftv(MIPSOpcode op) = 0;
+ virtual void Comp_Vmfvc(MIPSOpcode op) = 0;
+ virtual void Comp_Vmtvc(MIPSOpcode op) = 0;
+ virtual void Comp_Vmmov(MIPSOpcode op) = 0;
+ virtual void Comp_VScl(MIPSOpcode op) = 0;
+ virtual void Comp_Vmmul(MIPSOpcode op) = 0;
+ virtual void Comp_Vmscl(MIPSOpcode op) = 0;
+ virtual void Comp_Vtfm(MIPSOpcode op) = 0;
+ virtual void Comp_VHdp(MIPSOpcode op) = 0;
+ virtual void Comp_VCrs(MIPSOpcode op) = 0;
+ virtual void Comp_VDet(MIPSOpcode op) = 0;
+ virtual void Comp_Vi2x(MIPSOpcode op) = 0;
+ virtual void Comp_Vx2i(MIPSOpcode op) = 0;
+ virtual void Comp_Vf2i(MIPSOpcode op) = 0;
+ virtual void Comp_Vi2f(MIPSOpcode op) = 0;
+ virtual void Comp_Vh2f(MIPSOpcode op) = 0;
+ virtual void Comp_Vcst(MIPSOpcode op) = 0;
+ virtual void Comp_Vhoriz(MIPSOpcode op) = 0;
+ virtual void Comp_VRot(MIPSOpcode op) = 0;
+ virtual void Comp_VIdt(MIPSOpcode op) = 0;
+ virtual void Comp_Vcmp(MIPSOpcode op) = 0;
+ virtual void Comp_Vcmov(MIPSOpcode op) = 0;
+ virtual void Comp_Viim(MIPSOpcode op) = 0;
+ virtual void Comp_Vfim(MIPSOpcode op) = 0;
+ virtual void Comp_VCrossQuat(MIPSOpcode op) = 0;
+ virtual void Comp_Vsgn(MIPSOpcode op) = 0;
+ virtual void Comp_Vocp(MIPSOpcode op) = 0;
+ virtual void Comp_ColorConv(MIPSOpcode op) = 0;
+ virtual void Comp_Vbfy(MIPSOpcode op) = 0;
+ virtual void Comp_DoNothing(MIPSOpcode op) = 0;
+
+ virtual int Replace_fabsf() = 0;
+ };
+
+ typedef void (JitInterface::*MIPSCompileFunc)(MIPSOpcode opcode);
+ typedef int (JitInterface::*MIPSReplaceFunc)();
+
+ extern JitInterface *jit;
+
+ JitInterface *CreateNativeJit(MIPSState *mips);
+}
diff --git a/Core/MIPS/JitCommon/NativeJit.cpp b/Core/MIPS/JitCommon/NativeJit.cpp
deleted file mode 100644
index 7c6b81295e..0000000000
--- a/Core/MIPS/JitCommon/NativeJit.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2012- PPSSPP Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0 or later versions.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official git repository and contact information can be found at
-// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
-
-#include "Core/MIPS/JitCommon/NativeJit.h"
-#include "Core/MIPS/JitCommon/JitState.h"
-
-#if defined(ARM)
-#include "../ARM/ArmJit.h"
-#elif defined(ARM64)
-#include "../ARM64/Arm64Jit.h"
-#elif defined(_M_IX86) || defined(_M_X64)
-#include "../x86/Jit.h"
-#elif defined(MIPS)
-#include "../MIPS/MipsJit.h"
-#else
-#include "../fake/FakeJit.h"
-#endif
-
-namespace MIPSComp {
- JitInterface *jit;
- void JitAt() {
- jit->Compile(currentMIPS->pc);
- }
-
-JitInterface *CreateNativeJit(MIPSState *mips) {
-#if defined(ARM)
- return new MIPSComp::ArmJit(mips);
-#elif defined(ARM64)
- return new MIPSComp::Arm64Jit(mips);
-#elif defined(_M_IX86) || defined(_M_X64)
- return new MIPSComp::Jit(mips);
-#elif defined(MIPS)
- return new MIPSComp::MipsJit(mips);
-#else
- return new MIPSComp::FakeJit(mips);
-#endif
-}
-
-}
\ No newline at end of file
diff --git a/Core/MIPS/JitCommon/NativeJit.h b/Core/MIPS/JitCommon/NativeJit.h
deleted file mode 100644
index 6314ad4fc9..0000000000
--- a/Core/MIPS/JitCommon/NativeJit.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) 2012- PPSSPP Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0 or later versions.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official git repository and contact information can be found at
-// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
-
-#pragma once
-
-#include
-#include "Common/CommonTypes.h"
-#include "Core/MIPS/MIPS.h"
-
-struct JitBlock;
-class JitBlockCache;
-class PointerWrap;
-
-#ifdef USING_QT_UI
-#undef emit
-#endif
-
-class MIPSState;
-
-namespace MIPSComp {
-
- class JitInterface {
- public:
- virtual ~JitInterface() {}
-
- virtual bool DescribeCodePtr(const u8 *ptr, std::string &name) = 0;
- virtual const u8 *GetDispatcher() const = 0;
- virtual JitBlockCache *GetBlockCache() = 0;
- virtual void InvalidateCache() = 0;
- virtual void InvalidateCacheAt(u32 em_address, int length = 4) = 0;
- virtual void DoState(PointerWrap &p) = 0;
- virtual void DoDummyState(PointerWrap &p) = 0;
- virtual void RunLoopUntil(u64 globalticks) = 0;
- virtual void Compile(u32 em_address) = 0;
- virtual void ClearCache() = 0;
- virtual void EatPrefix() = 0;
-
- // Block linking. This may need to work differently for whole-function JITs and stuff
- // like that.
- virtual void LinkBlock(u8 *exitPoint, const u8 *entryPoint) = 0;
- virtual void UnlinkBlock(u8 *checkedEntry, u32 originalAddress) = 0;
-
- virtual void Comp_Generic(MIPSOpcode op) = 0;
- virtual void Comp_RunBlock(MIPSOpcode op) = 0;
- virtual void Comp_ReplacementFunc(MIPSOpcode op) = 0;
- virtual void Comp_ITypeMem(MIPSOpcode op) = 0;
- virtual void Comp_Cache(MIPSOpcode op) = 0;
- virtual void Comp_RelBranch(MIPSOpcode op) = 0;
- virtual void Comp_RelBranchRI(MIPSOpcode op) = 0;
- virtual void Comp_FPUBranch(MIPSOpcode op) = 0;
- virtual void Comp_FPULS(MIPSOpcode op) = 0;
- virtual void Comp_FPUComp(MIPSOpcode op) = 0;
- virtual void Comp_Jump(MIPSOpcode op) = 0;
- virtual void Comp_JumpReg(MIPSOpcode op) = 0;
- virtual void Comp_Syscall(MIPSOpcode op) = 0;
- virtual void Comp_Break(MIPSOpcode op) = 0;
- virtual void Comp_IType(MIPSOpcode op) = 0;
- virtual void Comp_RType2(MIPSOpcode op) = 0;
- virtual void Comp_RType3(MIPSOpcode op) = 0;
- virtual void Comp_ShiftType(MIPSOpcode op) = 0;
- virtual void Comp_Allegrex(MIPSOpcode op) = 0;
- virtual void Comp_Allegrex2(MIPSOpcode op) = 0;
- virtual void Comp_VBranch(MIPSOpcode op) = 0;
- virtual void Comp_MulDivType(MIPSOpcode op) = 0;
- virtual void Comp_Special3(MIPSOpcode op) = 0;
- virtual void Comp_FPU3op(MIPSOpcode op) = 0;
- virtual void Comp_FPU2op(MIPSOpcode op) = 0;
- virtual void Comp_mxc1(MIPSOpcode op) = 0;
- virtual void Comp_SV(MIPSOpcode op) = 0;
- virtual void Comp_SVQ(MIPSOpcode op) = 0;
- virtual void Comp_VPFX(MIPSOpcode op) = 0;
- virtual void Comp_VVectorInit(MIPSOpcode op) = 0;
- virtual void Comp_VMatrixInit(MIPSOpcode op) = 0;
- virtual void Comp_VDot(MIPSOpcode op) = 0;
- virtual void Comp_VecDo3(MIPSOpcode op) = 0;
- virtual void Comp_VV2Op(MIPSOpcode op) = 0;
- virtual void Comp_Mftv(MIPSOpcode op) = 0;
- virtual void Comp_Vmfvc(MIPSOpcode op) = 0;
- virtual void Comp_Vmtvc(MIPSOpcode op) = 0;
- virtual void Comp_Vmmov(MIPSOpcode op) = 0;
- virtual void Comp_VScl(MIPSOpcode op) = 0;
- virtual void Comp_Vmmul(MIPSOpcode op) = 0;
- virtual void Comp_Vmscl(MIPSOpcode op) = 0;
- virtual void Comp_Vtfm(MIPSOpcode op) = 0;
- virtual void Comp_VHdp(MIPSOpcode op) = 0;
- virtual void Comp_VCrs(MIPSOpcode op) = 0;
- virtual void Comp_VDet(MIPSOpcode op) = 0;
- virtual void Comp_Vi2x(MIPSOpcode op) = 0;
- virtual void Comp_Vx2i(MIPSOpcode op) = 0;
- virtual void Comp_Vf2i(MIPSOpcode op) = 0;
- virtual void Comp_Vi2f(MIPSOpcode op) = 0;
- virtual void Comp_Vh2f(MIPSOpcode op) = 0;
- virtual void Comp_Vcst(MIPSOpcode op) = 0;
- virtual void Comp_Vhoriz(MIPSOpcode op) = 0;
- virtual void Comp_VRot(MIPSOpcode op) = 0;
- virtual void Comp_VIdt(MIPSOpcode op) = 0;
- virtual void Comp_Vcmp(MIPSOpcode op) = 0;
- virtual void Comp_Vcmov(MIPSOpcode op) = 0;
- virtual void Comp_Viim(MIPSOpcode op) = 0;
- virtual void Comp_Vfim(MIPSOpcode op) = 0;
- virtual void Comp_VCrossQuat(MIPSOpcode op) = 0;
- virtual void Comp_Vsgn(MIPSOpcode op) = 0;
- virtual void Comp_Vocp(MIPSOpcode op) = 0;
- virtual void Comp_ColorConv(MIPSOpcode op) = 0;
- virtual void Comp_Vbfy(MIPSOpcode op) = 0;
- virtual void Comp_DoNothing(MIPSOpcode op) = 0;
-
- virtual int Replace_fabsf() = 0;
- };
-
- typedef void (JitInterface::*MIPSCompileFunc)(MIPSOpcode opcode);
- typedef int (JitInterface::*MIPSReplaceFunc)();
-
- extern JitInterface *jit;
-
- JitInterface *CreateNativeJit(MIPSState *mips);
-}
diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp
index 6cb88b8594..1140b67914 100644
--- a/Core/MIPS/MIPS.cpp
+++ b/Core/MIPS/MIPS.cpp
@@ -27,12 +27,10 @@
#include "Core/MIPS/MIPSTables.h"
#include "Core/MIPS/MIPSDebugInterface.h"
#include "Core/MIPS/MIPSVFPUUtils.h"
-#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "Core/Reporting.h"
#include "Core/System.h"
#include "Core/HLE/sceDisplay.h"
#include "Core/MIPS/JitCommon/JitCommon.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
#include "Core/CoreTiming.h"
MIPSState mipsr4k;
diff --git a/Core/MIPS/MIPSAsm.cpp b/Core/MIPS/MIPSAsm.cpp
index ae7982ef8a..ecb9ea1859 100644
--- a/Core/MIPS/MIPSAsm.cpp
+++ b/Core/MIPS/MIPSAsm.cpp
@@ -15,7 +15,7 @@
#include "util/text/utf8.h"
#include "Core/Debugger/SymbolMap.h"
#include "Core/MemMapHelpers.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/MIPS/MIPSAsm.h"
namespace MIPSAsm
diff --git a/Core/MIPS/MIPSTables.cpp b/Core/MIPS/MIPSTables.cpp
index 4112123779..dec15e41b6 100644
--- a/Core/MIPS/MIPSTables.cpp
+++ b/Core/MIPS/MIPSTables.cpp
@@ -29,7 +29,7 @@
#include "Core/Reporting.h"
#include "Core/Debugger/Breakpoints.h"
-#include "JitCommon/NativeJit.h"
+#include "JitCommon/JitCommon.h"
enum MipsEncoding {
Imme,
diff --git a/Core/MIPS/x86/CompReplace.cpp b/Core/MIPS/x86/CompReplace.cpp
index 549e552526..336a38264e 100644
--- a/Core/MIPS/x86/CompReplace.cpp
+++ b/Core/MIPS/x86/CompReplace.cpp
@@ -16,7 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Core/MemMap.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/MIPS/x86/RegCache.h"
#include "Core/MIPS/x86/Jit.h"
diff --git a/Core/MIPS/x86/Jit.h b/Core/MIPS/x86/Jit.h
index 7aada0997a..68d160a958 100644
--- a/Core/MIPS/x86/Jit.h
+++ b/Core/MIPS/x86/Jit.h
@@ -28,7 +28,7 @@
#include "Common/x64Emitter.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "Core/MIPS/JitCommon/JitState.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/MIPS/x86/JitSafeMem.h"
#include "Core/MIPS/x86/RegCache.h"
#include "Core/MIPS/x86/RegCacheFPU.h"
diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp
index e16262f159..7f6481709c 100644
--- a/UI/CwCheatScreen.cpp
+++ b/UI/CwCheatScreen.cpp
@@ -25,7 +25,7 @@
#include "Core/Core.h"
#include "Core/Config.h"
#include "Core/CwCheat.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#include "UI/OnScreenDisplay.h"
#include "UI/ui_atlas.h"
diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index 52cf744a0a..1b41243b61 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -34,7 +34,6 @@
#include "Core/System.h"
#include "Core/CoreParameter.h"
#include "Core/MIPS/MIPSTables.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "Core/MIPS/JitCommon/JitCommon.h"
#include "GPU/GPUInterface.h"
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index 7925287eda..e6f0cc28e6 100644
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@@ -37,7 +37,7 @@
#include "Core/Config.h"
#include "Core/Host.h"
#include "Core/System.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/HLE/sceUtility.h"
#include "Common/FileUtil.h"
#include "GPU/GPUState.h"
diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index 2dd40ce64e..317bf72fbc 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -47,7 +47,7 @@
#include "Windows/Debugger/Debugger_Disasm.h"
#include "Windows/Debugger/Debugger_MemoryDlg.h"
#include "Windows/GEDebugger/GEDebugger.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "main.h"
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 4f0e3e78ef..6eb9e787c8 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -357,7 +357,6 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Core/MIPS/JitCommon/JitCommon.cpp \
$(SRC)/Core/MIPS/JitCommon/JitBlockCache.cpp \
$(SRC)/Core/MIPS/JitCommon/JitState.cpp \
- $(SRC)/Core/MIPS/JitCommon/NativeJit.cpp \
$(SRC)/Core/Util/AudioFormat.cpp \
$(SRC)/Core/Util/GameManager.cpp \
$(SRC)/Core/Util/BlockAllocator.cpp \
diff --git a/unittest/JitHarness.cpp b/unittest/JitHarness.cpp
index bfd745b38f..b80fb04e6d 100644
--- a/unittest/JitHarness.cpp
+++ b/unittest/JitHarness.cpp
@@ -22,7 +22,6 @@
#include "input/input_state.h"
#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
-#include "Core/MIPS/JitCommon/NativeJit.h"
#include "Core/MIPS/MIPSCodeUtils.h"
#include "Core/MIPS/MIPSDebugInterface.h"
#include "Core/MIPS/MIPSAsm.h"