ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trim and tweak a bunch of includes, and a few headers. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2197 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-11-14 12:02:56 +00:00
parent 7c0d91ce86
commit ba37f31849
70 changed files with 220 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/CDVD/CDVD.cpp
View File

@ -14,16 +14,19 @@
*/
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "AppConfig.h"
#include <ctype.h>
#include <wx/datetime.h>
#include "IopCommon.h"
#include "CDVD.h"
#include "CDVD_internal.h"
#include "CDVDisoReader.h"
#include "GS.h" // for gsRegionMode
#include "Elfheader.h"
#include "ps2/BiosTools.h"
#include "AppConfig.h"
static cdvdStruct cdvd;

7
pcsx2/CDVD/CDVDaccess.cpp
View File

@ -15,6 +15,7 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#define ENABLE_TIMESTAMPS
@ -25,13 +26,11 @@
#include <ctype.h>
#include <time.h>
#include <wx/datetime.h>
#include "IopCommon.h"
#include "CDVDisoReader.h"
#include <exception>
#include "IsoFS/IsoFS.h"
#include "IsoFS/IsoFSCDVD.h"
#include <exception>
#include "CDVDisoReader.h"
const wxChar* CDVD_SourceLabels[] =
{

1
pcsx2/CDVD/CDVDisoReader.cpp
View File

@ -21,6 +21,7 @@
*/
#include "PrecompiledHeader.h"
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>

4
pcsx2/CDVD/CdRom.cpp
View File

@ -15,9 +15,11 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "CdRom.h"
#include "CDVD.h"
//THIS ALL IS FOR THE CDROM REGISTERS HANDLING
#define CdlSync 0

18
pcsx2/CDVD/IsoFS/IsoFS.cpp
View File

@ -1,5 +1,21 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 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 <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "IsoFS.h"
#include "IsoFile.h"

17
pcsx2/CDVD/IsoFS/IsoFSCDVD.cpp
View File

@ -1,4 +1,21 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 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 <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "IsoFSCDVD.h"
#include "../CDVDaccess.h"

18
pcsx2/CDVD/IsoFS/IsoFile.cpp
View File

@ -1,4 +1,20 @@
#include "PrecompiledHeader.h"
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 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 <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "IsoFS.h"
#include "IsoFile.h"

5
pcsx2/CDVD/IsoFileFormats.cpp
View File

@ -16,14 +16,13 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
//#include "IsoFStools.h"
//#include "IsoFSdrv.h"
#include "IsoFileFormats.h"
#include <stdio.h>
#include <fcntl.h>
#include <errno.h>
#include "IsoFileFormats.h"
int detect(isoFile *iso)
{
u8 buf[2448];

5
pcsx2/COP0.cpp
View File

@ -15,10 +15,7 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "R5900.h"
#include "R5900OpcodeTables.h"
u32 s_iLastCOP0Cycle = 0;
u32 s_iLastPERFCycle[2] = { 0, 0 };
@ -557,4 +554,4 @@ void EI() {
}
}
} } } } // end namespace R5900::Interpreter::OpcodeImpl
} } } } // end namespace R5900::Interpreter::OpcodeImpl

5
pcsx2/COP2.cpp
View File

@ -15,12 +15,9 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "DebugTools/Debug.h"
#include "R5900.h"
#include "R5900OpcodeTables.h"
#include "VUops.h"
#include "VUmicro.h"
using namespace R5900;

3
pcsx2/Cache.cpp
View File

@ -15,7 +15,6 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Cache.h"
@ -396,4 +395,4 @@ void CACHE() {
#endif
}}
}}

20
pcsx2/Common.h
View File

@ -17,23 +17,17 @@
#include "Pcsx2Defs.h"
#define BIAS 2 // Bus is half of the actual ps2 speed
//#define PS2CLK 36864000 /* 294.912 mhz */
//#define PSXCLK 9216000 /* 36.864 Mhz */
//#define PSXCLK 186864000 /* 36.864 Mhz */
#define PS2CLK 294912000 //hz /* 294.912 mhz */
#include "System.h"
#include "Plugins.h"
#include "SaveState.h"
#include "DebugTools/Debug.h"
#include "Memory.h"
#include "Hw.h"
#include "R5900.h"
#include "Elfheader.h"
#include "SaveState.h"
#include "DebugTools/Debug.h"
static const u32 BIAS = 2; // Bus is half of the actual ps2 speed
static const u32 PS2CLK = 294912000; //hz /* 294.912 mhz */
//#define PS2CLK 36864000 /* 294.912 mhz */
static const ConsoleColors ConColor_IOP = Color_Yellow;
static const ConsoleColors ConColor_EE = Color_Cyan;

