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

Workaround for Ape Escape Million Monkey's. SIGNAL causes issues with Path1, this should avoid it for now until someone has a better idea :P Explination given in both XG_KICK's 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4054 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
refraction 2010-11-24 22:23:57 +00:00
parent 9e4041a8e3
commit 3d4c0f6158
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/Gif.cpp
View File

@ -47,14 +47,14 @@ static __fi void clearFIFOstuff(bool full)
else
CSRreg.FIFO = CSR_FIFO_EMPTY;
}
extern bool SIGNAL_IMR_Pending;
void gsPath1Interrupt()
{
//DevCon.Warning("Path1 flush W %x, R %x", Path1WritePos, Path1ReadPos);
if((gifRegs.stat.APATH <= GIF_APATH1 || (gifRegs.stat.IP3 == true && gifRegs.stat.APATH == GIF_APATH3)) && Path1WritePos > 0 && !gifRegs.stat.PSE)
if((gifRegs.stat.APATH <= GIF_APATH1 || (gifRegs.stat.IP3 == true && gifRegs.stat.APATH == GIF_APATH3)) && Path1WritePos > 0 && !gifRegs.stat.PSE && SIGNAL_IMR_Pending == false)
{
gifRegs.stat.P1Q = false;
@ -62,7 +62,7 @@ void gsPath1Interrupt()
{
GetMTGS().PrepDataPacket(GIF_PATH_1, size);
//DevCon.Warning("Flush Size = %x", size);
while(size > 0)
while(size > 0 && SIGNAL_IMR_Pending == false)
{
uint count = GIFPath_CopyTag(GIF_PATH_1, ((u128*)Path1Buffer) + Path1ReadPos, size);
Path1ReadPos += count;
@ -80,12 +80,17 @@ void gsPath1Interrupt()
{
Path1WritePos = Path1ReadPos = 0;
}
else
{
//DevCon.Warning("Queue quitting early due to signal or EOP %x", size);
gifRegs.stat.P1Q = true;
}
}
}
else
{
if(gifRegs.stat.PSE) DevCon.Warning("Path1 paused by GIF_CTRL");
DevCon.Warning("Looping??? IP3 %x APATH %x OPH %x", gifRegs.stat.IP3, gifRegs.stat.APATH, gifRegs.stat.OPH);
//DevCon.Warning("Looping??? IP3 %x APATH %x OPH %x", gifRegs.stat.IP3, gifRegs.stat.APATH, gifRegs.stat.OPH);
//if(!(cpuRegs.interrupt & (1<<28)) && Path1WritePos > 0)CPU_INT(28, 128);
}

16
pcsx2/x86/microVU_Lower.inl
View File

@ -1098,7 +1098,16 @@ void __fastcall mVU_XGKICK_(u32 addr) {
u32 diff = 0x400 - addr;
u32 size;
if(gifRegs.stat.APATH <= GIF_APATH1 || (gifRegs.stat.APATH == GIF_APATH3 && gifRegs.stat.IP3 == true) && SIGNAL_IMR_Pending == false)
///////////////////////////////////////////////
///////////////SIGNAL WARNING!!////////////////
///////////////////////////////////////////////
/* Due to the face SIGNAL can cause the loop
to leave early, we can end up missing data.
The only way we can avoid this is to queue
it :(, im relying on someone else to come
up with a better solution! */
/*if(gifRegs.stat.APATH <= GIF_APATH1 || (gifRegs.stat.APATH == GIF_APATH3 && gifRegs.stat.IP3 == true) && SIGNAL_IMR_Pending == false)
{
if(Path1WritePos != 0)
{
@ -1116,7 +1125,7 @@ void __fastcall mVU_XGKICK_(u32 addr) {
}
}
else
{
{*/
//DevCon.Warning("GIF APATH busy %x Holding for later W %x, R %x", gifRegs.stat.APATH, Path1WritePos, Path1ReadPos);
size = GIFPath_ParseTagQuick(GIF_PATH_1, data, diff);
u8* pDest = &Path1Buffer[Path1WritePos*16];
@ -1136,7 +1145,8 @@ void __fastcall mVU_XGKICK_(u32 addr) {
}
//if(!gifRegs.stat.P1Q) CPU_INT(28, 128);
gifRegs.stat.P1Q = true;
}
//}
gsPath1Interrupt();
}
static __fi void mVU_XGKICK_DELAY(mV, bool memVI) {

19
pcsx2/x86/sVU_Lower.cpp
View File

@ -1982,7 +1982,17 @@ void __fastcall VU1XGKICK_MTGSTransfer(u32 *pMem, u32 addr)
u32 size;
u8* pDest;
if(gifRegs.stat.APATH <= GIF_APATH1 || (gifRegs.stat.APATH == GIF_APATH3 && gifRegs.stat.IP3 == true) && SIGNAL_IMR_Pending == false)
///////////////////////////////////////////////
///////////////SIGNAL WARNING!!////////////////
///////////////////////////////////////////////
/* Due to the face SIGNAL can cause the loop
to leave early, we can end up missing data.
The only way we can avoid this is to queue
it :(, im relying on someone else to come
up with a better solution! */
/*if(gifRegs.stat.APATH <= GIF_APATH1 || (gifRegs.stat.APATH == GIF_APATH3 && gifRegs.stat.IP3 == true) && SIGNAL_IMR_Pending == false)
{
if(Path1WritePos != 0)
{
@ -2000,7 +2010,7 @@ void __fastcall VU1XGKICK_MTGSTransfer(u32 *pMem, u32 addr)
}
}
else
{
{*/
//DevCon.Warning("GIF APATH busy %x Holding for later W %x, R %x", gifRegs.stat.APATH, Path1WritePos, Path1ReadPos);
size = GIFPath_ParseTagQuick(GIF_PATH_1, data, diff);
pDest = &Path1Buffer[Path1WritePos*16];
@ -2019,8 +2029,7 @@ void __fastcall VU1XGKICK_MTGSTransfer(u32 *pMem, u32 addr)
}
//if(!gifRegs.stat.P1Q) CPU_INT(28, 128);
gifRegs.stat.P1Q = true;
}
//}
gsPath1Interrupt();
}
//------------------------------------------------------------------