From 104603467be6cc15e63dfb5cadec8044edd1da46 Mon Sep 17 00:00:00 2001
From: marcosvitali <marcosvitali@gmail.com>
Date: Fri, 9 Mar 2012 18:58:23 -0300
Subject: [PATCH] This commit fix games hanging because of my prior Revision
 c2e6fdf09f33 The external exceptions in dolphin are checking frequently but
 is different to real HW, so sometime the game is in a loop checking GPU
 STATUS, the exceptions doesn't checked, and the game hang.\ For solve this I
 need a trick: still waiting for the exception handler be linked but if
 CommandProcecsor is reading the GPStatus, resume this.

This fixed "TimeSplitters: Future Perfect" broken in the Revision c2e6fdf09f33 and surely others games.
---
 Source/Core/VideoCommon/Src/CommandProcessor.cpp | 10 +++++++---
 Source/Core/VideoCommon/Src/PixelEngine.cpp      | 14 ++++++++------
 Source/Core/VideoCommon/Src/PixelEngine.h        |  1 +
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
index a6e68f6298..77c02d1692 100644
--- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp
+++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
@@ -574,7 +574,7 @@ void ProcessFifoAllDistance()
 	if (IsOnThread())
 	{
 		while (!CommandProcessor::interruptWaiting && fifo.bFF_GPReadEnable &&
-			fifo.CPReadWriteDistance && !AtBreakpoint())
+			fifo.CPReadWriteDistance && !AtBreakpoint() && !PixelEngine::WaitingForPEInterrupt())
 			Common::YieldCPU();
 	}
 	bProcessFifoAllDistance = false;
@@ -597,10 +597,12 @@ void SetCpStatusRegister()
 		
 	m_CPStatusReg.Breakpoint = fifo.bFF_Breakpoint;
 	m_CPStatusReg.ReadIdle = (fifo.CPReadPointer == fifo.CPWritePointer) || (fifo.CPReadPointer == fifo.CPBreakpoint) ;
-	m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance || (IsOnThread() && PixelEngine::WaitingForPEInterrupt());
+	m_CPStatusReg.CommandIdle = !fifo.CPReadWriteDistance;
 	m_CPStatusReg.UnderflowLoWatermark = fifo.bFF_LoWatermark;
 	m_CPStatusReg.OverflowHiWatermark = fifo.bFF_HiWatermark;
-
+	
+	PixelEngine::ResumeWaitingForPEInterrupt();
+	
 	INFO_LOG(COMMANDPROCESSOR,"\t Read from STATUS_REGISTER : %04x", m_CPStatusReg.Hex);
 	DEBUG_LOG(COMMANDPROCESSOR, "(r) status: iBP %s | fReadIdle %s | fCmdIdle %s | iOvF %s | iUndF %s"
 		, m_CPStatusReg.Breakpoint ?			"ON" : "OFF"
@@ -609,6 +611,8 @@ void SetCpStatusRegister()
 		, m_CPStatusReg.OverflowHiWatermark ?	"ON" : "OFF"
 		, m_CPStatusReg.UnderflowLoWatermark ?	"ON" : "OFF"
 			);
+
+	
 }
 
 void SetCpControlRegister()
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp
index 09cb9b8a5c..750e8fbb40 100644
--- a/Source/Core/VideoCommon/Src/PixelEngine.cpp
+++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp
@@ -356,22 +356,16 @@ void UpdateInterrupts()
 
 void UpdateTokenInterrupt(bool active)
 {
-	if(interruptSetToken != active)
-	{
 		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_TOKEN, active);
 		interruptSetToken = active;
-	}
 }
 
 void UpdateFinishInterrupt(bool active)
 {
-	if(interruptSetFinish != active)
-	{
 		ProcessorInterface::SetInterrupt(INT_CAUSE_PE_FINISH, active);
 		interruptSetFinish = active;
 		if (active)
 			State::ProcessRequestedStates(0);
-	}
 }
 
 // TODO(mb2): Refactor SetTokenINT_OnMainThread(u64 userdata, int cyclesLate).
@@ -473,4 +467,12 @@ bool WaitingForPEInterrupt()
 {
 	return CommandProcessor::interruptFinishWaiting  || CommandProcessor::interruptTokenWaiting || interruptSetFinish || interruptSetToken;
 }
+
+void ResumeWaitingForPEInterrupt()
+{
+	interruptSetFinish = false;
+	interruptSetToken = false;
+	CommandProcessor::interruptFinishWaiting = false;
+	CommandProcessor::interruptTokenWaiting = false;
+}
 } // end of namespace PixelEngine
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.h b/Source/Core/VideoCommon/Src/PixelEngine.h
index 5e64300ef3..64f959009f 100644
--- a/Source/Core/VideoCommon/Src/PixelEngine.h
+++ b/Source/Core/VideoCommon/Src/PixelEngine.h
@@ -81,6 +81,7 @@ void SetFinish(void);
 void ResetSetFinish(void);
 void ResetSetToken(void);
 bool WaitingForPEInterrupt();
+void ResumeWaitingForPEInterrupt();
 
 // Bounding box functionality. Paper Mario (both) are a couple of the few games that use it.
 extern u16 bbox[4];