4
pcsx2/Counters.cpp
View File

@ -15,13 +15,13 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include <time.h>
#include <cmath>
#include "Common.h"
#include "Counters.h"
#include "R3000A.h"
#include "Counters.h"
#include "IopCounters.h"
#include "GS.h"

1
pcsx2/Dump.cpp
View File

@ -15,6 +15,7 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "Counters.h"
#include "iCore.h"
#include "iR5900.h"

4
pcsx2/Elfheader.cpp
View File

@ -14,10 +14,8 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
//#include "CDVD/IsoFSdrv.h"
#include "DebugTools/Debug.h"
#include "GS.h" // for sending game crc to mtgs
#include "CDVD/IsoFS/IsoFSCDVD.h"

4
pcsx2/FPU.cpp
View File

@ -14,11 +14,9 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include <cmath>
#include "Common.h"
#include "R5900.h"
#include "R5900OpcodeTables.h"
// Helper Macros
//****************************************************************

1
pcsx2/FiFo.cpp
View File

@ -19,7 +19,6 @@
#include "GS.h"
#include "Vif.h"
#include "VifDma.h"
#include "IPU/IPU.h"
//////////////////////////////////////////////////////////////////////////

4
pcsx2/GS.cpp
View File

@ -14,15 +14,13 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include <list>
#include "Common.h"
#include "GS.h"
#include "Gif.h"
#include "iR5900.h"
#include "Counters.h"
#include "VifDma.h"
using namespace Threading;
using namespace R5900;

3
pcsx2/GSState.cpp
View File

@ -15,9 +15,10 @@
#include "PrecompiledHeader.h"
#include "GS.h"
#include <list>
#include "GS.h"
#ifdef PCSX2_DEVBUILD
// GS Playback

6
pcsx2/Gif.cpp
View File

@ -14,16 +14,14 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include "VU.h"
#include "Tags.h"
#include "GS.h"
#include "Gif.h"
#include "VifDma.h"
#include "iR5900.h"
#include "Counters.h"
#include "Tags.h"
using std::min;

25
pcsx2/Hardware.h Normal file
View File

@ -0,0 +1,25 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 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 <http://www.gnu.org/licenses/>.
*/
// The full suite of hardware APIs:
#include "Counters.h"
#include "GS.h"
#include "Hw.h"
#include "IPU/IPU.h"
#include "SPR.h"
#include "Gif.h"
#include "Sif.h"
#include "Vif.h"
#include "VifDma.h"

15
pcsx2/Hw.cpp
View File

@ -15,22 +15,11 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "iR5900.h"
#include "VUmicro.h"
#include "IopMem.h"
// The full suite of hardware APIs:
#include "IPU/IPU.h"
#include "GS.h"
#include "Counters.h"
#include "Vif.h"
#include "VifDma.h"
#include "SPR.h"
#include "Sif.h"
#include "Tags.h"
#include "Hardware.h"
using namespace R5900;
u8 *psH; // hw mem

13
pcsx2/HwRead.cpp
View File

@ -15,20 +15,9 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "iR5900.h"
#include "VUmicro.h"
#include "IopMem.h"
// The full suite of hardware APIs:
#include "IPU/IPU.h"
#include "GS.h"
#include "Counters.h"
#include "Vif.h"
#include "VifDma.h"
#include "SPR.h"
#include "Sif.h"
#include "Hardware.h"
using namespace R5900;

14
pcsx2/HwWrite.cpp
View File

@ -15,21 +15,9 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "iR5900.h"
#include "VUmicro.h"
#include "IopMem.h"
// The full suite of hardware APIs:
#include "IPU/IPU.h"
#include "GS.h"
#include "Gif.h"
#include "Counters.h"
#include "Vif.h"
#include "VifDma.h"
#include "SPR.h"
#include "Sif.h"
#include "Hardware.h"
using namespace R5900;

4
pcsx2/IPU/IPU.cpp
View File

