diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index f6cc9dcc8..9b54df8d7 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -127,20 +127,12 @@ add_library(core
)
set(RECOMPILER_SRCS
- cpu_recompiler_code_generator.cpp
- cpu_recompiler_code_generator.h
- cpu_recompiler_code_generator_generic.cpp
- cpu_recompiler_register_cache.cpp
- cpu_recompiler_register_cache.h
+ cpu_recompiler.cpp
+ cpu_recompiler.h
cpu_recompiler_thunks.h
cpu_recompiler_types.h
)
-set(NEWREC_SOURCES
- cpu_newrec_compiler.cpp
- cpu_newrec_compiler.h
-)
-
target_precompile_headers(core PRIVATE "pch.h")
target_include_directories(core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
target_include_directories(core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
@@ -148,11 +140,11 @@ target_link_libraries(core PUBLIC Threads::Threads common util)
target_link_libraries(core PRIVATE xxhash imgui rapidyaml rcheevos cpuinfo::cpuinfo ZLIB::ZLIB Zstd::Zstd libzip::zip)
if(CPU_ARCH_X64)
- target_compile_definitions(core PUBLIC "ENABLE_RECOMPILER=1" "ENABLE_NEWREC=1" "ENABLE_MMAP_FASTMEM=1")
- target_sources(core PRIVATE ${RECOMPILER_SRCS} ${NEWREC_SOURCES}
- cpu_recompiler_code_generator_x64.cpp
- cpu_newrec_compiler_x64.cpp
- cpu_newrec_compiler_x64.h
+ target_compile_definitions(core PUBLIC "ENABLE_RECOMPILER=1" "ENABLE_MMAP_FASTMEM=1")
+ target_sources(core PRIVATE
+ ${RECOMPILER_SRCS}
+ cpu_recompiler_x64.cpp
+ cpu_recompiler_x64.h
)
target_link_libraries(core PRIVATE xbyak)
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
@@ -161,33 +153,34 @@ if(CPU_ARCH_X64)
message(STATUS "Building x64 recompiler.")
endif()
if(CPU_ARCH_ARM32)
- target_compile_definitions(core PUBLIC "ENABLE_RECOMPILER=1" "ENABLE_NEWREC=1")
- target_sources(core PRIVATE ${RECOMPILER_SRCS} ${NEWREC_SOURCES}
- cpu_recompiler_code_generator_aarch32.cpp
- cpu_newrec_compiler_aarch32.cpp
- cpu_newrec_compiler_aarch32.h
+ target_compile_definitions(core PUBLIC "ENABLE_RECOMPILER=1")
+ target_sources(core PRIVATE
+ ${RECOMPILER_SRCS}
+ cpu_recompiler_arm32.cpp
+ cpu_recompiler_arm32.h
)
target_link_libraries(core PUBLIC vixl)
- message(STATUS "Building AArch32 recompiler.")
+ message(STATUS "Building ARM32 recompiler.")
endif()
if(CPU_ARCH_ARM64)
- target_compile_definitions(core PUBLIC "ENABLE_RECOMPILER=1" "ENABLE_NEWREC=1" "ENABLE_MMAP_FASTMEM=1")
- target_sources(core PRIVATE ${RECOMPILER_SRCS} ${NEWREC_SOURCES}
- cpu_recompiler_code_generator_aarch64.cpp
- cpu_newrec_compiler_aarch64.cpp
- cpu_newrec_compiler_aarch64.h
+ target_compile_definitions(core PUBLIC "ENABLE_RECOMPILER=1" "ENABLE_MMAP_FASTMEM=1")
+ target_sources(core PRIVATE
+ ${RECOMPILER_SRCS}
+ cpu_recompiler_arm64.cpp
+ cpu_recompiler_arm64.h
)
target_link_libraries(core PUBLIC vixl)
- message(STATUS "Building AArch64 recompiler.")
+ message(STATUS "Building ARM64 recompiler.")
endif()
if(CPU_ARCH_RISCV64)
- target_compile_definitions(core PUBLIC "ENABLE_NEWREC=1" "ENABLE_MMAP_FASTMEM=1")
- target_sources(core PRIVATE ${NEWREC_SOURCES}
- cpu_newrec_compiler_riscv64.cpp
- cpu_newrec_compiler_riscv64.h
+ target_compile_definitions(core PUBLIC "ENABLE_RECOMPILER=1" "ENABLE_MMAP_FASTMEM=1")
+ target_sources(core PRIVATE
+ ${RECOMPILER_SRCS}
+ cpu_recompiler_riscv64.cpp
+ cpu_recompiler_riscv64.h
)
target_link_libraries(core PUBLIC biscuit::biscuit riscv-disas)
- message(STATUS "Building RISC-V 64-bit recompiler.")
+ message(STATUS "Building RISC-V-64 recompiler.")
endif()
# Copy the provided data directory to the output directory. Borrowed from PCSX2.
diff --git a/src/core/core.props b/src/core/core.props
index f841d9719..68bafc777 100644
--- a/src/core/core.props
+++ b/src/core/core.props
@@ -7,7 +7,6 @@
ENABLE_RAINTEGRATION=1;%(PreprocessorDefinitions)
ENABLE_RECOMPILER=1;%(PreprocessorDefinitions)
ENABLE_MMAP_FASTMEM=1;%(PreprocessorDefinitions)
- ENABLE_NEWREC=1;%(PreprocessorDefinitions)
%(AdditionalIncludeDirectories);$(SolutionDir)dep\zlib\include;$(SolutionDir)dep\rcheevos\include
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index f3798eb86..7c4a168b9 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -14,31 +14,19 @@
-
-
+
+
true
-
+
true
-
+
true
-
+
true
-
-
- true
-
-
- true
-
-
-
- true
-
-
@@ -105,21 +93,19 @@
-
-
+
+
true
-
+
true
-
+
true
-
+
true
-
-
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
index 5a8d278a2..0e497ecc8 100644
--- a/src/core/core.vcxproj.filters
+++ b/src/core/core.vcxproj.filters
@@ -23,12 +23,7 @@
-
-
-
-
-
@@ -43,7 +38,6 @@
-
@@ -58,11 +52,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -98,9 +92,7 @@
-
-
@@ -134,11 +126,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/core/cpu_code_cache.cpp b/src/core/cpu_code_cache.cpp
index 1bdd6aef6..5dec2de6e 100644
--- a/src/core/cpu_code_cache.cpp
+++ b/src/core/cpu_code_cache.cpp
@@ -30,11 +30,7 @@ LOG_CHANNEL(CodeCache);
// #define ENABLE_RECOMPILER_PROFILING 1
#ifdef ENABLE_RECOMPILER
-#include "cpu_recompiler_code_generator.h"
-#endif
-
-#ifdef ENABLE_NEWREC
-#include "cpu_newrec_compiler.h"
+#include "cpu_recompiler.h"
#endif
#include