- Optimized the ParseTag function a little and made a quick one for delayed PATH1 transfers.

- Also adjusted some internal interrupt timers so they don't interrupt so often (when they don't really need to)

All in all you should have a few extra FPS over revisions following r3274

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3305 96395faa-99c1-11dd-bbfe-3dabce05a288

pcsx2/GS.h

@@ -157,7 +157,8 @@ enum GIF_PATH
 	GIF_PATH_3,
 };
 
-extern int  GIFPath_ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size, bool TestOnly);
+extern int  GIFPath_ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size);
+extern int  GIFPath_ParseTagQuick(GIF_PATH pathidx, const u8* pMem, u32 size);
 extern void GIFPath_Reset();
 extern void GIFPath_Clear( GIF_PATH pathidx );
 

pcsx2/Gif.cpp

@@ -87,11 +87,12 @@ void gsPath1Interrupt()
 		{
 			gifRegs->stat.P1Q = false;
 			gifRegs->stat.APATH = GIF_APATH_IDLE;
+			cpuRegs.interrupt &= ~(1<<28);
 		}
 		else
 		{
 			if(gifRegs->stat.PSE) DevCon.Warning("Path1 paused by GIF_CTRL");
-			if(!(cpuRegs.interrupt & (1<<28)))CPU_INT(28, 16);
+			if(!(cpuRegs.interrupt & (1<<28)))CPU_INT(28, 128);
 		}
 	}
 	
@@ -178,7 +179,7 @@ int  _GIFchain()
 
 	//in Intermittent Mode it enabled, IMAGE_MODE transfers are sliced.
 
-	if(gifRegs->stat.IMT && GSTransferStatus.PTH3 == IMAGE_MODE) qwc = min((int)gif->qwc, 8);
+	if(gifRegs->stat.IMT && GSTransferStatus.PTH3 <= IMAGE_MODE) qwc = min((int)gif->qwc, 8);
 	else qwc = gif->qwc;
 
 	return WRITERING_DMA(pMem, qwc);

pcsx2/MTGS.cpp

@@ -666,7 +666,7 @@ int SysMtgsThread::PrepDataPacket( GIF_PATH pathidx, const u8* srcdata, u32 size
 	pxAssert( size < RingBufferSize );
 	pxAssert( writepos < RingBufferSize );
 
-	m_packet_size = GIFPath_ParseTag(pathidx, srcdata, size, false);
+	m_packet_size = GIFPath_ParseTag(pathidx, srcdata, size);
 	size		  = m_packet_size + 1; // takes into account our command qword.
 	
 	if( writepos + size < RingBufferSize )

pcsx2/SaveState.h

@@ -24,7 +24,7 @@
 //  the lower 16 bit value.  IF the change is breaking of all compatibility with old
 //  states, increment the upper 16 bit value, and clear the lower 16 bits to 0.
 
-static const u32 g_SaveVersion = 0x8b440000;
+static const u32 g_SaveVersion = 0x8b450000;
 
 // this function is meant to be used in the place of GSfreeze, and provides a safe layer
 // between the GS saving function and the MTGS's needs. :)

pcsx2/Vif1_Dma.cpp

@@ -271,7 +271,7 @@ bool CheckPath2GIF(int channel)
 				else
 				{
 					//DevCon.Warning("VIF1-0 stall P1Q %x P2Q %x APATH %x PTH3 %x vif1cmd %x", gifRegs->stat.P1Q, gifRegs->stat.P2Q, gifRegs->stat.APATH, GSTransferStatus.PTH3, vif1.cmd);
-					CPU_INT(channel, 8);
+					CPU_INT(channel, 128);
 					return false;
 				}
 			}
@@ -285,7 +285,7 @@ bool CheckPath2GIF(int channel)
 			if(gifRegs->stat.P1Q == true)
 			{
 				//DevCon.Warning("VIF1-1 stall P1Q %x P2Q %x APATH %x PTH3 %x vif1cmd %x", gifRegs->stat.P1Q, gifRegs->stat.P2Q, gifRegs->stat.APATH, GSTransferStatus.PTH3, vif1.cmd);
-				CPU_INT(channel, 8);
+				CPU_INT(channel, 128);
 				return false;
 			}
 
@@ -306,7 +306,7 @@ bool CheckPath2GIF(int channel)
 			if (gifRegs->ctrl.PSE)
 			{
 				//DevCon.Warning("VIF1-1 stall P1Q %x P2Q %x APATH %x PTH3 %x vif1cmd %x", gifRegs->stat.P1Q, gifRegs->stat.P2Q, gifRegs->stat.APATH, GSTransferStatus.PTH3, vif1.cmd);
-				CPU_INT(channel, 8);
+				CPU_INT(channel, 128);
 				return false;
 			}
 			else
