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

microVU: 

- Fixed a possible infinite recursion problem from my last commit (Fixes Dynasty Warriors 4 crashing...)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3299 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
cottonvibes 2010-06-25 07:40:32 +00:00
parent 25e63c243d
commit 5b16838591
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcsx2/x86/microVU_Flags.inl
View File

@ -224,13 +224,14 @@ _f void mVUsetupFlags(mV, microFlagCycles& mFC) {
}
}
#define _found ((mVUregs.needExactMatch&8)>>3)
#define shortBranch() { \
if ((branch == 3) || (branch == 4)) { /*Branches*/ \
mVUflagPass(mVU, aBranchAddr, sCount+1, found); \
_mVUflagPass(mVU, aBranchAddr, sCount+_found, v); \
if (branch == 3) break; /*Non-conditional Branch*/ \
} \
else if (branch == 5) { /*JR/JARL*/ \
if(!CHECK_VU_BLOCKHACK && (!found||(sCount+1<4))) { \
if(!CHECK_VU_BLOCKHACK && (sCount+_found<4)) { \
mVUregs.needExactMatch |= 7; \
} \
break; \
@ -239,17 +240,21 @@ _f void mVUsetupFlags(mV, microFlagCycles& mFC) {
}
// Scan through instructions and check if flags are read (FSxxx, FMxxx, FCxxx opcodes)
void mVUflagPass(mV, u32 startPC, u32 sCount = 0, bool found = 0) {
void _mVUflagPass(mV, u32 startPC, u32 sCount, vector<u32>& v) {
for (u32 i = 0; i < v.size(); i++) {
if (v[i] == startPC) return; // Prevent infinite recursion
}
v.push_back(startPC);
int oldPC = iPC;
int oldBranch = mVUbranch;
int aBranchAddr = 0;
iPC = startPC / 4;
mVUbranch = 0;
for (int branch = 0; (sCount < 4) || !found; sCount++) {
for (int branch = 0; sCount < 4; sCount += _found) {
incPC(1);
mVUopU(mVU, 3);
if (mVUregs.needExactMatch&8) found = 1;
if ( curI & _Ebit_ ) { branch = 1; }
if ( curI & _DTbit_ ) { branch = 6; }
if (!(curI & _Ibit_) ) { incPC(-1); mVUopL(mVU, 3); incPC(1); }
@ -264,6 +269,11 @@ void mVUflagPass(mV, u32 startPC, u32 sCount = 0, bool found = 0) {
setCode();
}
void mVUflagPass(mV, u32 startPC, u32 sCount = 0) {
vector<u32> v;
_mVUflagPass(mVU, startPC, sCount, v);
}
#define branchType1 if (mVUbranch <= 2) // B/BAL
#define branchType2 else if (mVUbranch >= 9) // JR/JALR
#define branchType3 else // Conditional Branch

6
pcsx2/x86/microVU_Lower.inl
View File

@ -1192,7 +1192,11 @@ mVUop(mVU_XGKICK) {
void setBranchA(mP, int x, int _x_) {
pass1 {
if (_Imm11_ == 1 && !_x_) { mVUlow.isNOP = 1; return; }
if (_Imm11_ == 1 && !_x_) {
DevCon.WriteLn(Color_Green, "microVU%d: Branch Optimization", mVU->index);
mVUlow.isNOP = 1;
return;
}
mVUbranch = x;
mVUlow.branch = x;
}