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

microVU: Fix for Red Faction 2 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4622 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
cottonvibes 2011-05-04 22:52:27 +00:00
parent 00132caca1
commit 9a3934af89
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/x86/microVU_Execute.inl
View File

@ -168,13 +168,16 @@ void mVUdispatcherD(mV) {
_mVUt void* __fastcall mVUexecute(u32 startPC, u32 cycles) { _mVUt void* __fastcall mVUexecute(u32 startPC, u32 cycles) {
microVU& mVU = mVUx; microVU& mVU = mVUx;
//DevCon.WriteLn("microVU%x: startPC = 0x%x, cycles = 0x%x", vuIndex, startPC, cycles); u32 vuLimit = vuIndex ? 0x3fff : 0xfff;
if (startPC > vuLimit) {
DevCon.Warning("microVU%x Warning: startPC = 0x%x, cycles = 0x%x", vuIndex, startPC, cycles);
}
mVU.cycles = cycles; mVU.cycles = cycles;
mVU.totalCycles = cycles; mVU.totalCycles = cycles;
xSetPtr(mVU.prog.x86ptr); // Set x86ptr to where last program left off xSetPtr(mVU.prog.x86ptr); // Set x86ptr to where last program left off
return mVUsearchProg<vuIndex>(startPC, (uptr)&mVU.prog.lpState); // Find and set correct program return mVUsearchProg<vuIndex>(startPC & vuLimit, (uptr)&mVU.prog.lpState); // Find and set correct program
} }
//------------------------------------------------------------------ //------------------------------------------------------------------

6
pcsx2/x86/microVU_Flags.inl
View File

@ -85,9 +85,9 @@ __fi void mVUsetFlags(mV, microFlagCycles& mFC) {
// Ensure last ~4+ instructions update mac/status flags (if next block's first 4 instructions will read them) // Ensure last ~4+ instructions update mac/status flags (if next block's first 4 instructions will read them)
for(int i = mVUcount; i > 0; i--, aCount++) { for(int i = mVUcount; i > 0; i--, aCount++) {
if (sFLAG.doFlag) { if (sFLAG.doFlag) {
if (__Mac) { mFLAG.doFlag = 1; } if (__Mac) mFLAG.doFlag = 1;
if (__Status) { sFLAG.doNonSticky = 1; } if (__Status) sFLAG.doNonSticky = 1;
if (aCount >= 4) { break; } if (aCount >= 4) break;
} }
incPC2(-2); incPC2(-2);
} }

1
pcsx2/x86/microVU_Misc.h
View File

@ -227,6 +227,7 @@ typedef u32 (__fastcall *mVUCall)(void*, void*);
#define shuffleSS(x) ((x==1)?(0x27):((x==2)?(0xc6):((x==4)?(0xe1):(0xe4)))) #define shuffleSS(x) ((x==1)?(0x27):((x==2)?(0xc6):((x==4)?(0xe1):(0xe4))))
#define clampE CHECK_VU_EXTRA_OVERFLOW #define clampE CHECK_VU_EXTRA_OVERFLOW
#define elif else if #define elif else if
#define varPrint(x) DevCon.WriteLn(#x " = %d", (int)x)
#define branchAddr ( \ #define branchAddr ( \
pxAssumeDev((iPC & 1) == 0, "microVU: Expected Lower Op for valid branch addr."), \ pxAssumeDev((iPC & 1) == 0, "microVU: Expected Lower Op for valid branch addr."), \