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

Fixed optimisation problem on branch in branch delay slot. Fixes Dropship - United Peace Force. Props to MrCK1 for finding the issue.

This commit is contained in:
refractionpcsx2 2018-05-19 02:23:58 +01:00
parent 290397d1af
commit 9b82449542
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/x86/microVU_Lower.inl
View File

@ -1243,8 +1243,15 @@ mVUop(mVU_XGKICK) {
//------------------------------------------------------------------ //------------------------------------------------------------------
void setBranchA(mP, int x, int _x_) { void setBranchA(mP, int x, int _x_) {
bool isBranchDelaySlot = false;
incPC(-2);
if (mVUlow.branch)
isBranchDelaySlot = true;
incPC(2);
pass1 { pass1 {
if (_Imm11_ == 1 && !_x_) { if (_Imm11_ == 1 && !_x_ && !isBranchDelaySlot) {
DevCon.WriteLn(Color_Green, "microVU%d: Branch Optimization", mVU.index); DevCon.WriteLn(Color_Green, "microVU%d: Branch Optimization", mVU.index);
mVUlow.isNOP = true; mVUlow.isNOP = true;
return; return;
@ -1252,9 +1259,9 @@ void setBranchA(mP, int x, int _x_) {
mVUbranch = x; mVUbranch = x;
mVUlow.branch = x; mVUlow.branch = x;
} }
pass2 { if (_Imm11_ == 1 && !_x_) { return; } mVUbranch = x; } pass2 { if (_Imm11_ == 1 && !_x_ && !isBranchDelaySlot) { return; } mVUbranch = x; }
pass3 { mVUbranch = x; } pass3 { mVUbranch = x; }
pass4 { if (_Imm11_ == 1 && !_x_) { return; } mVUbranch = x; } pass4 { if (_Imm11_ == 1 && !_x_ && !isBranchDelaySlot) { return; } mVUbranch = x; }
} }
void condEvilBranch(mV, int JMPcc) { void condEvilBranch(mV, int JMPcc) {