From d1b5ee9f5fab7ffd071a9f5de60adfe07655dde1 Mon Sep 17 00:00:00 2001
From: refraction <refraction@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Thu, 4 Jun 2009 20:46:05 +0000
Subject: [PATCH] Couple of very minor changes for GIF/MTGS GIFTag reading

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1324 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/Gif.cpp  | 47 +++++++++++++++++++++++------------------------
 pcsx2/MTGS.cpp | 37 ++++++++++++++++++++++++-------------
 2 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/pcsx2/Gif.cpp b/pcsx2/Gif.cpp
index a5e44ff7b4..049ed0191a 100644
--- a/pcsx2/Gif.cpp
+++ b/pcsx2/Gif.cpp
@@ -93,7 +93,7 @@ static u32 WRITERING_DMA(u32 *pMem, u32 qwc)
 
 	if( mtgsThread != NULL )
 	{ 
-		int sizetoread = (qwc)<<4; 
+		int sizetoread = qwc;
 		sizetoread = mtgsThread->PrepDataPacket( GIF_PATH_3, pMem, qwc );
 		u8* pgsmem = mtgsThread->GetDataPacketPtr();
 
@@ -122,7 +122,7 @@ static u32 WRITERING_DMA(u32 *pMem, u32 qwc)
 
 int  _GIFchain() {
 
-	u32 qwc = ((psHu32(GIF_MODE) & 0x4) && (vif1Regs->mskpath3)) ? min(8, (int)gif->qwc) : min( gifsplit, (int)gif->qwc );
+	u32 qwc = ((psHu32(GIF_MODE) & 0x4) || vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : min( gifsplit, (int)gif->qwc );
 	u32 *pMem;
 
 	pMem = (u32*)dmaGetAddr(gif->madr);
@@ -301,27 +301,26 @@ void GIFdma()
 	}
 
 	prevcycles = 0;
-	if (!(vif1Regs->mskpath3 || (psHu32(GIF_MODE) & 0x1)))	{
-		if (gspath3done == 0 && gif->qwc == 0)
-		{
-			
-			ptag = (u32*)dmaGetAddr(gif->tadr);  //Set memory pointer to TADR
-			gif->qwc  = (u16)ptag[0];			    //QWC set to lower 16bits of the tag
-			gif->chcr = ( gif->chcr & 0xFFFF ) | ( (*ptag) & 0xFFFF0000 );  //Transfer upper part of tag to CHCR bits 31-15
-			gif->madr = ptag[1];
+	if (gspath3done == 0 && gif->qwc == 0)
+	{
+		
+		ptag = (u32*)dmaGetAddr(gif->tadr);  //Set memory pointer to TADR
+		gif->qwc  = (u16)ptag[0];			    //QWC set to lower 16bits of the tag
+		gif->chcr = ( gif->chcr & 0xFFFF ) | ( (*ptag) & 0xFFFF0000 );  //Transfer upper part of tag to CHCR bits 31-15
+		gif->madr = ptag[1];
+
+		gspath3done = hwDmacSrcChainWithStack(gif, (ptag[0] >> 28) & 0x7);
+		if ((gif->chcr & 0x80) && (ptag[0] >> 31)) { //Check TIE bit of CHCR and IRQ bit of tag
+			GIF_LOG("dmaIrq Set");
+			gspath3done = 1;
+		}
+		GIF_LOG("gifdmaChain %8.8x_%8.8x size=%d, id=%d, addr=%lx", ptag[1], ptag[0], gif->qwc, (ptag[0] >> 28) & 0x7, gif->madr);
+		GIFdmaEnd();
+		return;
+		
+	} else GIFdmaEnd();
+	gscycles = 0;
 
-			gspath3done = hwDmacSrcChainWithStack(gif, (ptag[0] >> 28) & 0x7);
-			if ((gif->chcr & 0x80) && (ptag[0] >> 31)) { //Check TIE bit of CHCR and IRQ bit of tag
-				GIF_LOG("dmaIrq Set");
-				gspath3done = 1;
-			}
-			GIF_LOG("gifdmaChain %8.8x_%8.8x size=%d, id=%d, addr=%lx", ptag[1], ptag[0], gif->qwc, (ptag[0] >> 28) & 0x7, gif->madr);
-			GIFdmaEnd();
-			return;
-			
-		} else GIFdmaEnd();
-		gscycles = 0;
-	}
 }
 
 void dmaGIF() {
@@ -372,7 +371,7 @@ void dmaGIF() {
 
 // called from only one location, so forceinline it:
 static __forceinline int mfifoGIFrbTransfer() {
-	u32 qwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
+	u32 qwc = (psHu32(GIF_MODE) & 0x4 || vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
 	int mfifoqwc = min(gifqwc, qwc);
 	u32 *src;
 
@@ -431,7 +430,7 @@ static __forceinline int mfifoGIFchain() {
 	} 
 	else 
 	{
-		int mfifoqwc = (psHu32(GIF_MODE) & 0x4 && vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
+		int mfifoqwc = (psHu32(GIF_MODE) & 0x4 || vif1Regs->mskpath3) ? min(8, (int)gif->qwc) : gif->qwc;
 		u32 *pMem = (u32*)dmaGetAddr(gif->madr);
 		if (pMem == NULL) return -1;
 
diff --git a/pcsx2/MTGS.cpp b/pcsx2/MTGS.cpp
index 659e517967..0cd782c5c0 100644
--- a/pcsx2/MTGS.cpp
+++ b/pcsx2/MTGS.cpp
@@ -390,13 +390,24 @@ __forceinline int mtgsThreadObject::_gifTransferDummy( GIF_PATH pathidx, const u
 			}
 		}
 		
-		if(pathidx == 0)
+		if(path.tag.nloop == 0)
 		{
-			if(path.tag.eop && path.tag.nloop == 0)
+			if(path.tag.eop)
 			{
-				break;
-			}
-			/*if((path.tag.nloop > 0 || (!path.tag.eop && path.tag.nloop == 0)) && size == 0)
+				if(pathidx != 1)
+				{				
+					break;
+				}
+				/*if((path.tag.nloop > 0 || (!path.tag.eop && path.tag.nloop == 0)) && size == 0)
+				{
+					if(path1loop == true) return size - 0x400;
+					//DevCon::Notice("Looping Nloop %x, Eop %x, FLG %x", params path.tag.nloop, path.tag.eop, path.tag.flg);
+					size = 0x400;
+					pMem -= 0x4000;
+					path1loop = true;
+				}*/
+			} 
+			/*else if(size == 0 && pathidx == 0)
 			{
 				if(path1loop == true) return size - 0x400;
 				//DevCon::Notice("Looping Nloop %x, Eop %x, FLG %x", params path.tag.nloop, path.tag.eop, path.tag.flg);
@@ -404,15 +415,15 @@ __forceinline int mtgsThreadObject::_gifTransferDummy( GIF_PATH pathidx, const u
 				pMem -= 0x4000;
 				path1loop = true;
 			}*/
-		}
-		if(pathidx == 2)
+		} 
+		/*else if(size == 0 && pathidx == 0)
 		{
-			if(path.tag.eop && path.tag.nloop == 0)
-			{
-				//if(pathidx == 2) GIF_LOG("BREAK PATH3 NLoop %d EOP %x Mode %d Path3msk %x Path3progress %x ", path.tag.nloop, path.tag.eop, path.tag.flg, vif1Regs->mskpath3, Path3progress);
-				break;
-			}
-		}
+			if(path1loop == true) return size - 0x400;
+			//DevCon::Notice("Looping Nloop %x, Eop %x, FLG %x", params path.tag.nloop, path.tag.eop, path.tag.flg);
+			size = 0x400;
+			pMem -= 0x4000;
+			path1loop = true;
+		}*/
 	}
 
 	if(pathidx == 0)