Refactor some header names to avoid awkward collisions.

CMakeLists.txt

@@ -20,7 +20,7 @@ add_library(parallel-rsp STATIC
 		rsp/cp0.cpp rsp/cp2.cpp
 		arch/x86_64/rsp/rsp_core.cpp
 		arch/x86_64/rsp/clamp.h
-		arch/x86_64/rsp/rsp.h
+		arch/x86_64/rsp/rsp_common.h
 		arch/x86_64/rsp/SSE2NEON.h
 		arch/x86_64/rsp/rsp_impl.h
 		arch/x86_64/rsp/vcr.h
@@ -55,7 +55,7 @@ if (PARALLEL_RSP_DEBUG_JIT)
 	if (ANDROID)
 		message("Android does not support debug JIT. Disabling it.")
 	else()
-		target_sources(parallel-rsp PRIVATE rsp.cpp rsp.hpp debug_jit.cpp debug_jit.hpp)
+		target_sources(parallel-rsp PRIVATE debug_rsp.cpp debug_rsp.hpp debug_jit.cpp debug_jit.hpp)
 		target_compile_definitions(parallel-rsp PUBLIC PARALLEL_RSP_DEBUG_JIT)
 	endif()
 endif()

arch/x86_64/rsp/rsp_core.cpp

@@ -8,7 +8,7 @@
 //
 
 #include "../../../state.hpp"
-#include "rsp.h"
+#include "rsp_common.h"
 #include <string.h>
 
 #ifdef __SSSE3__

debug_rsp.cpp

@@ -1,4 +1,4 @@
-#include "rsp.hpp"
+#include "debug_rsp.hpp"
 #include "rsp_disasm.hpp"
 #include <utility>
 

main.cpp

@@ -1,5 +1,5 @@
 #ifdef PARALLEL_RSP_DEBUG_JIT
-#include "rsp.hpp"
+#include "debug_rsp.hpp"
 #endif
 #include "rsp_jit.hpp"
 #include <stdio.h>

parallel.cpp

@@ -1,5 +1,5 @@
 #ifdef DEBUG_JIT
-#include "rsp.hpp"
+#include "debug_rsp.hpp"
 #else
 #include "rsp_jit.hpp"
 #endif

state.hpp

@@ -1,7 +1,7 @@
 #ifndef STATE_HPP__
 #define STATE_HPP__
 
-#include "rsp.h"
+#include "rsp_common.h"
 
 #define DMEM_SIZE (4 * 1024)
 #define IMEM_SIZE (4 * 1024)