@@ -319,7 +319,7 @@ bool CheckPath2GIF(int channel)
 			if(gifRegs->stat.P1Q == true)
 			{
 				//DevCon.Warning("VIF1-2 stall P1Q %x P2Q %x APATH %x PTH3 %x vif1cmd %x", gifRegs->stat.P1Q, gifRegs->stat.P2Q, gifRegs->stat.APATH, GSTransferStatus.PTH3, vif1.cmd);
-				CPU_INT(channel, 8);
+				CPU_INT(channel, 128);
 				return false;
 			}
 			else

pcsx2/ps2/GIFpath.cpp

@@ -92,6 +92,7 @@ struct GIFPath
 	u32 nloop;			// local copy nloop counts toward zero, and leaves the tag copy unmodified.
 	u32 curreg;			// reg we left of on (for traversing through loops)
 	u32 numregs;		// number of regs (when NREG is 0, numregs is 16)
+	u32 DetectE;
 
 	GIFPath();
 
@@ -100,7 +101,8 @@ struct GIFPath
 	bool StepReg();
 	u8 GetReg();
 
-	int ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size, bool TestOnly);
+	int ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size);
+	int ParseTagQuick(GIF_PATH pathidx, const u8* pMem, u32 size);
 };
 
 typedef void (__fastcall *GIFRegHandler)(const u32* data);
@@ -248,14 +250,16 @@ __forceinline void GIFPath::PrepPackedRegs()
 	// Only unpack registers if we're starting a new pack.  Otherwise the unpacked
 	// array should have already been initialized by a previous partial transfer.
 
-	if (curreg != 0) return;
 	
+	if (curreg != 0) return;
+	DetectE = 0;
 	u32 tempreg = tag.REGS[0];
 	numregs		= ((tag.NREG-1)&0xf) + 1;
 
 	for (u32 i = 0; i < numregs; i++) {
 		if (i == 8) tempreg = tag.REGS[1];
 		regs[i] = tempreg & 0xf;
+		if(regs[i] == 0xe) DetectE++;
 		tempreg >>= 4;
 	}
 }
@@ -344,7 +348,67 @@ static __forceinline void gsHandler(const u8* pMem)
 // Parameters:
 //   size (path1)   - difference between the end of VU memory and pMem.
 //   size (path2/3) - max size of incoming data stream, in qwc (simd128)
-__forceinline int GIFPath::ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size, bool TestOnly)
+
+
+__forceinline int GIFPath::ParseTagQuick(GIF_PATH pathidx, const u8* pMem, u32 size)
+{
+	const u8*	vuMemEnd  =  pMem + (size<<4);	// End of VU1 Mem
+	u32	startSize =  size;						// Start Size
+
+	while (size > 0) {
+		if (!nloop) {
+
+			SetTag(pMem);
+			incTag(16, 1);
+		}
+		else
+		{
+			switch(tag.FLG) {
+				case GIF_FLG_PACKED:
+				{
+					GIF_LOG("Packed Mode");
+					numregs	= ((tag.NREG-1)&0xf) + 1;
+					u32 len = aMin(size, nloop * numregs);
+					if(len < (nloop * numregs)) nloop -= len / numregs;
+					else nloop = 0;
+					incTag(16 * len, len);
+				}
+				break;
+				case GIF_FLG_REGLIST:
+				{
+					GIF_LOG("Reglist Mode");					
+					numregs	= ((tag.NREG-1)&0xf) + 1;
+					size *= 2;
+					u32 len = aMin(size, nloop * numregs);
+					if(len < (nloop * numregs)) nloop -= len / numregs;
+					else nloop = 0;
+
+					incTag(8 * len, len);
+					if (size & 1) { incTag(8, 1); }
+					size /= 2;
+				}
+				break;
+				case GIF_FLG_IMAGE:
+				case GIF_FLG_IMAGE2:
+				{
+					GIF_LOG("IMAGE Mode");
+					int len = aMin(size, nloop);
+					incTag(( len * 16 ), len);
+					nloop -= len;
+				}
+				break;
+			}
+		}
+		if (tag.EOP && !nloop) break;
+	}
+
+	size = (startSize - size);
+
+
+	return size;
+}
+
+__forceinline int GIFPath::ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size)
 {
 	const u8*	vuMemEnd  =  pMem + (size<<4);	// End of VU1 Mem
 	u32	startSize =  size;						// Start Size
@@ -355,8 +419,7 @@ __forceinline int GIFPath::ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size,
 			SetTag(pMem);
 			incTag(16, 1);		
 			
-			
+			if(nloop > 0)
-			if(nloop > 0 && TestOnly == false)
 			{
 					switch(pathidx)
 					{
@@ -374,38 +437,52 @@ __forceinline int GIFPath::ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size,
 				
 							break;
 					}
-					if(gifRegs->stat.DIR == 0)gifRegs->stat.OPH = true;
+					gifRegs->stat.OPH = true;
 					gifRegs->stat.APATH = pathidx + 1;	
-			}
 					if(pathidx == GIF_PATH_3) break;
 			}			
