X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobjectp.cpp;h=cee49356ccdd92889d84d60e7398e291343c8686;hb=847f593941ee60d7be72cd07309201bfdb3651f8;hp=ec468c9f0ca2ac12252a2de53007a2d8af2c70f3;hpb=67b922844ea7dd3fc3ff468b86db9c88e05f8acd;p=virtualjaguar

diff --git a/src/objectp.cpp b/src/objectp.cpp
index ec468c9..cee4935 100644
--- a/src/objectp.cpp
+++ b/src/objectp.cpp
@@ -316,6 +316,9 @@ extern int op_start_log;
 
 //	objectp_stop_reading_list = false;
 
+//WriteLog("OP: Processing line #%u (OLP=%08X)...\n", scanline, op_pointer);
+//op_done();
+
 // *** BEGIN OP PROCESSOR TESTING ONLY ***
 extern bool interactiveMode;
 extern bool iToggle;
@@ -337,6 +340,7 @@ else
 //			return;
 			
 		uint64 p0 = op_load_phrase(op_pointer);
+//WriteLog("\t%08X type %i\n", op_pointer, (uint8)p0 & 0x07);
 		op_pointer += 8;
 if (scanline == tom_get_vdb() && op_start_log)
 //if (scanline == 215 && op_start_log)
@@ -406,7 +410,6 @@ if ((p0 & 0x07) == OBJECT_TYPE_STOP)
 WriteLog("    --> List end\n");
 }//*/
 		
-//		WriteLog("%08X type %i\n", op_pointer, (uint8)p0 & 0x07);		
 		switch ((uint8)p0 & 0x07)
 		{
 		case OBJECT_TYPE_BITMAP:
@@ -454,7 +457,7 @@ if (!inhibit)	// For OP testing only!
 				// NOTE: Would subtract 2 if in interlaced mode...!
 //				uint64 height = ((p0 & 0xFFC000) - 0x4000) & 0xFFC000;
 //				if (height)
-					height--;
+				height--;
 
 				uint64 data = (p0 & 0xFFFFF80000000000LL) >> 40;
 				uint64 dwidth = (p1 & 0xFFC0000) >> 15;
@@ -465,7 +468,15 @@ if (!inhibit)	// For OP testing only!
 				p0 |= data << 40;
 				OPStorePhrase(oldOPP, p0);
 			}
+//WriteLog("\t\tOld OP: %08X -> ", op_pointer);
+//Temp, for testing...
+//No doubt, this type of check will break all kinds of stuff... !!! FIX !!!
+//And it does! !!! FIX !!!
+	if (op_pointer > ((p0 & 0x000007FFFF000000LL) >> 21))
+		return;
+
 			op_pointer = (p0 & 0x000007FFFF000000LL) >> 21;
+//WriteLog("New OP: %08X\n", op_pointer);
 			break;
 		}
 		case OBJECT_TYPE_SCALE:
@@ -506,12 +517,14 @@ if (!inhibit)	// For OP testing only!
 				if (vscale == 0)
 					vscale = 0x20;					// OP bug??? Nope, it isn't...! Or is it?
 
-/*extern int start_logging;
-if (start_logging)
-	WriteLog("--> Returned from scaled bitmap processing (rem=%02X, vscale=%02X)...\n", remainder, vscale);*/
+//extern int start_logging;
+//if (start_logging)
+//	WriteLog("--> Returned from scaled bitmap processing (rem=%02X, vscale=%02X)...\n", remainder, vscale);//*/
 //Locks up here:
 //--> Returned from scaled bitmap processing (rem=20, vscale=80)...
 //There are other problems here, it looks like...
+//Another lock up:
+//About to execute OP (508)...
 /*
 OP: Scaled bitmap 4x? 4bpp at 38,? hscale=7C fpix=0 data=00075E28 pitch 1 hflipped=no dwidth=? (linked to 00071118) Transluency=no
 --> Returned from scaled bitmap processing (rem=50, vscale=7C)...
@@ -576,8 +589,8 @@ OP: Scaled bitmap 4x? 4bpp at 34,? hscale=80 fpix=0 data=000756E8 pitch 1 hflipp
 
 				remainder -= 0x20;					// 1.0f in [3.5] fixed point format
 
-/*if (start_logging)
-	WriteLog("--> Finished writebacks...\n");*/
+//if (start_logging)
+//	WriteLog("--> Finished writebacks...\n");//*/
 
 //WriteLog(" [%08X%08X -> ", (uint32)(p2>>32), (uint32)(p2&0xFFFFFFFF));
 				p2 &= ~0x0000000000FF0000LL;