@ -14,14 +14,12 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "IPU.h"
#include "yuv2rgb.h"
#include "Vif.h"
#include "Tags.h"
// Zero cycle IRQ schedules aren't really good, but the IPU uses them.
// Better to throw the IRQ inline:

3
pcsx2/Interpreter.cpp
View File

@ -15,9 +15,8 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "R5900.h"
#include "R5900OpcodeTables.h"
#include "System/SysThreads.h"

4
pcsx2/IopBios.cpp
View File

@ -15,9 +15,9 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include <ctype.h>
#include "IopCommon.h"
namespace R3000A {
@ -331,4 +331,4 @@ void psxBiosShutdown()
{
}
} // end namespace R3000A
} // end namespace R3000A

12
pcsx2/IopCommon.h
View File

@ -15,16 +15,11 @@
#pragma once
static const s64 PSXCLK = 36864000; /* 36.864 Mhz */
#include "R3000A.h"
#include "Common.h"
#include "CDVD/CdRom.h"
#include "CDVD/CDVD.h"
#include "Sio.h"
#include "Sif.h"
#include "CDVD/CdRom.h"
#include "IopDma.h"
#include "IopMem.h"
@ -32,3 +27,8 @@ static const s64 PSXCLK = 36864000; /* 36.864 Mhz */
#include "IopBios.h"
#include "IopCounters.h"
#include "IopSio2.h"
static const s64 PSXCLK = 36864000; /* 36.864 Mhz */
//#define PSXCLK 9216000 /* 36.864 Mhz */
//#define PSXCLK 186864000 /* 36.864 Mhz */

2
pcsx2/IopCounters.cpp
View File

@ -19,9 +19,9 @@
// The EventText function will pick it up.
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include <math.h>
#include "IopCommon.h"
/* Config.PsxType == 1: PAL:
VBlank interlaced 50.00 Hz

2
pcsx2/IopDma.cpp
View File

@ -16,6 +16,8 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "Sif.h"
using namespace R3000A;
// Dma0/1 in Mdec.c

3
pcsx2/IopHw.cpp
View File

@ -15,9 +15,10 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "iR5900.h"
#include "Sio.h"
// NOTE: Any modifications to read/write fns should also go into their const counterparts
// found in iPsxHw.cpp.

2
pcsx2/IopSio2.cpp
View File

@ -16,6 +16,8 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "Sio.h"
#include "sio_internal.h"
sio2Struct sio2;

1
pcsx2/Linux/pcsx2.cbp
View File

@ -166,6 +166,7 @@
<Unit filename="../GSState.cpp" />
<Unit filename="../Gif.cpp" />
<Unit filename="../Gif.h" />
<Unit filename="../Hardware.h" />
<Unit filename="../HostGui.h" />
<Unit filename="../Hw.cpp" />
<Unit filename="../Hw.h" />

6
pcsx2/MMI.cpp
View File

@ -15,11 +15,7 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "DebugTools/Debug.h"
#include "R5900.h"
#include "R5900OpcodeTables.h"
namespace R5900 {
namespace Interpreter {
@ -1627,4 +1623,4 @@ void PEXCW() {
// obs:
// QFSRV not verified
}}} } // end namespace R5900::Interpreter::OpcodeImpl::MMI
}}} } // end namespace R5900::Interpreter::OpcodeImpl::MMI

12
pcsx2/MTGS.cpp
View File

@ -15,17 +15,15 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "GS.h"
#include "VU.h"
#include "iR5900.h"
#include "VifDma.h"
#include "SamplProf.h"
#include <list>
#include <wx/datetime.h>
#include "GS.h"
#include "Elfheader.h"
#include "SamplProf.h"
// Uncomment this to enable profiling of the GS RingBufferCopy function.
//#define PCSX2_GSRING_SAMPLING_STATS

8
pcsx2/Memory.cpp
View File

@ -35,21 +35,17 @@ BIOS
*/
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#pragma warning(disable:4799) // No EMMS at end of function
#include <vector>
#include <wx/file.h>
#include "IopCommon.h"
#include "iR5900.h"
#include "ps2/BiosTools.h"
#include "VUmicro.h"
#include "GS.h"
#include "IPU/IPU.h"
#include "System/PageFaultSource.h"
#include "ps2/BiosTools.h"
#ifdef ENABLECACHE
#include "Cache.h"

