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

Hell, just switch to fifo.cpp from r3854. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3877 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Nolan Check 2009-07-23 22:32:21 +00:00
parent 758d5c234d
commit 2ab09ecf57
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Source/Core/VideoCommon/Src/Fifo.cpp
View File

@ -122,11 +122,14 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
{ {
fifoStateRun = true; fifoStateRun = true;
SCPFifoStruct &_fifo = *video_initialize.pCPFifo; SCPFifoStruct &_fifo = *video_initialize.pCPFifo;
s32 distToSend;
while (fifoStateRun) while (fifoStateRun)
{ {
video_initialize.pPeekMessages(); video_initialize.pPeekMessages();
VideoFifo_CheckEFBAccess(); VideoFifo_CheckEFBAccess();
VideoFifo_CheckSwapRequest(); VideoFifo_CheckSwapRequest();
s_criticalFifo.Enter(); s_criticalFifo.Enter();
@ -136,55 +139,63 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
{ {
Common::AtomicStore(_fifo.CPReadIdle, 0); Common::AtomicStore(_fifo.CPReadIdle, 0);
while (_fifo.bFF_GPReadEnable && _fifo.CPReadWriteDistance && !(_fifo.bFF_BPEnable && _fifo.bFF_Breakpoint)) while (_fifo.bFF_GPReadEnable && _fifo.CPReadWriteDistance)
{ {
if(!fifoStateRun) if(!fifoStateRun)
break; break;
// Create pointer to video data and send it to the VideoPlugin
u32 readPtr = _fifo.CPReadPointer; u32 readPtr = _fifo.CPReadPointer;
u8 *uData = video_initialize.pGetMemoryPointer(readPtr);
s32 distToSend; // if we are on BP mode we must send 32B chunks to Video plugin for BP checking
#if 1 // XXX: Put "0" here to always send 32 bytes at a time. // TODO (mb2): test & check if MP1/MP2 realy need this now.
// Only send 32 bytes at a time if breakpoint is enabled.
if (_fifo.bFF_BPEnable) if (_fifo.bFF_BPEnable)
{
if (readPtr == _fifo.CPBreakpoint)
{
Common::AtomicStore(_fifo.bFF_Breakpoint, 1);
video_initialize.pUpdateInterrupts();
break;
}
distToSend = 32; distToSend = 32;
readPtr += 32;
if ( readPtr >= _fifo.CPEnd)
readPtr = _fifo.CPBase;
}
else else
{ {
distToSend = _fifo.CPReadWriteDistance; distToSend = _fifo.CPReadWriteDistance;
if ((distToSend + readPtr) >= _fifo.CPEnd) // send 1024B chunk max length to have better control over PeekMessages' period
distToSend = _fifo.CPEnd - readPtr; distToSend = distToSend > 1024 ? 1024 : distToSend;
if ((distToSend + readPtr) >= _fifo.CPEnd) // TODO: better?
{
distToSend =_fifo.CPEnd - readPtr;
readPtr = _fifo.CPBase;
}
else
readPtr += distToSend;
} }
#else
distToSend = 32;
#endif
u8 *uData = video_initialize.pGetMemoryPointer(readPtr);
// Execute new instructions found in uData // Execute new instructions found in uData
Fifo_SendFifoData(uData, distToSend); Fifo_SendFifoData(uData, distToSend);
readPtr += distToSend;
if (readPtr >= _fifo.CPEnd)
readPtr = _fifo.CPBase;
Common::AtomicStore(_fifo.CPReadPointer, readPtr); Common::AtomicStore(_fifo.CPReadPointer, readPtr);
Common::AtomicAdd(_fifo.CPReadWriteDistance, -distToSend); Common::AtomicAdd(_fifo.CPReadWriteDistance, -distToSend);
if (_fifo.bFF_BPEnable && (readPtr == _fifo.CPBreakpoint))
{
Common::AtomicStore(_fifo.bFF_Breakpoint, 1);
video_initialize.pUpdateInterrupts();
}
video_initialize.pPeekMessages(); video_initialize.pPeekMessages();
VideoFifo_CheckEFBAccess();
VideoFifo_CheckSwapRequest();
VideoFifo_CheckEFBAccess();
VideoFifo_CheckSwapRequest();
} }
Common::AtomicStore(_fifo.CPReadIdle, 1); Common::AtomicStore(_fifo.CPReadIdle, 1);
} }
else else
{
Common::YieldCPU(); Common::YieldCPU();
}
s_criticalFifo.Leave(); s_criticalFifo.Leave();
} }