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

pcsx2: 

- Cleanup and organizational changes of VU related stuff.
- Separated Super VU, microVU, and Interpreter files.
- Renamed all Super VU related files with an 'sVU' prefix.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1356 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
cottonvibes 2009-06-11 09:02:10 +00:00
parent bd229032c0
commit f8a94b15ff
24 changed files with 11972 additions and 11988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Docs/ChangeLog.txt
View File

@ -221,7 +221,7 @@ v0.9.1:
* 05/08/05:[+] Added faster Cd/DVD reads to the Advanced options (Refraction) * 05/08/05:[+] Added faster Cd/DVD reads to the Advanced options (Refraction)
[-] The previous DVD/CD change by ref was just a hack, so i commited the old [-] The previous DVD/CD change by ref was just a hack, so i commited the old
version again version again
[-] I've commented out RECOMPILE_VUMI_LOADSTORE on iVUmicro.h, instead [-] I've commented out RECOMPILE_VUMI_LOADSTORE on sVU_Micro.h, instead
of commenting it out in iVU1micro.c as ref did on last update, of commenting it out in iVU1micro.c as ref did on last update,
that way is better until i fix the real problem that way is better until i fix the real problem
[*] Improved vuDIV for .x to .x cases [*] Improved vuDIV for .x to .x cases

2
pcsx2/Misc.cpp
View File

@ -33,7 +33,7 @@
#include "VUmicro.h" #include "VUmicro.h"
#include "VU.h" #include "VU.h"
#include "iCore.h" #include "iCore.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
#include "BaseblockEx.h" // included for devbuild block dumping (which may or may not work anymore?) #include "BaseblockEx.h" // included for devbuild block dumping (which may or may not work anymore?)
#include "GS.h" #include "GS.h"

2
pcsx2/SaveState.cpp
View File

@ -25,7 +25,7 @@
#include "VUmicro.h" #include "VUmicro.h"
#include "VU.h" #include "VU.h"
#include "iCore.h" #include "iCore.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
#include "GS.h" #include "GS.h"
#include "COP0.h" #include "COP0.h"

2
pcsx2/System.cpp
View File

@ -25,7 +25,7 @@
#include "iR5900.h" #include "iR5900.h"
#include "R3000A.h" #include "R3000A.h"
#include "IopMem.h" #include "IopMem.h"
#include "iVUzerorec.h" // for SuperVUReset #include "sVU_zerorec.h" // for SuperVUReset
#include "R5900Exceptions.h" #include "R5900Exceptions.h"

2
pcsx2/VU0micro.cpp
View File

@ -32,7 +32,7 @@
#include "VUflags.h" #include "VUflags.h"
#include "VUops.h" #include "VUops.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
using namespace R5900; using namespace R5900;

4
pcsx2/VU1micro.cpp
View File

@ -27,8 +27,8 @@
#include "VU.h" #include "VU.h"
#include "VUops.h" #include "VUops.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "iVUmicro.h" #include "sVU_Micro.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
VURegs* g_pVU1; VURegs* g_pVU1;

8
pcsx2/VUflags.h
View File

@ -16,9 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __VUFLAGS_H__ #pragma once
#define __VUFLAGS_H__
#include "VU.h" #include "VU.h"
void vuUpdateDI(VURegs * VU); void vuUpdateDI(VURegs * VU);
@ -33,7 +31,3 @@ __forceinline void VU_MACz_CLEAR(VURegs * VU);
__forceinline void VU_MACw_CLEAR(VURegs * VU); __forceinline void VU_MACw_CLEAR(VURegs * VU);
void VU_STAT_UPDATE(VURegs * VU); void VU_STAT_UPDATE(VURegs * VU);
#endif

7
pcsx2/VUmicro.h
View File

