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

Take 3 and done *i hope!* comments for r4035-r4038 in here please! 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4038 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
refraction 2010-11-19 20:07:57 +00:00
parent 9979fe30e3
commit 71142dfd7f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcsx2/Vif1_MFIFO.cpp
View File

@ -285,11 +285,7 @@ void vifMFIFOInterrupt()
vif1Regs.stat.VPS = VPS_IDLE; vif1Regs.stat.VPS = VPS_IDLE;
} }
if(vif1.inprogress & 0x10)
{
FireMFIFOEmpty();
if(!(vif1.done && vif1ch.qwc == 0) || !(vif1.irq && vif1.tag.size == 0))return;
}
if (vif1.irq && vif1.tag.size == 0) if (vif1.irq && vif1.tag.size == 0)
{ {
SPR_LOG("VIF MFIFO Code Interrupt detected"); SPR_LOG("VIF MFIFO Code Interrupt detected");
@ -301,10 +297,16 @@ void vifMFIFOInterrupt()
{ {
/*vif1Regs.stat.FQC = 0; // FQC=0 /*vif1Regs.stat.FQC = 0; // FQC=0
vif1ch.chcr.STR = false;*/ vif1ch.chcr.STR = false;*/
if(vif1ch.qwc > 0 || !vif1.done) return; if((vif1ch.qwc > 0 || !vif1.done) && !(vif1.inprogress & 0x10)) return;
} }
} }
if(vif1.inprogress & 0x10)
{
FireMFIFOEmpty();
if(!(vif1.done && vif1ch.qwc == 0))return;
}
if (vif1.done == false || vif1ch.qwc) if (vif1.done == false || vif1ch.qwc)
{ {