@@ -1265,6 +1278,13 @@ if (op_start_log && startPos == 13)
 {
 	WriteLog("OP: Scaled line. SP=%i, EP=%i, clip=%u, iwidth=%u, hscale=%02X, depth=%u, firstPix=%u\n", startPos, endPos, clippedWidth, iwidth, hscale, depth, firstPix);
 	DumpScaledObject(p0, p1, p2);
+	if (iwidth == 7)
+	{
+		WriteLog("    %08X: ", data);
+		for(int i=0; i<7*8; i++)
+			WriteLog("%02X ", JaguarReadByte(data+i));
+		WriteLog("\n");
+	}
 }
 	// If the image is sitting on the line buffer left or right edge, we need to compensate
 	// by decreasing the image phrase width accordingly.
@@ -1281,8 +1301,8 @@ if (op_start_log && startPos == 13)
 //	uint32 lbufAddress = 0x1800 + (!in24BPPMode ? startPos * 2 : startPos * 4);
 	uint32 lbufAddress = 0x1800 + startPos * 2;
 	uint8 * currentLineBuffer = &tom_ram_8[lbufAddress];
-uint8 * lineBufferLowerLimit = &tom_ram_8[0x1800],
-	* lineBufferUpperLimit = &tom_ram_8[0x1800 + 719];
+//uint8 * lineBufferLowerLimit = &tom_ram_8[0x1800],
+//	* lineBufferUpperLimit = &tom_ram_8[0x1800 + 719];
 
 	// Render.
 
@@ -1323,13 +1343,20 @@ if (firstPix != 0)
 
 			currentLineBuffer += lbufDelta;
 
-			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
+/*			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
 			while (horizontalRemainder & 0x80)
+			{
+				horizontalRemainder += hscale;
+				pixCount++;
+				pixels <<= 1;
+			}//*/
+			while (horizontalRemainder <= 0x20)		// I.e., it's <= 0 (*before* subtraction)
 			{
 				horizontalRemainder += hscale;
 				pixCount++;
 				pixels <<= 1;
 			}
+			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
 
 			if (pixCount > 63)
 			{
@@ -1375,13 +1402,20 @@ if (firstPix != 0)
 
 			currentLineBuffer += lbufDelta;
 
-			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
+/*			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
 			while (horizontalRemainder & 0x80)
+			{
+				horizontalRemainder += hscale;
+				pixCount++;
+				pixels <<= 2;
+			}//*/
+			while (horizontalRemainder <= 0x20)		// I.e., it's <= 0 (*before* subtraction)
 			{
 				horizontalRemainder += hscale;
 				pixCount++;
 				pixels <<= 2;
 			}
+			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
 
 			if (pixCount > 31)
 			{
@@ -1427,13 +1461,20 @@ if (firstPix != 0)
 
 			currentLineBuffer += lbufDelta;
 
-			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
+/*			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
 			while (horizontalRemainder & 0x80)
+			{
+				horizontalRemainder += hscale;
+				pixCount++;
+				pixels <<= 4;
+			}//*/
+			while (horizontalRemainder <= 0x20)		// I.e., it's <= 0 (*before* subtraction)
 			{
 				horizontalRemainder += hscale;
 				pixCount++;
 				pixels <<= 4;
 			}
+			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
 
 			if (pixCount > 15)
 			{
@@ -1482,13 +1523,13 @@ if (firstPix)
 
 			currentLineBuffer += lbufDelta;
 
-			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
-			while (horizontalRemainder & 0x80)
+			while (horizontalRemainder <= 0x20)		// I.e., it's <= 0 (*before* subtraction)
 			{
 				horizontalRemainder += hscale;
 				pixCount++;
 				pixels <<= 8;
 			}
+			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
 
 			if (pixCount > 7)
 			{
@@ -1532,13 +1573,20 @@ if (firstPix != 0)
 
 			currentLineBuffer += lbufDelta;
 
-			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
+/*			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
 			while (horizontalRemainder & 0x80)
+			{
+				horizontalRemainder += hscale;
+				pixCount++;
+				pixels <<= 16;
+			}//*/
+			while (horizontalRemainder <= 0x20)		// I.e., it's <= 0 (*before* subtraction)
 			{
 				horizontalRemainder += hscale;
 				pixCount++;
 				pixels <<= 16;
 			}
+			horizontalRemainder -= 0x20;		// Subtract 1.0f in [3.5] fixed point format
 
 			if (pixCount > 3)
 			{
@@ -1588,15 +1636,4 @@ if (firstPix != 0)
 			}
 		}
 	}
-/*if (depth == 3 && startPos == 13)
-{
-if (op_start_log)
-WriteLog("OP: Writing in the margins...\n");
-	for(int i=0; i<100*2; i+=2)
-//	for(int i=0; i<14*2; i+=2)
-		tom_ram_8[0x1800 + i] = 0xFF,
-		tom_ram_8[0x1800 + i + 1] = 0xFF;
-}*/
-//	uint32 lbufAddress = 0x1800 + (!in24BPPMode ? startPos * 2 : startPos * 4);
-//	uint8 * currentLineBuffer = &tom_ram_8[lbufAddress];
 }