@ -16,9 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __VUMICRO_H__ #pragma once
#define __VUMICRO_H__
#include "VU.h" #include "VU.h"
struct VUmicroCpu struct VUmicroCpu
@ -1315,6 +1313,3 @@ void (*PREFIX##_LOWER_OPCODE[128])(_VURegsNum *VUregsn) = { \
#endif #endif
#include "VUops.h" #include "VUops.h"
#endif

5
pcsx2/VUmicroMem.cpp
View File

@ -18,13 +18,10 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include <cmath>
#include "Common.h" #include "Common.h"
#include "R5900.h" #include "R5900.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "sVU_zerorec.h"
#include "iVUzerorec.h"
// The following CpuVU objects are value types instead of handles or pointers because they are // The following CpuVU objects are value types instead of handles or pointers because they are
// modified on the fly to implement VU1 Skip. // modified on the fly to implement VU1 Skip.

6
pcsx2/VUops.h
View File

@ -16,9 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __VU1OPS_H__ #pragma once
#define __VU1OPS_H__
#include "VU.h" #include "VU.h"
extern __forceinline u32 VU_MAC_UPDATE( int shift, VURegs * VU, float f); extern __forceinline u32 VU_MAC_UPDATE( int shift, VURegs * VU, float f);
@ -395,5 +393,3 @@ void _vuRegsEEXP(VURegs * VU, _VURegsNum *VUregsn);
void _vuRegsXITOP(VURegs * VU, _VURegsNum *VUregsn); void _vuRegsXITOP(VURegs * VU, _VURegsNum *VUregsn);
void _vuRegsXGKICK(VURegs * VU, _VURegsNum *VUregsn); void _vuRegsXGKICK(VURegs * VU, _VURegsNum *VUregsn);
void _vuRegsXTOP(VURegs * VU, _VURegsNum *VUregsn); void _vuRegsXTOP(VURegs * VU, _VURegsNum *VUregsn);
#endif

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

@ -2025,26 +2025,10 @@
RelativePath="..\..\VU0micro.cpp" RelativePath="..\..\VU0micro.cpp"
> >
</File> </File>
<File
RelativePath="..\..\VU0microInterp.cpp"
>
</File>
<File <File
RelativePath="..\..\VU1micro.cpp" RelativePath="..\..\VU1micro.cpp"
> >
</File> </File>
<File
RelativePath="..\..\VU1microInterp.cpp"
>
</File>
<File
RelativePath="..\..\VUflags.cpp"
>
</File>
<File
RelativePath="..\..\VUflags.h"
>
</File>
<File <File
RelativePath="..\..\VUmicro.h" RelativePath="..\..\VUmicro.h"
> >
@ -2053,14 +2037,6 @@
RelativePath="..\..\VUmicroMem.cpp" RelativePath="..\..\VUmicroMem.cpp"
> >
</File> </File>
<File
RelativePath="..\..\VUops.cpp"
>
</File>
<File
RelativePath="..\..\VUops.h"
>
</File>
<Filter <Filter
Name="Dynarec" Name="Dynarec"
> >
@ -2072,34 +2048,6 @@
RelativePath="..\..\x86\iVU1micro.cpp" RelativePath="..\..\x86\iVU1micro.cpp"
> >
</File> </File>
<File
RelativePath="..\..\x86\iVUmicro.cpp"
>
</File>
<File
RelativePath="..\..\x86\iVUmicro.h"
>
</File>
<File
RelativePath="..\..\x86\iVUmicroLower.cpp"
>
</File>
<File
RelativePath="..\..\x86\iVUmicroUpper.cpp"
>
</File>
<File
RelativePath="..\..\x86\iVUops.h"
>
</File>
<File
RelativePath="..\..\x86\iVUzerorec.cpp"
>
</File>
<File
RelativePath="..\..\x86\iVUzerorec.h"
>
</File>
<Filter <Filter
Name="microVU" Name="microVU"
> >
@ -2160,6 +2108,66 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Super VU"
>
<File
RelativePath="..\..\x86\sVU_Debug.h"
>
</File>
<File
RelativePath="..\..\x86\sVU_Lower.cpp"
>
</File>
<File
RelativePath="..\..\x86\sVU_Micro.cpp"
>
</File>
<File
RelativePath="..\..\x86\sVU_Micro.h"
>
</File>
<File
RelativePath="..\..\x86\sVU_Upper.cpp"
>
</File>
<File
RelativePath="..\..\x86\sVU_zerorec.cpp"
>
</File>
<File
RelativePath="..\..\x86\sVU_zerorec.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="Interpreter"
>
<File
RelativePath="..\..\VU0microInterp.cpp"
>
</File>
<File
RelativePath="..\..\VU1microInterp.cpp"
>
</File>
<File
RelativePath="..\..\VUflags.cpp"
>
</File>
<File
RelativePath="..\..\VUflags.h"
>
</File>
<File
RelativePath="..\..\VUops.cpp"
>
</File>
<File
RelativePath="..\..\VUops.h"
>
</File>
</Filter> </Filter>
</Filter> </Filter>
<Filter <Filter

2
pcsx2/x86/iCOP2.cpp
View File

@ -27,7 +27,7 @@
#include "R5900.h" #include "R5900.h"
#include "R5900OpcodeTables.h" #include "R5900OpcodeTables.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "iVUmicro.h" #include "sVU_Micro.h"
extern void _vu0WaitMicro(); extern void _vu0WaitMicro();

2
pcsx2/x86/iCore.h
View File

@ -20,7 +20,7 @@
#define _PCSX2_CORE_RECOMPILER_ #define _PCSX2_CORE_RECOMPILER_
#include "ix86/ix86.h" #include "ix86/ix86.h"
#include "iVUmicro.h" #include "sVU_Micro.h"
// Namespace Note : iCore32 contains all of the Register Allocation logic, in addition to a handful // Namespace Note : iCore32 contains all of the Register Allocation logic, in addition to a handful
// of utility functions for emitting frequent code. // of utility functions for emitting frequent code.

2
pcsx2/x86/iVU0micro.cpp
View File

@ -21,7 +21,7 @@
#include "Common.h" #include "Common.h"
#include "iR5900.h" #include "iR5900.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
#define useMVU0 CHECK_MICROVU0 #define useMVU0 CHECK_MICROVU0

5
pcsx2/x86/iVU1micro.cpp
View File

@ -18,13 +18,10 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include <float.h>
#include "Common.h" #include "Common.h"
#include "R5900OpcodeTables.h"
#include "iR5900.h" #include "iR5900.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
#define useMVU1 CHECK_MICROVU1 #define useMVU1 CHECK_MICROVU1

4
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -36,11 +36,11 @@
#include "iMMI.h" #include "iMMI.h"
#include "iFPU.h" #include "iFPU.h"
#include "iCOP0.h" #include "iCOP0.h"
#include "iVUmicro.h" #include "sVU_Micro.h"
#include "VU.h" #include "VU.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
#include "vtlb.h" #include "vtlb.h"
#include "SamplProf.h" #include "SamplProf.h"

4
pcsx2/x86/ix86-32/iR5900Templates.cpp
View File

@ -26,11 +26,11 @@
#include "iMMI.h" #include "iMMI.h"
#include "iFPU.h" #include "iFPU.h"
#include "iCOP0.h" #include "iCOP0.h"
#include "iVUmicro.h" #include "sVU_Micro.h"
#include "VU.h" #include "VU.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
#include "vtlb.h" #include "vtlb.h"

2
pcsx2/x86/iVUops.h → pcsx2/x86/sVU_Debug.h
View File

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once
#define REC_VUOP(VU, f) { \ #define REC_VUOP(VU, f) { \
_freeXMMregs(/*&VU*/); \ _freeXMMregs(/*&VU*/); \
_freeMMXregs(); \ _freeMMXregs(); \

6
pcsx2/x86/iVUmicroLower.cpp → pcsx2/x86/sVU_Lower.cpp
View File

@ -27,9 +27,9 @@
#include "iCOP0.h" #include "iCOP0.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "VUflags.h" #include "VUflags.h"
#include "iVUmicro.h" #include "sVU_Micro.h"
#include "iVUops.h" #include "sVU_Debug.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
//------------------------------------------------------------------ //------------------------------------------------------------------
//------------------------------------------------------------------ //------------------------------------------------------------------

6
pcsx2/x86/iVUmicro.cpp → pcsx2/x86/sVU_Micro.cpp
View File

@ -27,9 +27,9 @@
#include "iCOP0.h" #include "iCOP0.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "VUflags.h" #include "VUflags.h"
#include "iVUmicro.h" #include "sVU_Micro.h"
#include "iVUops.h" #include "sVU_Debug.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
#ifdef _WIN32 #ifdef _WIN32
#pragma warning(disable:4244) #pragma warning(disable:4244)

4
pcsx2/x86/iVUmicro.h → pcsx2/x86/sVU_Micro.h
View File

@ -16,8 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __IVUMICRO_H__ #pragma once
#define __IVUMICRO_H__
#include "VUmicro.h" #include "VUmicro.h"
@ -285,4 +284,3 @@ void recVUMI_XTOP(VURegs *vuRegs, int info);
void recVUMI_XITOP(VURegs *vuRegs, int info); void recVUMI_XITOP(VURegs *vuRegs, int info);
void recVUMI_XTOP( VURegs *VU , int info); void recVUMI_XTOP( VURegs *VU , int info);
#endif /* __IVUMICRO_H__ */

6
pcsx2/x86/iVUmicroUpper.cpp → pcsx2/x86/sVU_Upper.cpp
View File

@ -27,9 +27,9 @@
#include "iCOP0.h" #include "iCOP0.h"
#include "VUmicro.h" #include "VUmicro.h"
#include "VUflags.h" #include "VUflags.h"
#include "iVUmicro.h" #include "sVU_Micro.h"
#include "iVUops.h" #include "sVU_Debug.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
//------------------------------------------------------------------ //------------------------------------------------------------------
#define MINMAXFIX 1 #define MINMAXFIX 1
//------------------------------------------------------------------ //------------------------------------------------------------------

2
pcsx2/x86/iVUzerorec.cpp → pcsx2/x86/sVU_zerorec.cpp
View File

@ -37,7 +37,7 @@
#include "VU.h" #include "VU.h"
#include "iR5900.h" #include "iR5900.h"
#include "iVUzerorec.h" #include "sVU_zerorec.h"
#include "SamplProf.h" #include "SamplProf.h"
#include "NakedAsm.h" #include "NakedAsm.h"

11
pcsx2/x86/iVUzerorec.h → pcsx2/x86/sVU_zerorec.h
View File

@ -18,14 +18,13 @@
// Super VU recompiler - author: zerofrog(@gmail.com) // Super VU recompiler - author: zerofrog(@gmail.com)
#ifndef VU1_SUPER_RECOMPILER #pragma once
#define VU1_SUPER_RECOMPILER
#include "iVUmicro.h" #include "sVU_Micro.h"
extern void SuperVUAlloc(int vuindex); // global VU resources are automatically allocated if necessary. extern void SuperVUAlloc(int vuindex); // global VU resources are automatically allocated if necessary.
extern void SuperVUDestroy(int vuindex); // if vuindex is -1, destroys everything extern void SuperVUDestroy(int vuindex); // if vuindex is -1, destroys everything
extern void SuperVUReset(int vuindex); // if vuindex is -1, resets everything extern void SuperVUReset(int vuindex); // if vuindex is -1, resets everything
//Using assembly code from an external file. //Using assembly code from an external file.
#ifdef __LINUX__ #ifdef __LINUX__
@ -46,5 +45,3 @@ extern u32 SuperVUGetVIAddr(int reg, int read);
// if p == 0, flush q else flush p; if wait is != 0, waits for p/q // if p == 0, flush q else flush p; if wait is != 0, waits for p/q
extern void SuperVUFlush(int p, int wait); extern void SuperVUFlush(int p, int wait);
#endif