From e36cd7fe5c15d22b09b191c3454bfdef2adebe5b Mon Sep 17 00:00:00 2001
From: Mrlinkwii <Mrlinkwii@users.noreply.github.com>
Date: Tue, 1 Aug 2023 11:41:23 +0100
Subject: [PATCH] Build: remove -32 notation from core  filenames

---
 pcsx2/CMakeLists.txt                            | 4 ++--
 pcsx2/Interpreter.cpp                           | 2 +-
 pcsx2/pcsx2.vcxproj                             | 4 ++--
 pcsx2/pcsx2.vcxproj.filters                     | 4 ++--
 pcsx2/x86/ix86-32/{iCore-32.cpp => iCore.cpp}   | 0
 pcsx2/x86/ix86-32/{iR5900-32.cpp => iR5900.cpp} | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename pcsx2/x86/ix86-32/{iCore-32.cpp => iCore.cpp} (100%)
 rename pcsx2/x86/ix86-32/{iR5900-32.cpp => iR5900.cpp} (99%)

diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 74a4b39e7b..d7ea5a60a2 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -1022,8 +1022,8 @@ set(pcsx2x86Sources
 	x86/iR5900Analysis.cpp
 	x86/iR5900Misc.cpp
 	x86/ir5900tables.cpp
-	x86/ix86-32/iCore-32.cpp
-	x86/ix86-32/iR5900-32.cpp
+	x86/ix86-32/iCore.cpp
+	x86/ix86-32/iR5900.cpp
 	x86/ix86-32/iR5900Arit.cpp
 	x86/ix86-32/iR5900AritImm.cpp
 	x86/ix86-32/iR5900Branch.cpp
diff --git a/pcsx2/Interpreter.cpp b/pcsx2/Interpreter.cpp
index a8d1fbd53a..65df0b0bf4 100644
--- a/pcsx2/Interpreter.cpp
+++ b/pcsx2/Interpreter.cpp
@@ -551,7 +551,7 @@ static void intExecute()
 					eeloadHook();
 					if (VMManager::Internal::IsFastBootInProgress())
 					{
-						// See comments on this code in iR5900-32.cpp's recRecompile()
+						// See comments on this code in iR5900.cpp's recRecompile()
 						const u32 typeAexecjump = memRead32(EELOAD_START + 0x470);
 						const u32 typeBexecjump = memRead32(EELOAD_START + 0x5B0);
 						const u32 typeCexecjump = memRead32(EELOAD_START + 0x618);
diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj
index cf468b657c..1639878646 100644
--- a/pcsx2/pcsx2.vcxproj
+++ b/pcsx2/pcsx2.vcxproj
@@ -411,7 +411,7 @@
     <ClCompile Include="x86\iMMI.cpp" />
     <ClCompile Include="x86\iR5900Misc.cpp" />
     <ClCompile Include="x86\ir5900tables.cpp" />
-    <ClCompile Include="x86\ix86-32\iR5900-32.cpp" />
+    <ClCompile Include="x86\ix86-32\iR5900.cpp" />
     <ClCompile Include="x86\ix86-32\iR5900Arit.cpp" />
     <ClCompile Include="x86\ix86-32\iR5900AritImm.cpp" />
     <ClCompile Include="x86\ix86-32\iR5900Branch.cpp" />
@@ -473,7 +473,7 @@
     <ClCompile Include="rdebug\deci2_ttyp.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="x86\ix86-32\iCore-32.cpp" />
+    <ClCompile Include="x86\ix86-32\iCore.cpp" />
     <ClCompile Include="x86\iCore.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters
index c455a8fe84..3cae2c21d2 100644
--- a/pcsx2/pcsx2.vcxproj.filters
+++ b/pcsx2/pcsx2.vcxproj.filters
@@ -548,7 +548,7 @@
     <ClCompile Include="x86\ir5900tables.cpp">
       <Filter>System\Ps2\EmotionEngine\EE\Dynarec</Filter>
     </ClCompile>
-    <ClCompile Include="x86\ix86-32\iR5900-32.cpp">
+    <ClCompile Include="x86\ix86-32\iR5900.cpp">
       <Filter>System\Ps2\EmotionEngine\EE\Dynarec\ix86-32</Filter>
     </ClCompile>
     <ClCompile Include="x86\ix86-32\iR5900Arit.cpp">
@@ -698,7 +698,7 @@
     <ClCompile Include="rdebug\deci2_ttyp.cpp">
       <Filter>System\Ps2\Debug\rdebug</Filter>
     </ClCompile>
-    <ClCompile Include="x86\ix86-32\iCore-32.cpp">
+    <ClCompile Include="x86\ix86-32\iCore.cpp">
       <Filter>System\Ps2\iCore</Filter>
     </ClCompile>
     <ClCompile Include="x86\iCore.cpp">
diff --git a/pcsx2/x86/ix86-32/iCore-32.cpp b/pcsx2/x86/ix86-32/iCore.cpp
similarity index 100%
rename from pcsx2/x86/ix86-32/iCore-32.cpp
rename to pcsx2/x86/ix86-32/iCore.cpp
diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900.cpp
similarity index 99%
rename from pcsx2/x86/ix86-32/iR5900-32.cpp
rename to pcsx2/x86/ix86-32/iR5900.cpp
index b8952934ae..37057a289e 100644
--- a/pcsx2/x86/ix86-32/iR5900-32.cpp
+++ b/pcsx2/x86/ix86-32/iR5900.cpp
@@ -595,7 +595,7 @@ static void recAlloc()
 		s_nInstCacheSize = 128;
 		s_pInstCache = (EEINST*)malloc(sizeof(EEINST) * s_nInstCacheSize);
 		if (!s_pInstCache)
-			pxFailRel("Failed to allocate R5900-32 InstCache array");
+			pxFailRel("Failed to allocate R5900 InstCache array");
 	}
 
 	// No errors.. Proceed with initialization:
@@ -609,7 +609,7 @@ alignas(16) static u8 manual_counter[Ps2MemSize::MainRam >> 12];
 ////////////////////////////////////////////////////
 static void recResetRaw()
 {
-	Console.WriteLn(Color_StrongBlack, "EE/iR5900-32 Recompiler Reset");
+	Console.WriteLn(Color_StrongBlack, "EE/iR5900 Recompiler Reset");
 
 	EE::Profiler.Reset();