X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobjectp.cpp;h=37e7ff56ee9fa7d04c3bd034b0d54d3e42be69cf;hb=42a0fe10ada4fb012e64ae248073d23325d59016;hp=82374714df09f98992c0aeda781148988f63b181;hpb=59ca39a29be645918de45bd144865ba6487f4009;p=virtualjaguar diff --git a/src/objectp.cpp b/src/objectp.cpp index 8237471..37e7ff5 100644 --- a/src/objectp.cpp +++ b/src/objectp.cpp @@ -6,8 +6,8 @@ // Extensive cleanups/fixes/rewrites by James L. Hammons // -#include -#include +//#include +//#include #include #include "jaguar.h" @@ -143,6 +143,9 @@ void op_done(void) DumpScaledObject(op_load_phrase(olp+i), op_load_phrase(olp+i+8), op_load_phrase(olp+i+16)); } WriteLog("\n"); + + memory_free(op_blend_y); + memory_free(op_blend_cr); } // @@ -327,6 +330,8 @@ bool inhibit; int bitmapCounter = 0; // *** END OP PROCESSOR TESTING ONLY *** + uint32 opCyclesToRun = 10000; // This is a pulled-out-of-the-air value (will need to be fixed, obviously!) + // if (op_pointer) WriteLog(" new op list at 0x%.8x scanline %i\n",op_pointer,scanline); while (op_pointer) { @@ -344,6 +349,7 @@ else op_pointer += 8; if (scanline == tom_get_vdb() && op_start_log) //if (scanline == 215 && op_start_log) +//if (scanline == 28 && op_start_log) { WriteLog("%08X --> phrase %08X %08X", op_pointer - 8, (int)(p0>>32), (int)(p0&0xFFFFFFFF)); if ((p0 & 0x07) == OBJECT_TYPE_BITMAP) @@ -457,7 +463,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; @@ -471,8 +477,10 @@ if (!inhibit) // For OP testing only! //WriteLog("\t\tOld OP: %08X -> ", op_pointer); //Temp, for testing... //No doubt, this type of check will break all kinds of stuff... !!! FIX !!! - if (op_pointer > ((p0 & 0x000007FFFF000000LL) >> 21)) - return; +//And it does! !!! FIX !!! +//Let's remove this "fix" since it screws up more than it fixes. +/* if (op_pointer > ((p0 & 0x000007FFFF000000LL) >> 21)) + return;*/ op_pointer = (p0 & 0x000007FFFF000000LL) >> 21; //WriteLog("New OP: %08X\n", op_pointer); @@ -676,6 +684,13 @@ OP: Scaled bitmap 4x? 4bpp at 34,? hscale=80 fpix=0 data=000756E8 pitch 1 hflipp WriteLog("op: unknown object type %i\n", ((uint8)p0 & 0x07)); return; } + + // Here is a little sanity check to keep the OP from locking up the machine + // when fed bad data. Better would be to count how many actual cycles it used + // and bail out/reenter to properly simulate an overloaded OP... !!! FIX !!! + opCyclesToRun--; + if (!opCyclesToRun) + return; } } @@ -1128,8 +1143,10 @@ if (firstPix) uint16 * paletteRAM16 = (uint16 *)paletteRAM; uint8 hscale = p2 & 0xFF; -// uint8 horizontalRemainder = hscale; // Not sure if it starts full, but seems reasonable [It's not!] - uint8 horizontalRemainder = 0; // Let's try zero! Seems to work! Yay! +// Hmm. It seems that fixing the horizontal scale necessitated re-fixing this. Not sure why, +// but seems to be consistent with the vertical scaling now (and it may turn out to be wrong!)... + uint8 horizontalRemainder = hscale; // Not sure if it starts full, but seems reasonable [It's not!] +// uint8 horizontalRemainder = 0; // Let's try zero! Seems to work! Yay! [No, it doesn't!] int32 scaledWidthInPixels = (iwidth * phraseWidthToPixels[depth] * hscale) >> 5; uint32 scaledPhrasePixels = (phraseWidthToPixels[depth] * hscale) >> 5; @@ -1277,6 +1294,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. @@ -1293,8 +1317,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. @@ -1335,13 +1359,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) { @@ -1387,13 +1418,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) { @@ -1439,13 +1477,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) { @@ -1494,13 +1539,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) { @@ -1544,14 +1589,21 @@ 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) { int phrasesToSkip = pixCount / 4, pixelShift = pixCount % 4; @@ -1600,15 +1652,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]; }