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

Recursive inlining appears to be driving gcc to drink, or at least, to use up all available system memory trying to compile microVU.cpp and then failing. :( 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1418 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-06-21 10:26:56 +00:00
parent ed89876ba6
commit bd093b41bd
6 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.rb
View File

@ -22,7 +22,7 @@ $pcsx2_prefix = " --prefix #{$main_dir}"
$plugins_prefix = " --prefix #{$plugin_install_dir}" $plugins_prefix = " --prefix #{$plugin_install_dir}"
$plugin_list=["CDVDnull", "dev9null", "FWnull", "USBnull", "SPU2null", "zerogs", "zzogl", "zeropad", "zerospu2", "PeopsSPU2", "CDVDiso", "CDVDisoEFP", "CDVDlinuz"] $plugin_list=["CDVDnull", "dev9null", "FWnull", "USBnull", "SPU2null", "zerogs", "zzogl", "zeropad", "zerospu2", "PeopsSPU2", "CDVDiso", "CDVDisoEFP", "CDVDlinuz"]
$full_plugin_list=["CDVDnull", "dev9null", "FWnull", "USBnull", "SPU2null", "zerogs", "zzogl", "zeropad", "zerospu2", "PeopsSPU2", "CDVDiso", "CDVDisoEFP", "CDVDlinuz","GSnull","PadNull"] $full_plugin_list=["CDVDnull", "dev9null", "FWnull", "USBnull", "SPU2null", "zerogs", "zzogl", "zeropad", "zerospu2", "PeopsSPU2", "CDVDiso", "CDVDisoEFP", "CDVDlinuz","GSnull","PadNull","wxpad"]
$pcsx2_build_types = { $pcsx2_build_types = {
"dev" => " --enable-devbuild ", "dev" => " --enable-devbuild ",

2
pcsx2/x86/iR5900Misc.cpp
View File

@ -8,7 +8,7 @@
namespace R5900 { namespace R5900 {
namespace Dynarec { namespace Dynarec {
// R5900 branch hepler! // R5900 branch helper!
// Recompiles code for a branch test and/or skip, complete with delay slot // Recompiles code for a branch test and/or skip, complete with delay slot
// handling. Note, for "likely" branches use iDoBranchImm_Likely instead, which // handling. Note, for "likely" branches use iDoBranchImm_Likely instead, which
// handles delay slots differently. // handles delay slots differently.

2
pcsx2/x86/microVU_Compile.inl
View File

@ -290,7 +290,7 @@ microVUt(void) mVUtestCycles(mV) {
// Recompiler // Recompiler
//------------------------------------------------------------------ //------------------------------------------------------------------
microVUt(void*) mVUcompile(microVU* mVU, u32 startPC, uptr pState) { void* mVUcompile(microVU* mVU, u32 startPC, uptr pState) {
using namespace x86Emitter; using namespace x86Emitter;
microBlock* pBlock = NULL; microBlock* pBlock = NULL;

2
pcsx2/x86/microVU_Execute.inl
View File

@ -84,7 +84,7 @@ microVUt(void) mVUdispatcherA(mV) {
} }
// Generates the code to exit from recompiled blocks // Generates the code to exit from recompiled blocks
microVUt(void) mVUdispatcherB(mV) { void mVUdispatcherB(mV) {
mVU->exitFunct = x86Ptr; mVU->exitFunct = x86Ptr;
// Load EE's MXCSR state // Load EE's MXCSR state

4
pcsx2/x86/sVU_zerorec.cpp
View File

@ -98,7 +98,7 @@ extern void (*recVU_LOWER_OPCODE[128])(VURegs* VU, s32 info);
// Let's tempt fate by defining two different constants with almost identical names // Let's tempt fate by defining two different constants with almost identical names
#define INST_DUMMY_ 0x8000 #define INST_DUMMY_ 0x8000
#define INST_DUMMY 0x83c0 #define INST_DUMMY 0x83c0
#define VFFREE_INVALID0 0x80000000 // (vffree[i]&0xf) is invalid #define VFFREE_INVALID0 0x80000000 // (vffree[i]&0xf) is invalid
@ -955,7 +955,7 @@ static int _recbranchAddr(u32 vucode)
static VuInstruction SuperVUFlushInst() static VuInstruction SuperVUFlushInst()
{ {
VuInstruction inst; VuInstruction inst;
// don't need to raed q/p // don't need to read q/p
inst.type = INST_DUMMY_;//|INST_Q_READ|INST_P_READ; inst.type = INST_DUMMY_;//|INST_Q_READ|INST_P_READ;
return inst; return inst;
} }

7
plugins/PadNull/Pad.h
View File

@ -21,15 +21,8 @@
#include <stdio.h> #include <stdio.h>
#ifdef __cplusplus
extern "C"
{
#endif
#define PADdefs #define PADdefs
#include "PS2Edefs.h" #include "PS2Edefs.h"
#ifdef __cplusplus
}
#endif
#ifdef _WIN32 #ifdef _WIN32
#include "PadWin.h" #include "PadWin.h"