From fdabc82342d82227901c9a709b10f02dfe1801a3 Mon Sep 17 00:00:00 2001 From: kenshen112 Date: Sun, 10 Apr 2022 11:45:04 -0700 Subject: [PATCH] Remove IopCommon.h added proper includes to files. Removing circle includes in several files that sometimes was several layers deep --- pcsx2/CDVD/BlockdumpFileReader.cpp | 1 - pcsx2/CDVD/CDVD.cpp | 6 +++-- pcsx2/CDVD/CDVD.h | 1 - pcsx2/CDVD/CDVDaccess.cpp | 1 - pcsx2/CDVD/CDVDdiscReader.cpp | 1 + pcsx2/CDVD/CDVDdiscReader.h | 1 - pcsx2/CDVD/CDVDdiscThread.cpp | 1 + pcsx2/CDVD/CDVDisoReader.cpp | 1 + pcsx2/CDVD/CDVDisoReader.h | 1 - pcsx2/CDVD/CdRom.cpp | 5 +++- pcsx2/CDVD/CdRom.h | 1 - pcsx2/CDVD/InputIsoFile.cpp | 1 - pcsx2/CDVD/Linux/IOCtlSrc.cpp | 1 + pcsx2/CDVD/OutputIsoFile.cpp | 1 - pcsx2/CDVD/Windows/IOCtlSrc.cpp | 1 + pcsx2/CMakeLists.txt | 1 - pcsx2/Dump.cpp | 2 +- pcsx2/FW.cpp | 3 ++- pcsx2/Hw.cpp | 1 - pcsx2/HwRead.cpp | 2 +- pcsx2/HwWrite.cpp | 6 ++++- pcsx2/IPU/IPU.h | 1 + pcsx2/IopBios.cpp | 5 +++- pcsx2/IopCommon.h | 36 ----------------------------- pcsx2/IopCounters.cpp | 6 ++++- pcsx2/IopDma.cpp | 6 ++++- pcsx2/IopGte.cpp | 5 ++-- pcsx2/IopHw.cpp | 10 +++++++- pcsx2/IopIrq.cpp | 5 +++- pcsx2/IopMem.cpp | 4 +++- pcsx2/IopSio2.cpp | 5 +++- pcsx2/Mdec.cpp | 3 ++- pcsx2/Memory.cpp | 2 +- pcsx2/Patch.cpp | 1 - pcsx2/Patch_Memory.cpp | 3 ++- pcsx2/R3000A.cpp | 10 +++++++- pcsx2/R3000AInterpreter.cpp | 5 +++- pcsx2/R3000AOpcodeTables.cpp | 4 +++- pcsx2/RDebug/deci2_dbgp.cpp | 1 - pcsx2/RDebug/deci2_iloadp.cpp | 1 - pcsx2/SPU2/Dma.cpp | 3 ++- pcsx2/SPU2/spu2.h | 1 + pcsx2/SPU2/spu2sys.cpp | 4 +++- pcsx2/SaveState.cpp | 3 ++- pcsx2/Sif.cpp | 3 ++- pcsx2/Sif0.cpp | 4 +++- pcsx2/Sif1.cpp | 4 +++- pcsx2/Sio.cpp | 4 +++- pcsx2/System.cpp | 3 ++- pcsx2/pcsx2.vcxproj | 1 - pcsx2/pcsx2.vcxproj.filters | 3 --- pcsx2/pcsx2core.vcxproj | 1 - pcsx2/pcsx2core.vcxproj.filters | 3 --- pcsx2/ps2/Iop/IopHwRead.cpp | 3 +++ pcsx2/ps2/Iop/IopHwWrite.cpp | 4 ++++ pcsx2/ps2/Iop/IopHw_Internal.h | 3 ++- pcsx2/ps2/Iop/PsxBios.cpp | 4 +++- pcsx2/ps2/pgif.cpp | 3 +++ pcsx2/sif2.cpp | 4 +++- pcsx2/sio_internal.h | 1 + pcsx2/windows/VCprojects/IopSif.cpp | 2 +- pcsx2/x86/iR3000A.cpp | 5 +++- pcsx2/x86/iR3000Atables.cpp | 2 +- pcsx2/x86/ix86-32/iR5900-32.cpp | 1 + 64 files changed, 128 insertions(+), 93 deletions(-) delete mode 100644 pcsx2/IopCommon.h diff --git a/pcsx2/CDVD/BlockdumpFileReader.cpp b/pcsx2/CDVD/BlockdumpFileReader.cpp index 180031ea30..bb48816d16 100644 --- a/pcsx2/CDVD/BlockdumpFileReader.cpp +++ b/pcsx2/CDVD/BlockdumpFileReader.cpp @@ -15,7 +15,6 @@ #include "PrecompiledHeader.h" #include "AsyncFileReader.h" -#include "IopCommon.h" #include "IsoFileFormats.h" #include "common/FileSystem.h" diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp index d055e6bc83..72227f5048 100644 --- a/pcsx2/CDVD/CDVD.cpp +++ b/pcsx2/CDVD/CDVD.cpp @@ -14,7 +14,10 @@ */ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" +#include "IopHw.h" +#include "IopDma.h" #include #include @@ -433,7 +436,6 @@ static __fi void _reloadElfInfo(wxString elfpath) // binary). } - static __fi void _reloadPSXElfInfo(wxString elfpath) { // Now's a good time to reload the ELF info... diff --git a/pcsx2/CDVD/CDVD.h b/pcsx2/CDVD/CDVD.h index 4eb1b5e15c..a209cc4aac 100644 --- a/pcsx2/CDVD/CDVD.h +++ b/pcsx2/CDVD/CDVD.h @@ -17,7 +17,6 @@ #pragma once -#include "IopCommon.h" #include "CDVDaccess.h" #define btoi(b) ((b) / 16 * 10 + (b) % 16) /* BCD to u_char */ diff --git a/pcsx2/CDVD/CDVDaccess.cpp b/pcsx2/CDVD/CDVDaccess.cpp index 38673e320d..5f65e00c0d 100644 --- a/pcsx2/CDVD/CDVDaccess.cpp +++ b/pcsx2/CDVD/CDVDaccess.cpp @@ -15,7 +15,6 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" #define ENABLE_TIMESTAMPS diff --git a/pcsx2/CDVD/CDVDdiscReader.cpp b/pcsx2/CDVD/CDVDdiscReader.cpp index 5c7493968d..2d563e334d 100644 --- a/pcsx2/CDVD/CDVDdiscReader.cpp +++ b/pcsx2/CDVD/CDVDdiscReader.cpp @@ -15,6 +15,7 @@ #include "PrecompiledHeader.h" #include "CDVDdiscReader.h" +#include "CDVD/CDVD.h" #include diff --git a/pcsx2/CDVD/CDVDdiscReader.h b/pcsx2/CDVD/CDVDdiscReader.h index c53771e336..a0236ed687 100644 --- a/pcsx2/CDVD/CDVDdiscReader.h +++ b/pcsx2/CDVD/CDVDdiscReader.h @@ -16,7 +16,6 @@ #ifndef __CDVD_DISC_READER_H__ #define __CDVD_DISC_READER_H__ -#include "IopCommon.h" #if defined(_WIN32) #define NOMINMAX diff --git a/pcsx2/CDVD/CDVDdiscThread.cpp b/pcsx2/CDVD/CDVDdiscThread.cpp index 47de323828..d46b83966c 100644 --- a/pcsx2/CDVD/CDVDdiscThread.cpp +++ b/pcsx2/CDVD/CDVDdiscThread.cpp @@ -15,6 +15,7 @@ #include "PrecompiledHeader.h" #include "CDVDdiscReader.h" +#include "CDVD/CDVD.h" #include #include diff --git a/pcsx2/CDVD/CDVDisoReader.cpp b/pcsx2/CDVD/CDVDisoReader.cpp index 6254d3953b..8461141fea 100644 --- a/pcsx2/CDVD/CDVDisoReader.cpp +++ b/pcsx2/CDVD/CDVDisoReader.cpp @@ -24,6 +24,7 @@ #include "CDVDisoReader.h" #include "AsyncFileReader.h" +#include "CDVD/CDVD.h" #include #include diff --git a/pcsx2/CDVD/CDVDisoReader.h b/pcsx2/CDVD/CDVDisoReader.h index e03ef00689..aed8ab21ea 100644 --- a/pcsx2/CDVD/CDVDisoReader.h +++ b/pcsx2/CDVD/CDVDisoReader.h @@ -18,7 +18,6 @@ #include -#include "IopCommon.h" #include "IsoFileFormats.h" #endif diff --git a/pcsx2/CDVD/CdRom.cpp b/pcsx2/CDVD/CdRom.cpp index 161d2e26cb..045f7427dc 100644 --- a/pcsx2/CDVD/CdRom.cpp +++ b/pcsx2/CDVD/CdRom.cpp @@ -14,10 +14,13 @@ */ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "CdRom.h" #include "CDVD.h" +#include "IopHw.h" +#include "IopDma.h" //THIS ALL IS FOR THE CDROM REGISTERS HANDLING diff --git a/pcsx2/CDVD/CdRom.h b/pcsx2/CDVD/CdRom.h index e1df2878a0..0197f5529e 100644 --- a/pcsx2/CDVD/CdRom.h +++ b/pcsx2/CDVD/CdRom.h @@ -16,7 +16,6 @@ #ifndef __CDROM_H__ #define __CDROM_H__ -#include "IopCommon.h" #include "CDVDaccess.h" // Not used. diff --git a/pcsx2/CDVD/InputIsoFile.cpp b/pcsx2/CDVD/InputIsoFile.cpp index f43bb251d4..413946c1ef 100644 --- a/pcsx2/CDVD/InputIsoFile.cpp +++ b/pcsx2/CDVD/InputIsoFile.cpp @@ -15,7 +15,6 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" #include "IsoFileFormats.h" #include diff --git a/pcsx2/CDVD/Linux/IOCtlSrc.cpp b/pcsx2/CDVD/Linux/IOCtlSrc.cpp index 3cffd8180f..4adee1f3e0 100644 --- a/pcsx2/CDVD/Linux/IOCtlSrc.cpp +++ b/pcsx2/CDVD/Linux/IOCtlSrc.cpp @@ -15,6 +15,7 @@ #include "PrecompiledHeader.h" #include "CDVD/CDVDdiscReader.h" +#include "CDVD/CDVD.h" #ifdef __linux__ #include diff --git a/pcsx2/CDVD/OutputIsoFile.cpp b/pcsx2/CDVD/OutputIsoFile.cpp index c22f49b7fd..18b3fbd4b7 100644 --- a/pcsx2/CDVD/OutputIsoFile.cpp +++ b/pcsx2/CDVD/OutputIsoFile.cpp @@ -15,7 +15,6 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" #include "IsoFileFormats.h" #include "common/FileSystem.h" #include "common/StringUtil.h" diff --git a/pcsx2/CDVD/Windows/IOCtlSrc.cpp b/pcsx2/CDVD/Windows/IOCtlSrc.cpp index bfeb956260..695b84e28d 100644 --- a/pcsx2/CDVD/Windows/IOCtlSrc.cpp +++ b/pcsx2/CDVD/Windows/IOCtlSrc.cpp @@ -15,6 +15,7 @@ #include "PrecompiledHeader.h" #include "CDVD/CDVDdiscReader.h" +#include "CDVD/CDVD.h" #include #include diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index ed064da644..51885679ac 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -213,7 +213,6 @@ set(pcsx2Headers HostDisplay.h Hw.h IopBios.h - IopCommon.h IopCounters.h IopDma.h IopGte.h diff --git a/pcsx2/Dump.cpp b/pcsx2/Dump.cpp index 298a4e334f..ec7004568a 100644 --- a/pcsx2/Dump.cpp +++ b/pcsx2/Dump.cpp @@ -14,7 +14,7 @@ */ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "Common.h" #include "Counters.h" #include "iCore.h" diff --git a/pcsx2/FW.cpp b/pcsx2/FW.cpp index 2599589aee..b383976710 100644 --- a/pcsx2/FW.cpp +++ b/pcsx2/FW.cpp @@ -14,7 +14,8 @@ */ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "IopDma.h" +#include "R3000A.h" #include #include using namespace std; diff --git a/pcsx2/Hw.cpp b/pcsx2/Hw.cpp index 00603c7ad5..0fbceb406e 100644 --- a/pcsx2/Hw.cpp +++ b/pcsx2/Hw.cpp @@ -20,7 +20,6 @@ #include "newVif.h" #include "IPU/IPUdma.h" #include "Gif_Unit.h" -#include "IopCommon.h" #include "SPU2/spu2.h" using namespace R5900; diff --git a/pcsx2/HwRead.cpp b/pcsx2/HwRead.cpp index 6bbd7caeb5..8ba0587366 100644 --- a/pcsx2/HwRead.cpp +++ b/pcsx2/HwRead.cpp @@ -17,7 +17,7 @@ #include "PrecompiledHeader.h" #include "Common.h" #include "Hardware.h" -#include "IopCommon.h" +#include "IopHw.h" #include "ps2/HwInternal.h" #include "ps2/eeHwTraceLog.inl" diff --git a/pcsx2/HwWrite.cpp b/pcsx2/HwWrite.cpp index 4a6f735899..fd7501ba7b 100644 --- a/pcsx2/HwWrite.cpp +++ b/pcsx2/HwWrite.cpp @@ -18,7 +18,8 @@ #include "Common.h" #include "Hardware.h" #include "Gif_Unit.h" -#include "IopCommon.h" +#include "IopMem.h" + #include "ps2/HwInternal.h" #include "ps2/eeHwTraceLog.inl" @@ -26,6 +27,9 @@ #include "SPU2/spu2.h" #include "R3000A.h" +#include "CDVD/CdRom.h" +#include "CDVD/CDVD.h" + using namespace R5900; // Shift the middle 8 bits (bits 4-12) into the lower 8 bits. diff --git a/pcsx2/IPU/IPU.h b/pcsx2/IPU/IPU.h index 250ede2847..0d5e33c4c1 100644 --- a/pcsx2/IPU/IPU.h +++ b/pcsx2/IPU/IPU.h @@ -17,6 +17,7 @@ #include "IPU_Fifo.h" #include "IPUdma.h" +#include "Common.h" #define ipumsk( src ) ( (src) & 0xff ) #define ipucase( src ) case ipumsk(src) diff --git a/pcsx2/IopBios.cpp b/pcsx2/IopBios.cpp index 14502ae538..0860400165 100644 --- a/pcsx2/IopBios.cpp +++ b/pcsx2/IopBios.cpp @@ -15,8 +15,11 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "R5900.h" // for g_GameStarted +#include "IopBios.h" +#include "IopMem.h" #include #include diff --git a/pcsx2/IopCommon.h b/pcsx2/IopCommon.h deleted file mode 100644 index 011fadd67b..0000000000 --- a/pcsx2/IopCommon.h +++ /dev/null @@ -1,36 +0,0 @@ -/* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2010 PCSX2 Dev Team - * - * PCSX2 is free software: you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with PCSX2. - * If not, see . - */ - -#pragma once - -#include "R3000A.h" -#include "Common.h" - -#include "CDVD/CDVD.h" -#include "CDVD/CdRom.h" - -#include "IopDma.h" -#include "IopMem.h" -#include "IopHw.h" -#include "IopBios.h" -#include "IopCounters.h" -#include "IopSio2.h" -#include "IopGte.h" -//#define PSXCLK 9216000 /* 36.864 Mhz */ -//#define PSXCLK 186864000 /* 36.864 Mhz */ - -// Uncomment to make pcsx2 print each spu2 interrupt it receives -//#define SPU2IRQTEST - diff --git a/pcsx2/IopCounters.cpp b/pcsx2/IopCounters.cpp index bb361d111e..cff0d25ad8 100644 --- a/pcsx2/IopCounters.cpp +++ b/pcsx2/IopCounters.cpp @@ -19,10 +19,14 @@ // The EventText function will pick it up. #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "SPU2/spu2.h" #include "DEV9/DEV9.h" #include "USB/USB.h" +#include "IopHw.h" +#include "IopDma.h" +#include "CDVD/CDVD.h" #include diff --git a/pcsx2/IopDma.cpp b/pcsx2/IopDma.cpp index c11816482c..efd3e5e90c 100644 --- a/pcsx2/IopDma.cpp +++ b/pcsx2/IopDma.cpp @@ -14,8 +14,12 @@ */ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "SPU2/spu2.h" +#include "IopCounters.h" +#include "IopHw.h" +#include "IopDma.h" #include "Sif.h" #include "DEV9/DEV9.h" diff --git a/pcsx2/IopGte.cpp b/pcsx2/IopGte.cpp index 5310c92d18..3415c40dca 100644 --- a/pcsx2/IopGte.cpp +++ b/pcsx2/IopGte.cpp @@ -18,8 +18,9 @@ //#include //#include #include "IopGte.h" -//#include "R3000A.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "IopMem.h" + #include "common/MathUtils.h" #ifdef GTE_DUMP #define G_OP(name,delay) fprintf(gteLog, "* : %08X : %02d : %s\n", psxRegs.code, delay, name); diff --git a/pcsx2/IopHw.cpp b/pcsx2/IopHw.cpp index c1ead8097c..fdcf5961ed 100644 --- a/pcsx2/IopHw.cpp +++ b/pcsx2/IopHw.cpp @@ -15,11 +15,19 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "iR5900.h" #include "Sio.h" #include "Mdec.h" +#include "IopSio2.h" +#include "IopCounters.h" +#include "IopHw.h" +#include "IopDma.h" +#include "CDVD/CdRom.h" +#include "CDVD/CDVD.h" + // NOTE: Any modifications to read/write fns should also go into their const counterparts // found in iPsxHw.cpp. diff --git a/pcsx2/IopIrq.cpp b/pcsx2/IopIrq.cpp index 7560bd1f58..0e64cb3145 100644 --- a/pcsx2/IopIrq.cpp +++ b/pcsx2/IopIrq.cpp @@ -14,9 +14,12 @@ */ #include "PrecompiledHeader.h" -#include "IopCommon.h" #include "DEV9/DEV9.h" #include "USB/USB.h" +#include "IopHw.h" +#include "IopDma.h" +#include "Common.h" +#include "R3000A.h" using namespace R3000A; diff --git a/pcsx2/IopMem.cpp b/pcsx2/IopMem.cpp index 62bc83dbbc..584a8ea58d 100644 --- a/pcsx2/IopMem.cpp +++ b/pcsx2/IopMem.cpp @@ -15,10 +15,12 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "ps2/pgif.h" // for PSX kernel TTY in iopMemWrite32 #include "SPU2/spu2.h" #include "DEV9/DEV9.h" +#include "IopHw.h" uptr *psxMemWLUT = NULL; const uptr *psxMemRLUT = NULL; diff --git a/pcsx2/IopSio2.cpp b/pcsx2/IopSio2.cpp index a5da1c565d..ec61547507 100644 --- a/pcsx2/IopSio2.cpp +++ b/pcsx2/IopSio2.cpp @@ -15,10 +15,13 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "Common.h" #include "Sio.h" #include "sio_internal.h" +#include "IopSio2.h" +#include "IopHw.h" +#include "IopDma.h" sio2Struct sio2; diff --git a/pcsx2/Mdec.cpp b/pcsx2/Mdec.cpp index 4268b467bf..ce17520e50 100644 --- a/pcsx2/Mdec.cpp +++ b/pcsx2/Mdec.cpp @@ -22,9 +22,10 @@ #include #include +#include "Common.h" -#include "IopCommon.h" #include "Mdec.h" +#include "IopHw.h" struct { u32 command; diff --git a/pcsx2/Memory.cpp b/pcsx2/Memory.cpp index 1a1a5cf743..d4ce8433d0 100644 --- a/pcsx2/Memory.cpp +++ b/pcsx2/Memory.cpp @@ -37,7 +37,7 @@ BIOS #include "PrecompiledHeader.h" #include -#include "IopCommon.h" +#include "IopHw.h" #include "GS.h" #include "VUmicro.h" #include "MTVU.h" diff --git a/pcsx2/Patch.cpp b/pcsx2/Patch.cpp index 996156c709..c23eadebae 100644 --- a/pcsx2/Patch.cpp +++ b/pcsx2/Patch.cpp @@ -18,7 +18,6 @@ #define _PC_ // disables MIPS opcode macros. #include "common/StringUtil.h" -#include "IopCommon.h" #include "Patch.h" #include "Config.h" diff --git a/pcsx2/Patch_Memory.cpp b/pcsx2/Patch_Memory.cpp index 2b7e6a1bbb..92b3d77ccc 100644 --- a/pcsx2/Patch_Memory.cpp +++ b/pcsx2/Patch_Memory.cpp @@ -17,8 +17,9 @@ #define _PC_ // disables MIPS opcode macros. -#include "IopCommon.h" +#include "Common.h" #include "Patch.h" +#include "IopMem.h" u32 SkipCount = 0, IterationCount = 0; u32 IterationIncrement = 0, ValueIncrement = 0; diff --git a/pcsx2/R3000A.cpp b/pcsx2/R3000A.cpp index 614f905ee8..2bd5e7c4bc 100644 --- a/pcsx2/R3000A.cpp +++ b/pcsx2/R3000A.cpp @@ -15,12 +15,20 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "Sio.h" #include "Sif.h" #include "DebugTools/Breakpoints.h" #include "R5900OpcodeTables.h" +#include "IopSio2.h" +#include "IopCounters.h" +#include "IopBios.h" +#include "IopHw.h" +#include "IopDma.h" +#include "CDVD/CdRom.h" +#include "CDVD/CDVD.h" using namespace R3000A; diff --git a/pcsx2/R3000AInterpreter.cpp b/pcsx2/R3000AInterpreter.cpp index f4ada5305b..56ef430091 100644 --- a/pcsx2/R3000AInterpreter.cpp +++ b/pcsx2/R3000AInterpreter.cpp @@ -15,12 +15,15 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "Config.h" #include "System/SysThreads.h" #include "R5900OpcodeTables.h" #include "DebugTools/Breakpoints.h" +#include "IopBios.h" +#include "IopHw.h" using namespace R3000A; diff --git a/pcsx2/R3000AOpcodeTables.cpp b/pcsx2/R3000AOpcodeTables.cpp index 52994e82be..dc9174a88f 100644 --- a/pcsx2/R3000AOpcodeTables.cpp +++ b/pcsx2/R3000AOpcodeTables.cpp @@ -15,7 +15,9 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "IopGte.h" +#include "IopMem.h" // Note: Branch instructions of the Interpreter are defined externally because // the recompiler shouldn't be using them (it isn't entirely safe, due to the diff --git a/pcsx2/RDebug/deci2_dbgp.cpp b/pcsx2/RDebug/deci2_dbgp.cpp index 85e7ed744a..f0c3b8dc4b 100644 --- a/pcsx2/RDebug/deci2_dbgp.cpp +++ b/pcsx2/RDebug/deci2_dbgp.cpp @@ -16,7 +16,6 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" #include "VUmicro.h" #include "deci2.h" diff --git a/pcsx2/RDebug/deci2_iloadp.cpp b/pcsx2/RDebug/deci2_iloadp.cpp index 5659a2a69b..918cbf1b0b 100644 --- a/pcsx2/RDebug/deci2_iloadp.cpp +++ b/pcsx2/RDebug/deci2_iloadp.cpp @@ -16,7 +16,6 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" #include "IopBios2.h" #include "deci2.h" diff --git a/pcsx2/SPU2/Dma.cpp b/pcsx2/SPU2/Dma.cpp index 6a7d541fdc..bf77d1db17 100644 --- a/pcsx2/SPU2/Dma.cpp +++ b/pcsx2/SPU2/Dma.cpp @@ -16,7 +16,8 @@ #include "PrecompiledHeader.h" #include "Global.h" #include "Dma.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "IopHw.h" #include "spu2.h" // temporary until I resolve cyclePtr/TimeUpdate dependencies. diff --git a/pcsx2/SPU2/spu2.h b/pcsx2/SPU2/spu2.h index 2539e15fb3..14f0bdb575 100644 --- a/pcsx2/SPU2/spu2.h +++ b/pcsx2/SPU2/spu2.h @@ -17,6 +17,7 @@ #include "common/Threading.h" #include "SaveState.h" +#include "IopCounters.h" extern Threading::MutexRecursive mtx_SPU2Status; diff --git a/pcsx2/SPU2/spu2sys.cpp b/pcsx2/SPU2/spu2sys.cpp index 6802e579a8..59aa6b2327 100644 --- a/pcsx2/SPU2/spu2sys.cpp +++ b/pcsx2/SPU2/spu2sys.cpp @@ -24,7 +24,9 @@ #include "Global.h" #include "Dma.h" #include "IopDma.h" -#include "IopCommon.h" +#include "IopCounters.h" +#include "R3000A.h" +#include "IopHw.h" #include "spu2.h" // needed until I figure out a nice solution for irqcallback dependencies. diff --git a/pcsx2/SaveState.cpp b/pcsx2/SaveState.cpp index b0d052fc86..5a6e762db3 100644 --- a/pcsx2/SaveState.cpp +++ b/pcsx2/SaveState.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" #include "SaveState.h" #include "ps2/BiosTools.h" @@ -24,6 +24,7 @@ #include "MTVU.h" #include "Cache.h" #include "Config.h" +#include "CDVD/CDVD.h" #include "Elfheader.h" #include "Counters.h" diff --git a/pcsx2/Sif.cpp b/pcsx2/Sif.cpp index a56cc3e09f..05efd2fd9f 100644 --- a/pcsx2/Sif.cpp +++ b/pcsx2/Sif.cpp @@ -17,7 +17,8 @@ #define _PC_ // disables MIPS opcode macros. -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "Sif.h" void sifReset() diff --git a/pcsx2/Sif0.cpp b/pcsx2/Sif0.cpp index e114cf2b18..fc3f2c87ca 100644 --- a/pcsx2/Sif0.cpp +++ b/pcsx2/Sif0.cpp @@ -17,8 +17,10 @@ #define _PC_ // disables MIPS opcode macros. -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "Sif.h" +#include "IopHw.h" _sif sif0; diff --git a/pcsx2/Sif1.cpp b/pcsx2/Sif1.cpp index 2e7dcd0270..02e258b241 100644 --- a/pcsx2/Sif1.cpp +++ b/pcsx2/Sif1.cpp @@ -17,8 +17,10 @@ #define _PC_ // disables MIPS opcode macros. -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "Sif.h" +#include "IopHw.h" _sif sif1; diff --git a/pcsx2/Sio.cpp b/pcsx2/Sio.cpp index 70aa0c2ab2..9c948d048e 100644 --- a/pcsx2/Sio.cpp +++ b/pcsx2/Sio.cpp @@ -14,7 +14,9 @@ */ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "R3000A.h" +#include "IopHw.h" +#include "IopDma.h" #include "Common.h" #include "Sio.h" diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index 3519941ac2..ae1e6e4138 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -15,7 +15,7 @@ #include "PrecompiledHeader.h" #include "Common.h" -#include "IopCommon.h" +#include "R3000A.h" #include "VUmicro.h" #include "newVif.h" #include "MTVU.h" @@ -26,6 +26,7 @@ #include "common/MemsetFast.inl" #include "common/Perf.h" +#include "CDVD/CDVD.h" #ifdef PCSX2_CORE #include "GSDumpReplayer.h" diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj index 1566586e18..8033ed647d 100644 --- a/pcsx2/pcsx2.vcxproj +++ b/pcsx2/pcsx2.vcxproj @@ -1001,7 +1001,6 @@ - diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters index 855425bd0e..f9a5d6c7b2 100644 --- a/pcsx2/pcsx2.vcxproj.filters +++ b/pcsx2/pcsx2.vcxproj.filters @@ -1795,9 +1795,6 @@ System\Include - - System\Include - System\Include diff --git a/pcsx2/pcsx2core.vcxproj b/pcsx2/pcsx2core.vcxproj index 89cedf7137..6748a20a5f 100644 --- a/pcsx2/pcsx2core.vcxproj +++ b/pcsx2/pcsx2core.vcxproj @@ -627,7 +627,6 @@ - diff --git a/pcsx2/pcsx2core.vcxproj.filters b/pcsx2/pcsx2core.vcxproj.filters index 9616be04fe..7c1acb600e 100644 --- a/pcsx2/pcsx2core.vcxproj.filters +++ b/pcsx2/pcsx2core.vcxproj.filters @@ -1283,9 +1283,6 @@ System\Include - - System\Include - System\Include diff --git a/pcsx2/ps2/Iop/IopHwRead.cpp b/pcsx2/ps2/Iop/IopHwRead.cpp index 00be2e5b9e..fd2aa297e2 100644 --- a/pcsx2/ps2/Iop/IopHwRead.cpp +++ b/pcsx2/ps2/Iop/IopHwRead.cpp @@ -23,6 +23,9 @@ #include "SPU2/spu2.h" #include "DEV9/DEV9.h" #include "USB/USB.h" +#include "IopCounters.h" +#include "IopSio2.h" +#include "IopDma.h" #include "ps2/pgif.h" #include "Mdec.h" diff --git a/pcsx2/ps2/Iop/IopHwWrite.cpp b/pcsx2/ps2/Iop/IopHwWrite.cpp index 7aaf1569e2..00b7b501d5 100644 --- a/pcsx2/ps2/Iop/IopHwWrite.cpp +++ b/pcsx2/ps2/Iop/IopHwWrite.cpp @@ -22,6 +22,10 @@ #include "SPU2/spu2.h" #include "DEV9/DEV9.h" #include "USB/USB.h" +#include "IopCounters.h" +#include "IopSio2.h" +#include "IopDma.h" +#include "R3000A.h" #include "ps2/pgif.h" #include "Mdec.h" diff --git a/pcsx2/ps2/Iop/IopHw_Internal.h b/pcsx2/ps2/Iop/IopHw_Internal.h index 9ecce06945..c8b5a13176 100644 --- a/pcsx2/ps2/Iop/IopHw_Internal.h +++ b/pcsx2/ps2/Iop/IopHw_Internal.h @@ -15,7 +15,8 @@ #pragma once -#include "IopCommon.h" +#include "Common.h" +#include "IopHw.h" namespace IopMemory { namespace Internal { diff --git a/pcsx2/ps2/Iop/PsxBios.cpp b/pcsx2/ps2/Iop/PsxBios.cpp index 72159a2cbf..b6cac04703 100644 --- a/pcsx2/ps2/Iop/PsxBios.cpp +++ b/pcsx2/ps2/Iop/PsxBios.cpp @@ -14,7 +14,9 @@ */ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "Common.h" +#include "R3000A.h" +#include "IopMem.h" static std::string psxout_buf; diff --git a/pcsx2/ps2/pgif.cpp b/pcsx2/ps2/pgif.cpp index 87185065d1..f7848e0754 100644 --- a/pcsx2/ps2/pgif.cpp +++ b/pcsx2/ps2/pgif.cpp @@ -18,6 +18,9 @@ #include "ps2/Iop/IopHw_Internal.h" #include "ps2/HwInternal.h" #include "ps2/pgif.h" +#include "IopHw.h" +#include "IopDma.h" +#include "Common.h" //NOTES (TODO): /* diff --git a/pcsx2/sif2.cpp b/pcsx2/sif2.cpp index 98091bd728..2d2fd1620c 100644 --- a/pcsx2/sif2.cpp +++ b/pcsx2/sif2.cpp @@ -17,8 +17,10 @@ #define _PC_ // disables MIPS opcode macros. -#include "IopCommon.h" +#include "R3000A.h" +#include "Common.h" #include "Sif.h" +#include "IopHw.h" _sif sif2; diff --git a/pcsx2/sio_internal.h b/pcsx2/sio_internal.h index 5c6b7625fb..ce77c041cc 100644 --- a/pcsx2/sio_internal.h +++ b/pcsx2/sio_internal.h @@ -14,6 +14,7 @@ */ #pragma once +#include "IopSio2.h" // sio_internal.h -- contains defines and structs used by sio and sio2, which // are of little or no use to the rest of the world. diff --git a/pcsx2/windows/VCprojects/IopSif.cpp b/pcsx2/windows/VCprojects/IopSif.cpp index de7f7d9081..2917b091a9 100644 --- a/pcsx2/windows/VCprojects/IopSif.cpp +++ b/pcsx2/windows/VCprojects/IopSif.cpp @@ -14,8 +14,8 @@ */ #include "PrecompiledHeader.h" -#include "IopCommon.h" +#include "Common.h" #include "Sif.h" #if FALSE diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index d0601e309a..f135df846e 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -21,10 +21,14 @@ #include "PrecompiledHeader.h" #include "iR3000A.h" +#include "R3000A.h" #include "BaseblockEx.h" #include "System/RecTypes.h" #include "System/SysThreads.h" #include "R5900OpcodeTables.h" +#include "IopBios.h" +#include "IopHw.h" +#include "Common.h" #include @@ -32,7 +36,6 @@ #include #endif -#include "IopCommon.h" #include "iCore.h" #include "Config.h" diff --git a/pcsx2/x86/iR3000Atables.cpp b/pcsx2/x86/iR3000Atables.cpp index 85115d3043..e03a5246ad 100644 --- a/pcsx2/x86/iR3000Atables.cpp +++ b/pcsx2/x86/iR3000Atables.cpp @@ -17,10 +17,10 @@ #include "PrecompiledHeader.h" #include -#include "IopCommon.h" #include "iR3000A.h" #include "IopMem.h" #include "IopDma.h" +#include "IopGte.h" using namespace x86Emitter; diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index 01fa5bbae6..e64a883b86 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -17,6 +17,7 @@ #include "Common.h" #include "Memory.h" +#include "R3000A.h" #include "R5900Exceptions.h" #include "R5900OpcodeTables.h"