5
pcsx2/Pcsx2Config.cpp
View File

@ -14,12 +14,13 @@
*/
#include "PrecompiledHeader.h"
#include <wx/fileconf.h>
#include "IniInterface.h"
#include "Config.h"
#include "GS.h"
#include <wx/fileconf.h>
void TraceLogFilters::LoadSave( IniInterface& ini )
{
TraceLogFilters defaults;

5
pcsx2/PluginManager.cpp
View File

@ -14,16 +14,17 @@
*/
#include "PrecompiledHeader.h"
#include "Utilities/ScopedPtr.h"
#include "IopCommon.h"
#include <wx/dir.h>
#include <wx/file.h>
#include "IopCommon.h"
#include "GS.h"
#include "HostGui.h"
#include "CDVD/CDVDisoReader.h"
#include "Utilities/ScopedPtr.h"
#if _MSC_VER
# include "svnrev.h"
#endif

5
pcsx2/R3000A.cpp
View File

@ -15,9 +15,10 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "R5900.h"
#include "Sio.h"
#include "Sif.h"
using namespace R3000A;

2
pcsx2/R3000AInterpreter.cpp
View File

@ -14,9 +14,7 @@
*/
#include "PrecompiledHeader.h"
#include "IopCommon.h"
using namespace R3000A;

2
pcsx2/R3000AOpcodeTables.cpp
View File

@ -13,8 +13,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "PrecompiledHeader.h"
#include "IopCommon.h"
extern void zeroEx();

20
pcsx2/R5900.cpp
View File

@ -15,29 +15,18 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Counters.h"
#include "Memory.h"
#include "Hw.h"
#include "DebugTools/Debug.h"
#include "R5900.h"
#include "R3000A.h"
#include "VUmicro.h"
#include "COP0.h"
#include "GS.h"
#include "Gif.h"
#include "IPU/IPU.h"
#include "Vif.h"
#include "VifDma.h"
#include "SPR.h"
#include "Sif.h"
#include "System/SysThreads.h"
#include "R5900Exceptions.h"
#include "Hardware.h"
using namespace R5900; // for R5900 disasm tools
s32 EEsCycle; // used to sync the IOP to the EE
@ -95,9 +84,10 @@ void cpuReset()
__releaseinline void cpuException(u32 code, u32 bd)
{
cpuRegs.branch = 0; // Tells the interpreter that an exception occurred during a branch.
bool errLevel2, checkStatus;
u32 offset;
cpuRegs.branch = 0; // Tells the interpreter that an exception occurred during a branch.
cpuRegs.CP0.n.Cause = code & 0xffff;
if(cpuRegs.CP0.n.Status.b.ERL == 0)

5
pcsx2/R5900OpcodeImpl.cpp
View File

@ -15,13 +15,14 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include <float.h>
#include "R5900.h"
#include "R5900OpcodeTables.h"
#include "R5900Exceptions.h"
#include <float.h>
static __forceinline s64 _add64_Overflow( s64 x, s64 y )
{

3
pcsx2/R5900OpcodeTables.cpp
View File

@ -17,6 +17,7 @@
//all tables for R5900 are define here..
#include "PrecompiledHeader.h"
#include "R5900OpcodeTables.h"
#include "R5900.h"
@ -688,4 +689,4 @@ void (*Int_COP2SPECIAL2PrintTable[128])() =
COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,
COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,
COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,COP2_Unknown,
};
};

6
pcsx2/RecoverySystem.cpp
View File

@ -15,11 +15,11 @@
#include "PrecompiledHeader.h"
#include "zlib/zlib.h"
#include "App.h"
#include "HostGui.h"
#include "zlib/zlib.h"
class _BaseStateThread;
static SafeArray<u8> state_buffer;
@ -438,4 +438,4 @@ void StateCopy_Clear()
bool StateCopy_IsBusy()
{
return state_buffer_lock.IsLocked();
}
}

7
pcsx2/SPR.cpp
View File

@ -14,13 +14,12 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include "SPR.h"
#include "iR5900.h"
#include "VUmicro.h"
#include "Tags.h"
#include "SPR.h"
#include "VUmicro.h"
extern void mfifoGIFtransfer(int);
static bool spr0finished = false;

11
pcsx2/SaveState.cpp
View File

