Fix for bad branch handling in OP.

[virtualjaguar] / src / gui / debug / opbrowser.cpp

diff --git a/src/gui/debug/opbrowser.cpp b/src/gui/debug/opbrowser.cpp
index 3c1d2eab17800a0be0038329aeed8f97d42f056b..c4193d8798ce8438e0c183477aaf2970d2fa4c49 100644 (file)
--- a/src/gui/debug/opbrowser.cpp
+++ b/src/gui/debug/opbrowser.cpp
@@ -30,6 +30,8 @@ OPBrowserWindow::OPBrowserWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::D
 //     resize(560, 480);
 
        QFont fixedFont("Lucida Console", 8, QFont::Normal);
+//     QFont fixedFont("", 8, QFont::Normal);
+       fixedFont.setStyleHint(QFont::TypeWriter);
        text->setFont(fixedFont);
 ////   layout->setSizeConstraint(QLayout::SetFixedSize);
        setLayout(layout);
@@ -105,9 +107,13 @@ void OPBrowserWindow::DiscoverObjects(uint32_t address)
 
                if (objectType == 3)
                {
-                       // Recursion needed to follow all links! This does depth-first recursion
-                       // on the not-taken objects
-                       DiscoverObjects(address + 8);
+                       // Branch if YPOS < 2047 can be treated as a GOTO, so don't do any
+                       // discovery in that case. Otherwise, have at it:
+                       if ((lo & 0xFFFF) != 0x7FFB)
+                       // Recursion needed to follow all links! This does depth-first
+                       // recursion on the not-taken objects (N.B.: The object following
+                       // the branch object is at +16, not +8!)
+                               DiscoverObjects(address + 16);
                }
 
                // Get the next object...
@@ -137,7 +143,6 @@ void OPBrowserWindow::DumpObjectList(QString & list)
                uint32_t lo = JaguarReadLong(address + 4, OP);
                uint8_t objectType = lo & 0x07;
                uint32_t link = ((hi << 11) | (lo >> 21)) & 0x3FFFF8;
-//             WriteLog("%08X: %08X %08X %s", address, hi, lo, opType[objectType]);
                sprintf(buf, "<br>%06X: %08X %08X %s -> %06X", address, hi, lo, opType[objectType], link);
                list += QString(buf);
 
@@ -145,32 +150,28 @@ void OPBrowserWindow::DumpObjectList(QString & list)
                {
                        uint16_t ypos = (lo >> 3) & 0x7FF;
                        uint8_t  cc   = (lo >> 14) & 0x07;      // Proper # of bits == 3
-//                     WriteLog(" YPOS=%u, CC=%s, link=$%08X", ypos, ccType[cc], link);
-//                     sprintf(buf, " YPOS=%u, CC=%s, link=$%08X", ypos, ccType[cc], link);
                        sprintf(buf, " YPOS %s %u", ccType[cc], ypos);
                        list += QString(buf);
                }
 
-//             WriteLog("\n");
                list += "<br>";
 
                if (objectType == 0)
-                       DumpFixedObject(list, OPLoadPhrase(address + 0), OPLoadPhrase(address + 8));
+                       DumpFixedObject(list, OPLoadPhrase(address + 0),
+                               OPLoadPhrase(address + 8));
 
                if (objectType == 1)
-                       DumpScaledObject(list, OPLoadPhrase(address + 0), OPLoadPhrase(address + 8),
-                               OPLoadPhrase(address + 16));
+                       DumpScaledObject(list, OPLoadPhrase(address + 0),
+                               OPLoadPhrase(address + 8), OPLoadPhrase(address + 16));
 
                if (address == link)    // Ruh roh...
                {
                        // Runaway recursive link is bad!
-//                     WriteLog("***** SELF REFERENTIAL LINK *****\n\n");
                        sprintf(buf, "***** SELF REFERENTIAL LINK *****<br>");
                        list += QString(buf);
                }
        }
 
-//     WriteLog("\n");
        list += "<br>";
 }
 
