Archive/Play-
0
0
Fork 0
mirror of https://github.com/jpd002/Play-.git synced 2025-04-28 13:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

VIF: Handle edge case of direct qword buffer transfer.

Browse source 
If buffer contained a SIGNAL command that isn't ready to be processed, VIF state would get bad. Fixes hang in Million Monkeys.
This commit is contained in:
Jean-Philip Desjardins 2025-04-04 08:49:37 -04:00
parent 225e37d0dc
commit 64c63f1b03
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/ee/Vif1.cpp
View file

@ -166,7 +166,7 @@ void CVif1::Cmd_DIRECT(StreamType& stream, CODE nCommand)
if(hasPartialQword) if(hasPartialQword)
{ {
//Read enough bytes to try to complete our qword //Read enough bytes to try to complete our qword
assert(m_directQwordBufferIndex < QWORD_SIZE); assert(m_directQwordBufferIndex <= QWORD_SIZE);
uint32 readAmount = std::min(nSize, QWORD_SIZE - m_directQwordBufferIndex); uint32 readAmount = std::min(nSize, QWORD_SIZE - m_directQwordBufferIndex);
stream.Read(m_directQwordBuffer + m_directQwordBufferIndex, readAmount); stream.Read(m_directQwordBuffer + m_directQwordBufferIndex, readAmount);
m_directQwordBufferIndex += readAmount; m_directQwordBufferIndex += readAmount;
@ -176,11 +176,14 @@ void CVif1::Cmd_DIRECT(StreamType& stream, CODE nCommand)
if(m_directQwordBufferIndex == QWORD_SIZE) if(m_directQwordBufferIndex == QWORD_SIZE)
{ {
assert(m_CODE.nIMM != 0); assert(m_CODE.nIMM != 0);
FRAMEWORK_MAYBE_UNUSED uint32 processed = m_gif.ProcessMultiplePackets(m_directQwordBuffer, uint32 processed = m_gif.ProcessMultiplePackets(m_directQwordBuffer,
QWORD_SIZE, 0, QWORD_SIZE, CGsPacketMetadata(2)); QWORD_SIZE, 0, QWORD_SIZE, CGsPacketMetadata(2));
assert(processed == QWORD_SIZE); if(processed != 0)
m_CODE.nIMM--; {
m_directQwordBufferIndex = 0; assert(processed == QWORD_SIZE);
m_CODE.nIMM--;
m_directQwordBufferIndex = 0;
}
} }
} }