+		}
 		else
 		{
 			
-			if(TestOnly == false)
-			{
 			gifRegs->stat.APATH = pathidx + 1;
-				if(gifRegs->stat.DIR == 0)gifRegs->stat.OPH = true;
+			gifRegs->stat.OPH = true;
-			}
+	
 			switch(tag.FLG) {
 				case GIF_FLG_PACKED:
 					GIF_LOG("Packed Mode");
 					PrepPackedRegs();
+					if(DetectE > 0)
+					{
 						do {
 							if (GetReg() == 0xe) {
-							if(TestOnly == false)gsHandler(pMem);
+								gsHandler(pMem);
 							}
 							incTag(16, 1);
 						} while(StepReg() && size > 0);
+					}
+					else //Save doing the while loop and repeat conditionals for nothing :P
+					{
+						//DevCon.Warning("No E detected Path%d nloop %x", pathidx + 1, nloop);
+						u32 len = aMin(size, nloop * numregs);
+						if(len < (nloop * numregs)) nloop -= len / numregs;
+						else nloop = 0;
+						incTag(16 * len, len);
+						if(nloop > 0) curreg = 1;
+						else curreg = 0;
+					}
 				break;
 				case GIF_FLG_REGLIST:
 				{
 					GIF_LOG("Reglist Mode");
+
+					numregs	= ((tag.NREG-1)&0xf) + 1;
 					size *= 2;
+					u32 len = aMin(size, nloop * numregs);
+					if(len < (nloop * numregs)) nloop -= len / numregs;
+					else nloop = 0;				
 					
-					do { incTag(8, 1); }
+					incTag(8 * len, len);
-					while(StepReg() && size > 0);
-
 					if (size & 1) { incTag(8, 1); }
 					size /= 2;
 				}
@@ -421,45 +498,22 @@ __forceinline int GIFPath::ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size,
 				break;
 			}
 		}
-		if(pathidx == GIF_PATH_1)
-		{
-			if(size == 0 && (!tag.EOP || nloop > 0)) //Need to check all of this, some cases VU will send info (like the BIOS) but be incomplete
-			{
-				switch(tag.FLG)
-				{
-					case GIF_FLG_PACKED:
-						size = nloop * numregs;
-					break;
-
-					case GIF_FLG_REGLIST:
-						size = (nloop * numregs) / 2;
-					break;
-
-					default:
-						size = nloop;
-					break;
-				}
-				startSize += size;
-				if(startSize >= 0x3fff)
-				{
-					size = 0;
-					Console.Warning("GIFTAG error, size exceeded VU memory size");
-				}
-			}
-		}
-
 		if (tag.EOP && !nloop) break;
 	}
 
 	size = (startSize - size);
 
 
-	if(TestOnly == false)
+	
-	{
 	if (tag.EOP && nloop <= 16) {
 		if(pathidx == 2 && nloop > 0)
 		{
 			if(GSTransferStatus.PTH3 != IDLE_MODE) GSTransferStatus.PTH3 = PENDINGSTOP_MODE;
+			if (gif->chcr.STR) { //Make sure we are really doing a DMA and not using FIFO
+				//GIF_LOG("Path3 end EOP %x NLOOP %x Status %x", tag.EOP, nloop, GSTransferStatus.PTH3);
+				gif->madr += size * 16;
+				gif->qwc  -= size;
+			}
 		}
 		else if(nloop == 0)
 		{
@@ -475,21 +529,26 @@ __forceinline int GIFPath::ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size,
 					break;
 				case GIF_PATH_3:
 					if(GSTransferStatus.PTH3 != IDLE_MODE) GSTransferStatus.PTH3 = STOPPED_MODE;
-						break;
+					if (gif->chcr.STR) { //Make sure we are really doing a DMA and not using FIFO
-				}
-			}
-		}
-		else if(nloop <= 16 && GSTransferStatus.PTH3 == IMAGE_MODE && pathidx == 2)
-		{
-			GSTransferStatus.PTH3 = PENDINGIMAGE_MODE;
-		}
-	}
-	
-	if (pathidx == GIF_PATH_3 && gif->chcr.STR) { //Make sure we are really doing a DMA and not using FIFO
 						//GIF_LOG("Path3 end EOP %x NLOOP %x Status %x", tag.EOP, nloop, GSTransferStatus.PTH3);
 						gif->madr += size * 16;
 						gif->qwc  -= size;
 					}