@@ -179,17 +180,14 @@ void OPBrowserWindow::DumpScaledObject(QString & list, uint64_t p0, uint64_t p1,
 {
        char buf[512];
 
-//     WriteLog("          %08X %08X\n", (uint32)(p1>>32), (uint32)(p1&0xFFFFFFFF));
-       sprintf(buf, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%08X %08X<br>", (uint32)(p1>>32), (uint32)(p1&0xFFFFFFFF));
+       sprintf(buf, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%08X %08X<br>", (uint32_t)(p1 >> 32), (uint32_t)(p1 & 0xFFFFFFFF));
        list += QString(buf);
-//     WriteLog("          %08X %08X\n", (uint32)(p2>>32), (uint32)(p2&0xFFFFFFFF));
-       sprintf(buf, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%08X %08X<br>", (uint32)(p2>>32), (uint32)(p2&0xFFFFFFFF));
+       sprintf(buf, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%08X %08X<br>", (uint32_t)(p2 >> 32), (uint32_t)(p2 & 0xFFFFFFFF));
        list += QString(buf);
        DumpBitmapCore(list, p0, p1);
-       uint32 hscale = p2 & 0xFF;
-       uint32 vscale = (p2 >> 8) & 0xFF;
-       uint32 remainder = (p2 >> 16) & 0xFF;
-//     WriteLog("    [hsc: %02X, vsc: %02X, rem: %02X]\n", hscale, vscale, remainder);
+       uint32_t hscale = p2 & 0xFF;
+       uint32_t vscale = (p2 >> 8) & 0xFF;
+       uint32_t remainder = (p2 >> 16) & 0xFF;
        sprintf(buf, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[hsc: %02X, vsc: %02X, rem: %02X]<br>", hscale, vscale, remainder);
        list += QString(buf);
 }
@@ -199,8 +197,7 @@ void OPBrowserWindow::DumpFixedObject(QString & list, uint64_t p0, uint64_t p1)
 {
        char buf[512];
 
-//     WriteLog("          %08X %08X\n", (uint32)(p1>>32), (uint32)(p1&0xFFFFFFFF));
-       sprintf(buf, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%08X %08X<br>", (uint32)(p1>>32), (uint32)(p1&0xFFFFFFFF));
+       sprintf(buf, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%08X %08X<br>", (uint32_t)(p1 >> 32), (uint32_t)(p1 & 0xFFFFFFFF));
        list += QString(buf);
        DumpBitmapCore(list, p0, p1);
 }
@@ -226,18 +223,13 @@ void OPBrowserWindow::DumpBitmapCore(QString & list, uint64_t p0, uint64_t p1)
        uint8_t flags = (p1 >> 45) & 0x0F;
        uint8_t idx = (p1 >> 38) & 0x7F;
        uint32_t pitch = (p1 >> 15) & 0x07;
-//     WriteLog("    [%u x %u @ (%i, %u) (iw:%u, dw:%u) (%u bpp), l:%08X, p:%08X fp:%02X, fl:%s%s%s%s, idx:%02X, pt:%02X]\n",
-//             iwidth * bdMultiplier[bitdepth],
-//             height, xpos, ypos, iwidth, dwidth, op_bitmap_bit_depth[bitdepth], link,
-//             ptr, firstPix, (flags&OPFLAG_REFLECT ? "REFLECT " : ""),
-//             (flags&OPFLAG_RMW ? "RMW " : ""), (flags&OPFLAG_TRANS ? "TRANS " : ""),
-//             (flags&OPFLAG_RELEASE ? "RELEASE" : ""), idx, pitch);
+
        sprintf(buf, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[%u x %u @ (%i, %u) (iw:%u, dw:%u) (%u bpp), p:%06X fp:%02X, fl:%s%s%s%s, idx:%02X, pt:%02X]<br>",
                iwidth * bdMultiplier[bitdepth],
                height, xpos, ypos, iwidth, dwidth, op_bitmap_bit_depth[bitdepth],
-               ptr, firstPix, (flags&OPFLAG_REFLECT ? "REFLECT " : ""),
-               (flags&OPFLAG_RMW ? "RMW " : ""), (flags&OPFLAG_TRANS ? "TRANS " : ""),
-               (flags&OPFLAG_RELEASE ? "RELEASE" : ""), idx, pitch);
+               ptr, firstPix, (flags & OPFLAG_REFLECT ? "REFLECT " : ""),
+               (flags & OPFLAG_RMW ? "RMW " : ""), (flags & OPFLAG_TRANS ? "TRANS " : ""),
+               (flags & OPFLAG_RELEASE ? "RELEASE" : ""), idx, pitch);
        list += QString(buf);
 }