summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/CommandProcessor.cpp
diff options
context:
space:
mode:
authorMarcos Vitali <marcosvitali@gmail.com>2011-01-13 01:29:34 +0000
committerMarcos Vitali <marcosvitali@gmail.com>2011-01-13 01:29:34 +0000
commitbe5c7322540c2d65ffe81141dfacbcfdef2d09bf (patch)
treeeb47c50f82c3a18081f64d53e6534d98913ee27b /Source/Core/VideoCommon/Src/CommandProcessor.cpp
parent9ed3862c0a7387adbe80125741c1e76de90eff77 (diff)
Quick fifo commit:
* Change the process ProcessAllDistace to ClearRegister * Fix a bug in ProcessFifoEvents() in commandProcessro (thanks Skid) -- The last 2 items should be improve the speed lost in r6572 and maybe improve a little bit because ProcessFifoEvents() is right. (Test car selection in GxZero) * Alliviate Fifo desyncs, In the meant time I still Researching for real solution. (This fix RE0 again and maybe others "FIFOs linked but out of sync" and "GFX FIFO: Unknown Opcode (0x%x).\n" games suffers these for desync.) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6837 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/CommandProcessor.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/CommandProcessor.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
index a700ef76ba..9e625ce3f1 100644
--- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp
+++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
@@ -208,7 +208,7 @@ void Read16(u16& _rReturnValue, const u32 _Address)
{
m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint;
m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint);
- m_CPStatusReg.CommandIdle = fifo.CPCmdIdle;
+ m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance;
m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark;
m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark;
}
@@ -278,15 +278,15 @@ void Read16(u16& _rReturnValue, const u32 _Address)
return;
case FIFO_READ_POINTER_LO:
- _rReturnValue = ReadLow (fifo.CPReadPointer);
+ //_rReturnValue = ReadLow (fifo.CPReadPointer);
// hack: CPU will always believe fifo is empty and on idle
- //_rReturnValue = ReadLow (fifo.CPWritePointer);
+ _rReturnValue = ReadLow (fifo.CPWritePointer);
DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_READ_POINTER_LO : %04x", _rReturnValue);
return;
case FIFO_READ_POINTER_HI:
- _rReturnValue = ReadHigh(fifo.CPReadPointer);
+ //_rReturnValue = ReadHigh(fifo.CPReadPointer);
// hack: CPU will always believe fifo is empty and on idle
- //_rReturnValue = ReadHigh(fifo.CPWritePointer);
+ _rReturnValue = ReadHigh(fifo.CPWritePointer);
DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_READ_POINTER_HI : %04x", _rReturnValue);
return;
@@ -471,8 +471,6 @@ void Write16(const u16 _Value, const u32 _Address)
if (bProcessFifoToLoWatemark)
ProcessFifoToLoWatemark();
- if (bProcessFifoAllDistance)
- ProcessFifoAllDistance();
INFO_LOG(COMMANDPROCESSOR,"\t Write to CTRL_REGISTER : %04x", _Value);
DEBUG_LOG(COMMANDPROCESSOR, "\t GPREAD %s | BP %s | Int %s | OvF %s | UndF %s | LINK %s"
@@ -496,7 +494,10 @@ void Write16(const u16 _Value, const u32 _Address)
bProcessFifoToLoWatemark = true;
if (tmpCtrl.ClearFifoUnderflow && tmpCtrl.ClearFifoOverflow)
- bProcessFifoAllDistance = true;
+ ProcessFifoAllDistance();
+
+ if (!tmpCtrl.ClearFifoUnderflow && !tmpCtrl.ClearFifoOverflow)
+ ProcessFifoAllDistance();
}
else
{
@@ -904,7 +905,7 @@ void ProcessFifoAllDistance()
void ProcessFifoEvents()
{
- if (g_VideoInitialize.bOnThread || interruptWaiting || interruptFinishWaiting || interruptTokenWaiting)
+ if (g_VideoInitialize.bOnThread && (interruptWaiting || interruptFinishWaiting || interruptTokenWaiting))
g_VideoInitialize.pProcessFifoEvents();
}