From ab5b90bf154dc6f0f233ec3f6714e294a9898cad Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 12 Mar 2018 20:04:30 -0400 Subject: [PATCH] DSPCore: Move x64 JIT source files into an x64 subdirectory While the code is namespaced out properly, the files weren't separated into their own directory. This moves the files so that introducing a general interface is easier in the future for supporting other architectures. --- Source/Core/Core/CMakeLists.txt | 20 +++---- Source/Core/Core/Core.vcxproj | 24 ++++---- Source/Core/Core/Core.vcxproj.filters | 55 ++++++++++--------- Source/Core/Core/DSP/DSPCore.cpp | 2 +- Source/Core/Core/DSP/DSPTables.cpp | 2 +- Source/Core/Core/DSP/DSPTables.h | 2 +- .../Core/DSP/Jit/{ => x64}/DSPEmitter.cpp | 2 +- .../Core/Core/DSP/Jit/{ => x64}/DSPEmitter.h | 2 +- .../DSP/Jit/{ => x64}/DSPJitArithmetic.cpp | 2 +- .../Core/DSP/Jit/{ => x64}/DSPJitBranch.cpp | 2 +- .../Core/DSP/Jit/{ => x64}/DSPJitCCUtil.cpp | 2 +- .../Core/DSP/Jit/{ => x64}/DSPJitExtOps.cpp | 2 +- .../DSP/Jit/{ => x64}/DSPJitLoadStore.cpp | 2 +- .../Core/DSP/Jit/{ => x64}/DSPJitMisc.cpp | 2 +- .../DSP/Jit/{ => x64}/DSPJitMultiplier.cpp | 2 +- .../Core/DSP/Jit/{ => x64}/DSPJitRegCache.cpp | 4 +- .../Core/DSP/Jit/{ => x64}/DSPJitRegCache.h | 0 .../Core/DSP/Jit/{ => x64}/DSPJitUtil.cpp | 2 +- Source/Core/Core/HW/DSPLLE/DSPHost.cpp | 2 +- 19 files changed, 67 insertions(+), 64 deletions(-) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPEmitter.cpp (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPEmitter.h (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitArithmetic.cpp (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitBranch.cpp (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitCCUtil.cpp (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitExtOps.cpp (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitLoadStore.cpp (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitMisc.cpp (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitMultiplier.cpp (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitRegCache.cpp (99%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitRegCache.h (100%) rename Source/Core/Core/DSP/Jit/{ => x64}/DSPJitUtil.cpp (99%) diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 8631b6ab85..d7e25bc915 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -57,16 +57,16 @@ set(SRCS DSP/Interpreter/DSPIntLoadStore.cpp DSP/Interpreter/DSPIntMisc.cpp DSP/Interpreter/DSPIntMultiplier.cpp - DSP/Jit/DSPEmitter.cpp - DSP/Jit/DSPJitRegCache.cpp - DSP/Jit/DSPJitExtOps.cpp - DSP/Jit/DSPJitBranch.cpp - DSP/Jit/DSPJitCCUtil.cpp - DSP/Jit/DSPJitArithmetic.cpp - DSP/Jit/DSPJitLoadStore.cpp - DSP/Jit/DSPJitMultiplier.cpp - DSP/Jit/DSPJitUtil.cpp - DSP/Jit/DSPJitMisc.cpp + DSP/Jit/x64/DSPEmitter.cpp + DSP/Jit/x64/DSPJitRegCache.cpp + DSP/Jit/x64/DSPJitExtOps.cpp + DSP/Jit/x64/DSPJitBranch.cpp + DSP/Jit/x64/DSPJitCCUtil.cpp + DSP/Jit/x64/DSPJitArithmetic.cpp + DSP/Jit/x64/DSPJitLoadStore.cpp + DSP/Jit/x64/DSPJitMultiplier.cpp + DSP/Jit/x64/DSPJitUtil.cpp + DSP/Jit/x64/DSPJitMisc.cpp FifoPlayer/FifoAnalyzer.cpp FifoPlayer/FifoDataFile.cpp FifoPlayer/FifoPlaybackAnalyzer.cpp diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index f50a2811de..99f2b19876 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -81,16 +81,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -339,8 +339,8 @@ - - + + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 5af2b51d8c..189b7d2088 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -47,7 +47,10 @@ {6204f663-bbd0-4eb5-bc15-e3778d8b6091} - {7042fb6f-9284-4469-bc7c-9302e0d984aa} + {5377680f-d667-4f1a-aa86-b616c19a5cd4} + + + {712e3a61-b818-434e-a724-ef8de1f09027} {d657188a-426d-46c8-af0a-caa148c6ed1b} @@ -236,35 +239,35 @@ DSPCore\Interpreter - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 FifoPlayer @@ -952,11 +955,11 @@ DSPCore\Interpreter - - DSPCore\Jit + + DSPCore\Jit\x64 - - DSPCore\Jit + + DSPCore\Jit\x64 FifoPlayer @@ -1561,4 +1564,4 @@ - + \ No newline at end of file diff --git a/Source/Core/Core/DSP/DSPCore.cpp b/Source/Core/Core/DSP/DSPCore.cpp index 3c92a4be54..db68a2c260 100644 --- a/Source/Core/Core/DSP/DSPCore.cpp +++ b/Source/Core/Core/DSP/DSPCore.cpp @@ -21,7 +21,7 @@ #include "Core/DSP/DSPHost.h" #include "Core/DSP/Interpreter/DSPIntUtil.h" #include "Core/DSP/Interpreter/DSPInterpreter.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" #include "Core/HW/DSP.h" namespace DSP diff --git a/Source/Core/Core/DSP/DSPTables.cpp b/Source/Core/Core/DSP/DSPTables.cpp index e8bf9d19f4..e06f69ce74 100644 --- a/Source/Core/Core/DSP/DSPTables.cpp +++ b/Source/Core/Core/DSP/DSPTables.cpp @@ -14,7 +14,7 @@ #include "Core/DSP/Interpreter/DSPIntExtOps.h" #include "Core/DSP/Interpreter/DSPInterpreter.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" namespace DSP { diff --git a/Source/Core/Core/DSP/DSPTables.h b/Source/Core/Core/DSP/DSPTables.h index d62022d972..41d5435a1c 100644 --- a/Source/Core/Core/DSP/DSPTables.h +++ b/Source/Core/Core/DSP/DSPTables.h @@ -11,7 +11,7 @@ #include #include "Core/DSP/DSPCommon.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" namespace DSP { diff --git a/Source/Core/Core/DSP/Jit/DSPEmitter.cpp b/Source/Core/Core/DSP/Jit/x64/DSPEmitter.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPEmitter.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPEmitter.cpp index 16c794fcc7..5932f7c550 100644 --- a/Source/Core/Core/DSP/Jit/DSPEmitter.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPEmitter.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" #include #include diff --git a/Source/Core/Core/DSP/Jit/DSPEmitter.h b/Source/Core/Core/DSP/Jit/x64/DSPEmitter.h similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPEmitter.h rename to Source/Core/Core/DSP/Jit/x64/DSPEmitter.h index 5af802eed0..70585d513d 100644 --- a/Source/Core/Core/DSP/Jit/DSPEmitter.h +++ b/Source/Core/Core/DSP/Jit/x64/DSPEmitter.h @@ -14,7 +14,7 @@ #include "Common/x64Emitter.h" #include "Core/DSP/DSPCommon.h" -#include "Core/DSP/Jit/DSPJitRegCache.h" +#include "Core/DSP/Jit/x64/DSPJitRegCache.h" class PointerWrap; diff --git a/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp index 1802253e21..e787faaa69 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitArithmetic.cpp @@ -8,7 +8,7 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPMemoryMap.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitBranch.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPJitBranch.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPJitBranch.cpp index 960b7c4482..80a7d81ced 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitBranch.cpp @@ -8,7 +8,7 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPMemoryMap.h" #include "Core/DSP/DSPTables.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitCCUtil.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPJitCCUtil.cpp index d296486327..13bb4fcea7 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitCCUtil.cpp @@ -5,7 +5,7 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitExtOps.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPJitExtOps.cpp index f20b68aefe..5893117f84 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitExtOps.cpp @@ -5,7 +5,7 @@ #include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitLoadStore.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPJitLoadStore.cpp index 32f541a8aa..f750227c13 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitLoadStore.cpp @@ -8,7 +8,7 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPMemoryMap.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitMisc.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPJitMisc.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPJitMisc.cpp index baea0d80e2..875febc466 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitMisc.cpp @@ -6,7 +6,7 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPMemoryMap.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitMultiplier.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPJitMultiplier.cpp index 21b6120630..3051b11376 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitMultiplier.cpp @@ -11,7 +11,7 @@ #include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.cpp index 2cda9196c1..87c2b8bf24 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/DSP/Jit/DSPJitRegCache.h" +#include "Core/DSP/Jit/x64/DSPJitRegCache.h" #include #include @@ -12,7 +12,7 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPMemoryMap.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitRegCache.h b/Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.h similarity index 100% rename from Source/Core/Core/DSP/Jit/DSPJitRegCache.h rename to Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.h diff --git a/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitUtil.cpp similarity index 99% rename from Source/Core/Core/DSP/Jit/DSPJitUtil.cpp rename to Source/Core/Core/DSP/Jit/x64/DSPJitUtil.cpp index 476637badb..0e63ddf670 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp +++ b/Source/Core/Core/DSP/Jit/x64/DSPJitUtil.cpp @@ -6,7 +6,7 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPHWInterface.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" using namespace Gen; diff --git a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp index 281db0698b..9348f5aa4c 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp @@ -13,7 +13,7 @@ #include "Core/DSP/DSPAnalyzer.h" #include "Core/DSP/DSPCodeUtil.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/Jit/DSPEmitter.h" +#include "Core/DSP/Jit/x64/DSPEmitter.h" #include "Core/HW/DSP.h" #include "Core/HW/DSPLLE/DSPSymbols.h" #include "Core/Host.h"