From c67bfbe6486b8f5610d0a65b05b044d698d89383 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Fri, 15 May 2009 02:46:35 +0000 Subject: [PATCH] microVU: fixed up microVU so that it compiles in Linux if the appropriate defines are uncommented, and runs surrealistically. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1187 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/x86/Makefile.am | 14 +++++++------- pcsx2/x86/microVU.h | 10 +++++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pcsx2/x86/Makefile.am b/pcsx2/x86/Makefile.am index 2e77cc0168..bf6ed92239 100644 --- a/pcsx2/x86/Makefile.am +++ b/pcsx2/x86/Makefile.am @@ -12,17 +12,17 @@ BaseblockEx.cpp iCOP0.cpp iCOP2.cpp iCore.cpp iFPU.cpp iFPUd.cpp iMMI.cpp iPsxMe iR5900Misc.cpp iVU0micro.cpp iVU1micro.cpp iVUmicro.cpp iVUmicroLower.cpp iVUmicroUpper.cpp iVUzerorec.cpp iVif.cpp \ ir5900tables.cpp fast_routines.S aR3000A.S aVUzerorec.S aVif.S $(archfiles) -#ifdef PCSX2_MICROVU -#libx86recomp_a_SOURCES += \ -#microVU.cpp microVU_Misc.inl microVU_Log.inl microVU_Analyze.inl microVU_Alloc.inl microVU_Upper.inl microVU_Lower.inl \ -#microVU_Tables.inl microVU_Flags.inl microVU_Compile.inl microVU_Execute.inl \ -#microVU.h microVU_Alloc.h microVU_Misc.h -#endif - libx86recomp_a_SOURCES += \ BaseblockEx.h iCOP0.h iCore.h iFPU.h iMMI.h iR3000A.h iR5900.h iR5900Arit.h iR5900AritImm.h iR5900Branch.h iR5900Jump.h \ iR5900LoadStore.h iR5900Move.h iR5900MultDiv.h iR5900Shift.h iVUmicro.h iVUops.h iVUzerorec.h +# Only active if PCSX2_MICROVU is defined. +libx86recomp_a_SOURCES += \ +microVU.cpp microVU_Misc.inl microVU_Log.inl microVU_Analyze.inl microVU_Alloc.inl microVU_Upper.inl microVU_Lower.inl \ +microVU_Tables.inl microVU_Flags.inl microVU_Compile.inl microVU_Execute.inl \ +microVU.h microVU_Alloc.h microVU_Misc.h + + libx86recomp_a_DEPENDENCIES = ix86/libix86.a SUBDIRS = ix86 \ No newline at end of file diff --git a/pcsx2/x86/microVU.h b/pcsx2/x86/microVU.h index 88be602ebb..6bf6ff3906 100644 --- a/pcsx2/x86/microVU.h +++ b/pcsx2/x86/microVU.h @@ -139,10 +139,18 @@ microVUt(void) mVUreset(); microVUt(void) mVUclose(); microVUt(void) mVUclear(u32, u32); +// Prototypes for Linux. +void __fastcall mVUcleanUpVU0(); +void __fastcall mVUcleanUpVU1(); +void* __fastcall mVUcompileVU0(u32 startPC, uptr pState); +void* __fastcall mVUcompileVU1(u32 startPC, uptr pState); +microVUf(void) mVUopU(); +microVUf(void) mVUopL(); + // Private Functions microVUt(void) mVUclearProg(microVU* mVU, int progIndex); microVUt(int) mVUfindLeastUsedProg(microVU* mVU); -microVUt(int) mVUsearchProg(microVU* mVU); +microVUt(int) mVUsearchProg(/*microVU* mVU*/); microVUt(void) mVUcacheProg(microVU* mVU, int progIndex); void* __fastcall mVUexecuteVU0(u32 startPC, u32 cycles); void* __fastcall mVUexecuteVU1(u32 startPC, u32 cycles);