@ -15,23 +15,16 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "SaveState.h"
//#include "CDVD/IsoFSdrv.h"
#include "ps2/BiosTools.h"
#include "VUmicro.h"
#include "VU.h"
#include "iCore.h"
#include "sVU_zerorec.h"
#include "GS.h"
#include "COP0.h"
#include "Cache.h"
#include "AppConfig.h"
#include "Elfheader.h"
using namespace R5900;
static void PreLoadPrep()

4
pcsx2/Sif.cpp
View File

@ -18,9 +18,11 @@
#define _PC_ // disables MIPS opcode macros.
#include "IopCommon.h"
#include "Sifcmd.h"
#include "Tags.h"
#include "Sif.h"
#include "Sifcmd.h"
DMACh *sif0ch;
DMACh *sif1ch;
DMACh *sif2ch;

3
pcsx2/Sio.cpp
View File

@ -14,8 +14,9 @@
*/
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "Sio.h"
#include "sio_internal.h"
_sio sio;

13
pcsx2/System.cpp
View File

@ -14,21 +14,14 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include "HostGui.h"
#include "Common.h"
#include "VUmicro.h"
#include "iR5900.h"
#include "R3000A.h"
#include "IopMem.h"
#include "sVU_zerorec.h" // for SuperVUReset
#include "sVU_zerorec.h" // for SuperVUDestroy
#include "R5900Exceptions.h"
#include "CDVD/CDVD.h"
#include "System/PageFaultSource.h"
#include "Utilities/EventSource.inl"
EventSource_ImplementType( PageFaultInfo );
SrcType_PageFault Source_PageFault;

6
pcsx2/System/SysCoreThread.cpp
View File

@ -16,13 +16,11 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "System.h"
#include "GS.h"
#include "Elfheader.h"
#include "PageFaultSource.h"
#include "SysThreads.h"
#include "SaveState.h"
#include "VUmicro.h"
#include "GS.h"
#ifdef __WXMSW__
# include <wx/msw/wrapwin.h>

7
pcsx2/VU0.cpp
View File

@ -23,14 +23,11 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include <cmath>
#include "Common.h"
#include "DebugTools/Debug.h"
#include "R5900.h"
#include "R5900OpcodeTables.h"
#include "VUops.h"
#include "VUmicro.h"
#define _Ft_ _Rt_
@ -45,8 +42,6 @@
#define _Fsf_ ((cpuRegs.code >> 21) & 0x03)
#define _Ftf_ ((cpuRegs.code >> 23) & 0x03)
#include "VUflags.h"
using namespace R5900;
__aligned16 VURegs VU0;

9
pcsx2/VU0micro.cpp
View File

@ -19,18 +19,11 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include <cmath>
#include "Common.h"
#include "DebugTools/Debug.h"
#include "R5900.h"
#include "iR5900.h"
#include "VUmicro.h"
#include "VUflags.h"
#include "VUops.h"
#include "sVU_zerorec.h"
using namespace R5900;

3
pcsx2/VU0microInterp.cpp
View File

@ -15,9 +15,8 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "DebugTools/Debug.h"
#include "VUmicro.h"
extern void _vuFlushAll(VURegs* VU);

6
pcsx2/VU1micro.cpp
View File

@ -18,15 +18,11 @@
// of the VU0 micro.
#include "PrecompiledHeader.h"
#include "Common.h"
#include <cmath>
#include "Common.h"
#include "VU.h"
#include "VUops.h"
#include "VUmicro.h"
#include "sVU_Micro.h"
#include "sVU_zerorec.h"
VURegs* g_pVU1;

3
pcsx2/VU1microInterp.cpp
View File

@ -15,9 +15,8 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "DebugTools/Debug.h"
#include "VUmicro.h"
extern void _vuFlushAll(VURegs* VU);

3
pcsx2/VUflags.cpp
View File

@ -14,12 +14,13 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include <cmath>
#include <float.h>
#include "Common.h"
#include "VUmicro.h"
/*****************************************/
/* NEW FLAGS */ //By asadr. Thnkx F|RES :p
/*****************************************/

6
pcsx2/VUmicroMem.cpp
View File

@ -15,11 +15,9 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "R5900.h"
#include "VUmicro.h"
#include "sVU_zerorec.h"
#include "sVU_zerorec.h" // SuperVUReset
// The following CpuVU objects are value types instead of handles or pointers because they are
// modified on the fly to implement VU1 Skip.

