mirror of https://github.com/PCSX2/pcsx2.git
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:
parent
ed89876ba6
commit
bd093b41bd
2
build.rb
2
build.rb
|
@ -22,7 +22,7 @@ $pcsx2_prefix = " --prefix #{$main_dir}"
|
|||
$plugins_prefix = " --prefix #{$plugin_install_dir}"
|
||||
|
||||
$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 = {
|
||||
"dev" => " --enable-devbuild ",
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
namespace R5900 {
|
||||
namespace Dynarec {
|
||||
|
||||
// R5900 branch hepler!
|
||||
// R5900 branch helper!
|
||||
// Recompiles code for a branch test and/or skip, complete with delay slot
|
||||
// handling. Note, for "likely" branches use iDoBranchImm_Likely instead, which
|
||||
// handles delay slots differently.
|
||||
|
|
|
@ -290,7 +290,7 @@ microVUt(void) mVUtestCycles(mV) {
|
|||
// Recompiler
|
||||
//------------------------------------------------------------------
|
||||
|
||||
microVUt(void*) mVUcompile(microVU* mVU, u32 startPC, uptr pState) {
|
||||
void* mVUcompile(microVU* mVU, u32 startPC, uptr pState) {
|
||||
|
||||
using namespace x86Emitter;
|
||||
microBlock* pBlock = NULL;
|
||||
|
|
|
@ -84,7 +84,7 @@ microVUt(void) mVUdispatcherA(mV) {
|
|||
}
|
||||
|
||||
// Generates the code to exit from recompiled blocks
|
||||
microVUt(void) mVUdispatcherB(mV) {
|
||||
void mVUdispatcherB(mV) {
|
||||
mVU->exitFunct = x86Ptr;
|
||||
|
||||
// Load EE's MXCSR state
|
||||
|
|
|
@ -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
|
||||
#define INST_DUMMY_ 0x8000
|
||||
#define INST_DUMMY 0x83c0
|
||||
#define INST_DUMMY 0x83c0
|
||||
|
||||
#define VFFREE_INVALID0 0x80000000 // (vffree[i]&0xf) is invalid
|
||||
|
||||
|
@ -955,7 +955,7 @@ static int _recbranchAddr(u32 vucode)
|
|||
static VuInstruction SuperVUFlushInst()
|
||||
{
|
||||
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;
|
||||
return inst;
|
||||
}
|
||||
|
|
|
@ -21,15 +21,8 @@
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
#define PADdefs
|
||||
#include "PS2Edefs.h"
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "PadWin.h"
|
||||
|
|
Loading…
Reference in New Issue