+					break;
+			}
+		}
+	}
+	else if(pathidx == 2)
+	{
+		if(nloop <= 16 && GSTransferStatus.PTH3 == IMAGE_MODE)GSTransferStatus.PTH3 = PENDINGIMAGE_MODE;
+		if (gif->chcr.STR) { //Make sure we are really doing a DMA and not using FIFO
+			//GIF_LOG("Path3 end EOP %x NLOOP %x Status %x", tag.EOP, nloop, GSTransferStatus.PTH3);
+			gif->madr += size * 16;
+			gif->qwc  -= size;
+		}
+	}
+	
+	
 
 	return size;
 }
@@ -499,7 +558,7 @@ __forceinline int GIFPath::ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size,
 // runs potentially several frames behind.
 // Parameters:
 //   size  - max size of incoming data stream, in qwc (simd128)
-__forceinline int GIFPath_ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size, bool TestOnly)
+__forceinline int GIFPath_ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size)
 {
 #ifdef PCSX2_GSRING_SAMPLING_STATS
 	static uptr profStartPtr = 0;
@@ -515,7 +574,7 @@ __forceinline int GIFPath_ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size, b
 	}
 #endif
 
-	int retSize = s_gifPath[pathidx].ParseTag(pathidx, pMem, size, TestOnly);
+	int retSize = s_gifPath[pathidx].ParseTag(pathidx, pMem, size);
 
 #ifdef PCSX2_GSRING_SAMPLING_STATS
 	__asm
@@ -527,6 +586,14 @@ __forceinline int GIFPath_ParseTag(GIF_PATH pathidx, const u8* pMem, u32 size, b
 	return retSize;
 }
 
+//Quick version for queueing PATH1 data
+
+__forceinline int GIFPath_ParseTagQuick(GIF_PATH pathidx, const u8* pMem, u32 size)
+{
+	int retSize = s_gifPath[pathidx].ParseTagQuick(pathidx, pMem, size);
+	return retSize;
+}
+
 // Clears all GIFpath data to zero.
 void GIFPath_Reset()
 {

pcsx2/x86/microVU_Lower.inl

@@ -1106,7 +1106,7 @@ extern void gsPath1Interrupt();
 void __fastcall mVU_XGKICK_(u32 addr) {
 	addr &= 0x3ff;
 	u8* data  = microVU1.regs->Mem + (addr*16);
-	u32 diff  = 0x400 - addr;
+	u32 diff  = 0x400;
 	u32 size;
 	u8* pDest;
 	
@@ -1142,7 +1142,7 @@ void __fastcall mVU_XGKICK_(u32 addr) {
 	else
 	{
 		//DevCon.Warning("GIF APATH busy %x Holding for later  W %x, R %x", gifRegs->stat.APATH, Path1WritePos, Path1ReadPos);
-		size = GIFPath_ParseTag(GIF_PATH_1, data, diff, true);
+		size = GIFPath_ParseTagQuick(GIF_PATH_1, data, diff);
 		pDest = &Path1Buffer[Path1WritePos*16];
 
 		pxAssumeMsg((Path1WritePos+size < sizeof(Path1Buffer)), "XGKick Buffer Overflow detected on Path1Buffer!");
@@ -1162,7 +1162,7 @@ void __fastcall mVU_XGKICK_(u32 addr) {
 			memcpy_aligned(pDest, microVU1.regs->Mem + (addr*16), size*16);
 			Path1WritePos += size;
 		}
-		if(!gifRegs->stat.P1Q) CPU_INT(28, 16);
+		if(!gifRegs->stat.P1Q) CPU_INT(28, 128);
 		gifRegs->stat.P1Q = true;
 	}
 }

pcsx2/x86/sVU_Lower.cpp

@@ -1974,7 +1974,7 @@ void __fastcall VU1XGKICK_MTGSTransfer(u32 *pMem, u32 addr)
 {
 	addr &= 0x3fff;
 	u8* data  = VU1.Mem + (addr);
-	u32 diff  = 0x400 - (addr / 16);
+	u32 diff  = 0x400;
 	u32 size;
 	u8* pDest;
 
@@ -2005,7 +2005,7 @@ void __fastcall VU1XGKICK_MTGSTransfer(u32 *pMem, u32 addr)
 	else
 	{
 		//DevCon.Warning("GIF APATH busy %x Holding for later  W %x, R %x", gifRegs->stat.APATH, Path1WritePos, Path1ReadPos);
-		size = GIFPath_ParseTag(GIF_PATH_1, data, diff, true);
+		size = GIFPath_ParseTagQuick(GIF_PATH_1, data, diff);
 		pDest = &Path1Buffer[Path1WritePos*16];
 
 		pxAssumeMsg((Path1WritePos+size < sizeof(Path1Buffer)), "XGKick Buffer Overflow detected on Path1Buffer!");