4
pcsx2/VUops.cpp
View File

@ -14,12 +14,10 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include <cmath>
#include "Common.h"
#include "VUmicro.h"
#include "VUflags.h"
#include "VUops.h"
#include "GS.h"

7
pcsx2/Vif.cpp
View File

@ -13,15 +13,16 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include <cmath>
#include <assert.h>
#include "Common.h"
#include "VUmicro.h"
#include "Vif.h"
#include "VifDma.h"
#include "Tags.h"
VIFregisters *vifRegs;
u32* vifRow = NULL;

7
pcsx2/Vif0Dma.cpp
View File

@ -13,13 +13,15 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "VifDma.h"
#include "VifDma_internal.h"
#include "VUmicro.h"
#include "Tags.h"
__aligned16 u32 g_vif0Masks[64];
u32 g_vif0HasMask3[4] = {0};
@ -29,6 +31,7 @@ extern void (*Vif0CMDTLB[75])();
vifStruct vif0;
u32 *vif0ptag;
__forceinline void vif0FLUSH()
{
int _cycles = VU0.cycle;

10
pcsx2/Vif1Dma.cpp
View File

@ -13,15 +13,17 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "PrecompiledHeader.h"
#include "PrecompiledHeader.h"
#include "Common.h"
#include "GS.h"
#include "Gif.h"
#include "Tags.h"
#include "VifDma.h"
#include "VifDma_internal.h"
#include "GS.h"
#include "Gif.h"
#include "VUmicro.h"
#include "Tags.h"
__aligned16 u32 g_vif1Masks[64];
u32 g_vif1HasMask3[4] = {0};

4
pcsx2/VifDma.cpp
View File

@ -14,12 +14,12 @@
*/
#include "PrecompiledHeader.h"
#include "Common.h"
#include "Tags.h"
#include "VifDma.h"
#include "VifDma_internal.h"
#include "VUmicro.h"
#include "Tags.h"
#include <xmmintrin.h>
#include <emmintrin.h>

1
pcsx2/gui/MainMenuClicks.cpp
View File

@ -15,6 +15,7 @@
#include "PrecompiledHeader.h"
#include "HostGui.h"
#include "CDVD/CDVD.h"
#include "GS.h"

1
pcsx2/gui/Saveslots.cpp
View File

@ -20,6 +20,7 @@
#include "HostGui.h"
#include "GS.h"
#include "Elfheader.h"
StartupParams g_Startup;

3
pcsx2/ps2/BiosTools.cpp
View File

@ -14,12 +14,13 @@
*/
#include "PrecompiledHeader.h"
#include "AppConfig.h"
#include "Common.h"
#include "BiosTools.h"
#include "wx/file.h"
#include "AppConfig.h"
#define DIRENTRY_SIZE 16
//////////////////////////////////////////////////////////////////////////////////////////

3
pcsx2/ps2/Iop/IopHwRead.cpp
View File

@ -17,6 +17,9 @@
#include "PrecompiledHeader.h"
#include "IopHw_Internal.h"
#include "Sio.h"
#include "CDVD/CdRom.h"
namespace IopMemory
{
using namespace Internal;

3
pcsx2/ps2/Iop/IopHwWrite.cpp
View File

@ -16,6 +16,9 @@
#include "PrecompiledHeader.h"
#include "IopHw_Internal.h"
#include "Sio.h"
#include "CDVD/CdRom.h"
namespace IopMemory {
using namespace Internal;

1
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -598,6 +598,7 @@
<ClInclude Include="..\..\HashMap.h" />
<ClInclude Include="..\..\HostGui.h" />
<ClInclude Include="..\..\Hw.h" />
<ClInclude Include="..\..\Hardware.h" />
<ClInclude Include="..\..\IopBios.h" />
<ClInclude Include="..\..\IopBios2.h" />
<ClInclude Include="..\..\IopCommon.h" />

4
pcsx2/windows/VCprojects/pcsx2_2008.vcproj
View File

@ -564,6 +564,10 @@
RelativePath="..\..\Hw.h"
>
</File>
<File
RelativePath="..\..\Hardware.h"
>
</File>
<File
RelativePath="..\..\HwRead.cpp"
>