From a4cd11ec872f22879b0dff322a2186c647724c72 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 22 Dec 2016 14:01:12 -0500 Subject: [PATCH] DSP: Move interpreter source files to their own directory Keeps code organized similar to the DSP JIT. --- Source/Core/Core/CMakeLists.txt | 16 ++++++------- Source/Core/Core/Core.vcxproj | 24 +++++++++---------- Source/Core/Core/Core.vcxproj.filters | 24 +++++++++---------- Source/Core/Core/DSP/DSPAccelerator.cpp | 7 +++--- Source/Core/Core/DSP/DSPAnalyzer.cpp | 6 +++-- Source/Core/Core/DSP/DSPAssembler.cpp | 5 ++-- Source/Core/Core/DSP/DSPCore.cpp | 10 ++++---- Source/Core/Core/DSP/DSPDisassembler.cpp | 2 +- Source/Core/Core/DSP/DSPEmitter.cpp | 10 ++++++-- Source/Core/Core/DSP/DSPHWInterface.cpp | 7 +++--- Source/Core/Core/DSP/DSPMemoryMap.cpp | 5 +++- Source/Core/Core/DSP/DSPTables.cpp | 7 +++--- .../{ => Interpreter}/DSPIntArithmetic.cpp | 6 ++--- .../DSP/{ => Interpreter}/DSPIntBranch.cpp | 6 ++--- .../DSP/{ => Interpreter}/DSPIntCCUtil.cpp | 3 +-- .../Core/DSP/{ => Interpreter}/DSPIntCCUtil.h | 0 .../DSP/{ => Interpreter}/DSPIntExtOps.cpp | 5 ++-- .../Core/DSP/{ => Interpreter}/DSPIntExtOps.h | 0 .../DSP/{ => Interpreter}/DSPIntLoadStore.cpp | 4 ++-- .../Core/DSP/{ => Interpreter}/DSPIntMisc.cpp | 4 ++-- .../{ => Interpreter}/DSPIntMultiplier.cpp | 6 ++--- .../Core/DSP/{ => Interpreter}/DSPIntUtil.h | 0 .../DSP/{ => Interpreter}/DSPInterpreter.cpp | 2 +- .../DSP/{ => Interpreter}/DSPInterpreter.h | 0 Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp | 5 ++-- Source/Core/Core/DSP/Jit/DSPJitBranch.cpp | 3 ++- Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp | 2 +- Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp | 2 ++ Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp | 6 ++--- Source/Core/Core/DSP/Jit/DSPJitMisc.cpp | 5 ++-- Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp | 5 ++-- Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp | 6 ++++- Source/Core/Core/DSP/Jit/DSPJitUtil.cpp | 2 ++ Source/Core/Core/HW/DSPLLE/DSPLLE.cpp | 8 +++---- Source/Core/Core/HW/DSPLLE/DSPLLE.h | 1 + 35 files changed, 114 insertions(+), 90 deletions(-) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntArithmetic.cpp (99%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntBranch.cpp (98%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntCCUtil.cpp (97%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntCCUtil.h (100%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntExtOps.cpp (99%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntExtOps.h (100%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntLoadStore.cpp (98%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntMisc.cpp (97%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntMultiplier.cpp (99%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPIntUtil.h (100%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPInterpreter.cpp (99%) rename Source/Core/Core/DSP/{ => Interpreter}/DSPInterpreter.h (100%) diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 691a162c98..37f2c3ebab 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -29,23 +29,23 @@ set(SRCS ActionReplay.cpp DSP/DSPDisassembler.cpp DSP/DSPAccelerator.cpp DSP/DSPCaptureLogger.cpp - DSP/DSPIntCCUtil.cpp - DSP/DSPIntExtOps.cpp DSP/DSPHWInterface.cpp DSP/DSPMemoryMap.cpp DSP/DSPStacks.cpp DSP/DSPAnalyzer.cpp - DSP/DSPIntArithmetic.cpp - DSP/DSPIntBranch.cpp - DSP/DSPIntLoadStore.cpp - DSP/DSPIntMisc.cpp - DSP/DSPIntMultiplier.cpp DSP/DSPEmitter.cpp DSP/DSPCodeUtil.cpp DSP/LabelMap.cpp - DSP/DSPInterpreter.cpp DSP/DSPCore.cpp DSP/DSPTables.cpp + DSP/Interpreter/DSPIntArithmetic.cpp + DSP/Interpreter/DSPIntBranch.cpp + DSP/Interpreter/DSPIntCCUtil.cpp + DSP/Interpreter/DSPInterpreter.cpp + DSP/Interpreter/DSPIntExtOps.cpp + DSP/Interpreter/DSPIntLoadStore.cpp + DSP/Interpreter/DSPIntMisc.cpp + DSP/Interpreter/DSPIntMultiplier.cpp DSP/Jit/DSPJitRegCache.cpp DSP/Jit/DSPJitExtOps.cpp DSP/Jit/DSPJitBranch.cpp diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 0b00d6134d..29f554ae9a 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -61,17 +61,17 @@ - - - - - - - - + + + + + + + + @@ -289,13 +289,13 @@ - - - - + + + + diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 2bc35664f3..515f3fdf61 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -186,28 +186,28 @@ Debugger - + DSPCore\Interpreter - + DSPCore\Interpreter - + DSPCore\Interpreter - + DSPCore\Interpreter - + DSPCore\Interpreter - + DSPCore\Interpreter - + DSPCore\Interpreter - + DSPCore\Interpreter @@ -809,16 +809,16 @@ Debugger - + DSPCore\Interpreter - + DSPCore\Interpreter - + DSPCore\Interpreter - + DSPCore\Interpreter diff --git a/Source/Core/Core/DSP/DSPAccelerator.cpp b/Source/Core/Core/DSP/DSPAccelerator.cpp index 1252cf928a..049aa3493d 100644 --- a/Source/Core/Core/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/DSP/DSPAccelerator.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSP/DSPAccelerator.h" + #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Common/MathUtil.h" -#include "Core/DSP/DSPAccelerator.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPHWInterface.h" #include "Core/DSP/DSPHost.h" -#include "Core/DSP/DSPInterpreter.h" + // The hardware adpcm decoder :) static s16 ADPCM_Step(u32& _rSamplePos) { diff --git a/Source/Core/Core/DSP/DSPAnalyzer.cpp b/Source/Core/Core/DSP/DSPAnalyzer.cpp index ed25152d52..1de95acf3a 100644 --- a/Source/Core/Core/DSP/DSPAnalyzer.cpp +++ b/Source/Core/Core/DSP/DSPAnalyzer.cpp @@ -2,10 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSP/DSPAnalyzer.h" + #include -#include "Core/DSP/DSPAnalyzer.h" -#include "Core/DSP/DSPInterpreter.h" +#include "Common/Logging/Log.h" + #include "Core/DSP/DSPMemoryMap.h" #include "Core/DSP/DSPTables.h" diff --git a/Source/Core/Core/DSP/DSPAssembler.cpp b/Source/Core/Core/DSP/DSPAssembler.cpp index 7a1ad94605..58d618bd8b 100644 --- a/Source/Core/Core/DSP/DSPAssembler.cpp +++ b/Source/Core/Core/DSP/DSPAssembler.cpp @@ -3,8 +3,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSP/DSPAssembler.h" + #include #include +#include #include #include #include @@ -13,9 +16,7 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" -#include "Core/DSP/DSPAssembler.h" #include "Core/DSP/DSPDisassembler.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPTables.h" static const char* err_string[] = {"", diff --git a/Source/Core/Core/DSP/DSPCore.cpp b/Source/Core/Core/DSP/DSPCore.cpp index 5a0b06ad3d..ca901459bf 100644 --- a/Source/Core/Core/DSP/DSPCore.cpp +++ b/Source/Core/Core/DSP/DSPCore.cpp @@ -3,6 +3,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSP/DSPCore.h" + #include #include #include @@ -10,17 +12,17 @@ #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" #include "Common/Event.h" -#include "Common/FileUtil.h" #include "Common/Hash.h" +#include "Common/Logging/Log.h" #include "Common/MemoryUtil.h" +#include "Common/MsgHandler.h" #include "Core/DSP/DSPAnalyzer.h" -#include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPHWInterface.h" #include "Core/DSP/DSPHost.h" -#include "Core/DSP/DSPIntUtil.h" -#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/Interpreter/DSPIntUtil.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" SDSP g_dsp; DSPBreakpoints g_dsp_breakpoints; diff --git a/Source/Core/Core/DSP/DSPDisassembler.cpp b/Source/Core/Core/DSP/DSPDisassembler.cpp index 30f8cd96bf..ebc6bf0954 100644 --- a/Source/Core/Core/DSP/DSPDisassembler.cpp +++ b/Source/Core/Core/DSP/DSPDisassembler.cpp @@ -14,8 +14,8 @@ #include "Common/FileUtil.h" #include "Common/StringUtil.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPTables.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" DSPDisassembler::DSPDisassembler(const AssemblerSettings& settings) : settings_(settings) { diff --git a/Source/Core/Core/DSP/DSPEmitter.cpp b/Source/Core/Core/DSP/DSPEmitter.cpp index 6cb543caec..f4c558cd37 100644 --- a/Source/Core/Core/DSP/DSPEmitter.cpp +++ b/Source/Core/Core/DSP/DSPEmitter.cpp @@ -2,14 +2,20 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSP/DSPEmitter.h" + #include +#include "Common/Assert.h" +#include "Common/BitSet.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" + #include "Core/DSP/DSPAnalyzer.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPHost.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" #define MAX_BLOCK_SIZE 250 #define DSP_IDLE_SKIP_CYCLES 0x1000 diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp index 679a724b65..02a4807dda 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/DSP/DSPHWInterface.cpp @@ -3,18 +3,17 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSP/DSPHWInterface.h" + #include "Common/CPUDetect.h" #include "Common/CommonFuncs.h" #include "Common/Intrinsics.h" +#include "Common/Logging/Log.h" #include "Common/MemoryUtil.h" -#include "Common/Thread.h" #include "Core/DSP/DSPAccelerator.h" -#include "Core/DSP/DSPAnalyzer.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPHWInterface.h" #include "Core/DSP/DSPHost.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPTables.h" static void gdsp_do_dma(); diff --git a/Source/Core/Core/DSP/DSPMemoryMap.cpp b/Source/Core/Core/DSP/DSPMemoryMap.cpp index 68904e4650..98f3aff1d6 100644 --- a/Source/Core/Core/DSP/DSPMemoryMap.cpp +++ b/Source/Core/Core/DSP/DSPMemoryMap.cpp @@ -4,9 +4,12 @@ // Refer to the license.txt file included. #include "Core/DSP/DSPMemoryMap.h" + +#include "Common/Logging/Log.h" + #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPHWInterface.h" -#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/DSPTables.h" u16 dsp_imem_read(u16 addr) { diff --git a/Source/Core/Core/DSP/DSPTables.cpp b/Source/Core/Core/DSP/DSPTables.cpp index 66f277be00..be93f5b2c0 100644 --- a/Source/Core/Core/DSP/DSPTables.cpp +++ b/Source/Core/Core/DSP/DSPTables.cpp @@ -4,12 +4,13 @@ // Additional copyrights go to Duddie (c) 2005 (duddie@walla.com) +#include "Core/DSP/DSPTables.h" + #include "Common/CommonTypes.h" #include "Core/DSP/DSPEmitter.h" -#include "Core/DSP/DSPIntExtOps.h" -#include "Core/DSP/DSPInterpreter.h" -#include "Core/DSP/DSPTables.h" +#include "Core/DSP/Interpreter/DSPIntExtOps.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" // clang-format off const DSPOPCTemplate opcodes[] = diff --git a/Source/Core/Core/DSP/DSPIntArithmetic.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp similarity index 99% rename from Source/Core/Core/DSP/DSPIntArithmetic.cpp rename to Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp index 1a30c63857..b4b4c39cd2 100644 --- a/Source/Core/Core/DSP/DSPIntArithmetic.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntArithmetic.cpp @@ -4,11 +4,11 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "Core/DSP/DSPIntCCUtil.h" -#include "Core/DSP/DSPIntUtil.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPMemoryMap.h" #include "Core/DSP/DSPTables.h" +#include "Core/DSP/Interpreter/DSPIntCCUtil.h" +#include "Core/DSP/Interpreter/DSPIntUtil.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" // Arithmetic and accumulator control. diff --git a/Source/Core/Core/DSP/DSPIntBranch.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntBranch.cpp similarity index 98% rename from Source/Core/Core/DSP/DSPIntBranch.cpp rename to Source/Core/Core/DSP/Interpreter/DSPIntBranch.cpp index 875d9584b9..0b81b19825 100644 --- a/Source/Core/Core/DSP/DSPIntBranch.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntBranch.cpp @@ -5,11 +5,11 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPIntCCUtil.h" -#include "Core/DSP/DSPIntUtil.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPMemoryMap.h" #include "Core/DSP/DSPStacks.h" +#include "Core/DSP/Interpreter/DSPIntCCUtil.h" +#include "Core/DSP/Interpreter/DSPIntUtil.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntCCUtil.cpp similarity index 97% rename from Source/Core/Core/DSP/DSPIntCCUtil.cpp rename to Source/Core/Core/DSP/Interpreter/DSPIntCCUtil.cpp index df51a9b665..d79a01638a 100644 --- a/Source/Core/Core/DSP/DSPIntCCUtil.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntCCUtil.cpp @@ -6,9 +6,8 @@ // HELPER FUNCTIONS -#include "Core/DSP/DSPIntCCUtil.h" +#include "Core/DSP/Interpreter/DSPIntCCUtil.h" #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPInterpreter.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.h b/Source/Core/Core/DSP/Interpreter/DSPIntCCUtil.h similarity index 100% rename from Source/Core/Core/DSP/DSPIntCCUtil.h rename to Source/Core/Core/DSP/Interpreter/DSPIntCCUtil.h diff --git a/Source/Core/Core/DSP/DSPIntExtOps.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.cpp similarity index 99% rename from Source/Core/Core/DSP/DSPIntExtOps.cpp rename to Source/Core/Core/DSP/Interpreter/DSPIntExtOps.cpp index 4d4b140556..337e2322a5 100644 --- a/Source/Core/Core/DSP/DSPIntExtOps.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.cpp @@ -2,9 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "DSPIntExtOps.h" -#include "Core/DSP/DSPIntUtil.h" +#include "Core/DSP/Interpreter/DSPIntExtOps.h" + #include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/Interpreter/DSPIntUtil.h" // not needed for game ucodes (it slows down interpreter/dspjit32 + easier to compare int VS // dspjit64 without it) diff --git a/Source/Core/Core/DSP/DSPIntExtOps.h b/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.h similarity index 100% rename from Source/Core/Core/DSP/DSPIntExtOps.h rename to Source/Core/Core/DSP/Interpreter/DSPIntExtOps.h diff --git a/Source/Core/Core/DSP/DSPIntLoadStore.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntLoadStore.cpp similarity index 98% rename from Source/Core/Core/DSP/DSPIntLoadStore.cpp rename to Source/Core/Core/DSP/Interpreter/DSPIntLoadStore.cpp index e2305f304e..018a0bef57 100644 --- a/Source/Core/Core/DSP/DSPIntLoadStore.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntLoadStore.cpp @@ -4,9 +4,9 @@ // // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "Core/DSP/DSPIntUtil.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/Interpreter/DSPIntUtil.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntMisc.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp similarity index 97% rename from Source/Core/Core/DSP/DSPIntMisc.cpp rename to Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp index 1883b7d741..23f4ca98f3 100644 --- a/Source/Core/Core/DSP/DSPIntMisc.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp @@ -5,10 +5,10 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 #include "Core/DSP/DSPCore.h" -#include "Core/DSP/DSPIntUtil.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPMemoryMap.h" #include "Core/DSP/DSPTables.h" +#include "Core/DSP/Interpreter/DSPIntUtil.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntMultiplier.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp similarity index 99% rename from Source/Core/Core/DSP/DSPIntMultiplier.cpp rename to Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp index 82b1819c65..a3c149d7e7 100644 --- a/Source/Core/Core/DSP/DSPIntMultiplier.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp @@ -6,10 +6,10 @@ // Multiplier and product register control -#include "Core/DSP/DSPIntCCUtil.h" -#include "Core/DSP/DSPIntUtil.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPTables.h" +#include "Core/DSP/Interpreter/DSPIntCCUtil.h" +#include "Core/DSP/Interpreter/DSPIntUtil.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntUtil.h b/Source/Core/Core/DSP/Interpreter/DSPIntUtil.h similarity index 100% rename from Source/Core/Core/DSP/DSPIntUtil.h rename to Source/Core/Core/DSP/Interpreter/DSPIntUtil.h diff --git a/Source/Core/Core/DSP/DSPInterpreter.cpp b/Source/Core/Core/DSP/Interpreter/DSPInterpreter.cpp similarity index 99% rename from Source/Core/Core/DSP/DSPInterpreter.cpp rename to Source/Core/Core/DSP/Interpreter/DSPInterpreter.cpp index 1f1bb3f7b3..b30eccc519 100644 --- a/Source/Core/Core/DSP/DSPInterpreter.cpp +++ b/Source/Core/Core/DSP/Interpreter/DSPInterpreter.cpp @@ -3,7 +3,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Core/DSP/DSPInterpreter.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Core/DSP/DSPInterpreter.h b/Source/Core/Core/DSP/Interpreter/DSPInterpreter.h similarity index 100% rename from Source/Core/Core/DSP/DSPInterpreter.h rename to Source/Core/Core/DSP/Interpreter/DSPInterpreter.h diff --git a/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp index 0ae98eb363..fde040416c 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp @@ -4,10 +4,9 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 -#include "Core/DSP/DSPAnalyzer.h" +#include "Common/CommonTypes.h" + #include "Core/DSP/DSPEmitter.h" -#include "Core/DSP/DSPIntCCUtil.h" -#include "Core/DSP/DSPIntUtil.h" #include "Core/DSP/DSPMemoryMap.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp index 1f89e06698..18ca7053a6 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp @@ -2,10 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/CommonTypes.h" + #include "Core/DSP/DSPAnalyzer.h" #include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPMemoryMap.h" -#include "Core/DSP/DSPStacks.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp index 876ffd638e..be4b69e56b 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp @@ -4,8 +4,8 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 +#include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPEmitter.h" -#include "Core/DSP/DSPIntUtil.h" // Helper functions using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp index 690960685c..aec658f975 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/CommonTypes.h" + #include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPMemoryMap.h" diff --git a/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp index 8cf503ef5d..2d37f18a30 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp @@ -4,11 +4,11 @@ // Additional copyrights go to Duddie and Tratax (c) 2004 +#include "Common/CommonTypes.h" + #include "Core/DSP/DSPEmitter.h" -#include "Core/DSP/DSPIntCCUtil.h" -#include "Core/DSP/DSPIntUtil.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp index 3a18d7cca6..f71f9d3b33 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitMisc.cpp @@ -2,10 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/CommonTypes.h" + #include "Core/DSP/DSPEmitter.h" -#include "Core/DSP/DSPIntUtil.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPMemoryMap.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp index 7edb90e54d..3c6b614f72 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp @@ -6,9 +6,10 @@ // Multiplier and product register control -#include "Core/DSP/DSPAnalyzer.h" +#include "Common/CommonTypes.h" + +#include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPEmitter.h" -#include "Core/DSP/DSPIntUtil.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp index f7f6ea1603..05dce4878b 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp @@ -2,11 +2,15 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/DSP/Jit/DSPJitRegCache.h" + #include +#include "Common/Assert.h" +#include "Common/Logging/Log.h" + #include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPMemoryMap.h" -#include "Core/DSP/Jit/DSPJitRegCache.h" using namespace Gen; diff --git a/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp index 6b6088ce1e..de088f0f4c 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/CommonTypes.h" + #include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPHWInterface.h" #include "Core/DSP/DSPMemoryMap.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index f196955a15..370acfcd86 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/HW/DSPLLE/DSPLLE.h" + #include #include #include -#include "Common/Atomic.h" #include "Common/ChunkFile.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" @@ -19,14 +20,11 @@ #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPHWInterface.h" #include "Core/DSP/DSPHost.h" -#include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPTables.h" -#include "Core/HW/DSPLLE/DSPLLE.h" +#include "Core/DSP/Interpreter/DSPInterpreter.h" #include "Core/HW/DSPLLE/DSPLLEGlobals.h" #include "Core/HW/Memmap.h" #include "Core/Host.h" -#include "Core/Movie.h" -#include "Core/NetPlayProto.h" static Common::Event dspEvent; static Common::Event ppcEvent; diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h index b45e5a8071..95e849f07c 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.h @@ -8,6 +8,7 @@ #include #include +#include "Common/CommonTypes.h" #include "Common/Flag.h" #include "Core/DSPEmulator.h"