Changeset 38804 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Sep 20, 2011 2:34:02 PM (13 years ago)

Author:

vboxsync

Message:

DevVGA.cpp: vgatext fixes and a tiny extension - args: all, scr, screen. Minor code cleanups.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (16 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -4112 +4112 @@
 }
 
+
+/**
+ * Prints a separator line. 
+ *  
+ * @param   pHlp                Callback functions for doing output.
+ * @param   cCols               The number of columns.
+ * @param   pszTitle            The title text, NULL if none.
+ */
+static void vgaInfoTextPrintSeparatorLine(PCDBGFINFOHLP pHlp, uint32_t cCols, const char *pszTitle)
+{
+    if (pszTitle) 
+    {
+        size_t cchTitle = strlen(pszTitle);
+        if (cchTitle + 6 >= cCols) 
+        {
+            pHlp->pfnPrintf(pHlp, "-- %s --", pszTitle);
+            cCols = 0;
+        }
+        else
+        {
+            uint32_t cchLeft = (cCols - cchTitle - 2) / 2;
+            cCols -= cchLeft + cchTitle + 2;
+            while (cchLeft-- > 0) 
+                pHlp->pfnPrintf(pHlp, "-");
+            pHlp->pfnPrintf(pHlp, " %s ", pszTitle);
+        }
+    }
+
+    while (cCols-- > 0) 
+        pHlp->pfnPrintf(pHlp, "-");
+    pHlp->pfnPrintf(pHlp, "\n");
+}
+
+
+/**
+ * Worker for vgaInfoText.
+ *
+ * @param   pThis       The vga state.
+ * @param   pHlp        Callback functions for doing output. 
+ * @param   offStart    Where to start dumping (relative to the VRAM). 
+ * @param   cbLine      The source line length (aka line_offset). 
+ * @param   cCols       The number of columns on the screen. 
+ * @param   cRows       The number of rows to dump.
+ * @param   iScrBegin   The row at which the current screen output starts. 
+ * @param   iScrEnd     The row at which the current screen output end 
+ *                      (exclusive).
+ */
+static void vgaInfoTextWorker(PVGASTATE pThis, PCDBGFINFOHLP pHlp, 
+                              uint32_t offStart, uint32_t cbLine,
+                              uint32_t cCols, uint32_t cRows, 
+                              uint32_t iScrBegin, uint32_t iScrEnd)
+{
+    /* Title, */
+    char szTitle[32];
+    if (iScrBegin || iScrEnd < cRows) 
+        RTStrPrintf(szTitle, sizeof(szTitle), "%ux%u (+%u before, +%u after)", 
+                    cCols, iScrEnd - iScrBegin, iScrBegin, cRows - iScrEnd);
+    else
+        RTStrPrintf(szTitle, sizeof(szTitle), "%ux%u", cCols, iScrEnd - iScrBegin);
+
+    /* Do the dumping. */
+    uint8_t const *pbSrcOuter = pThis->CTX_SUFF(vram_ptr) + offStart;
+    uint32_t iRow;
+    for (iRow = 0; iRow < cRows; iRow++, pbSrcOuter += cbLine)
+    {
+        if ((uintptr_t)(pbSrcOuter + cbLine - pThis->CTX_SUFF(vram_ptr)) > pThis->vram_size) {
+            pHlp->pfnPrintf(pHlp, "The last %u row/rows is/are outside the VRAM.\n", cRows - iRow);
+            break;
+        }
+
+        if (iRow == 0)
+            vgaInfoTextPrintSeparatorLine(pHlp, cCols, szTitle);
+        else if (iRow == iScrBegin)
+            vgaInfoTextPrintSeparatorLine(pHlp, cCols, "screen start");
+        else if (iRow == iScrEnd)
+            vgaInfoTextPrintSeparatorLine(pHlp, cCols, "screen end");
+
+        uint8_t const *pbSrc = pbSrcOuter;
+        for (uint32_t iCol = 0; iCol < cCols; ++iCol)
+        {
+            if (RT_C_IS_PRINT(*pbSrc))
+                pHlp->pfnPrintf(pHlp, "%c", *pbSrc);
+            else
+                pHlp->pfnPrintf(pHlp, ".");
+            pbSrc += 8;   /* chars are spaced 8 bytes apart */
+        }
+        pHlp->pfnPrintf(pHlp, "\n");
+    }
+
+    /* Final separator. */
+    vgaInfoTextPrintSeparatorLine(pHlp, cCols, NULL);
+}
+
+
 /**
  * Info handler, device version. Dumps VGA memory formatted as
@@ -4123 +4217 @@
 {
     PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+
+    /* 
+     * Parse args.
+     */
+    bool fAll = true;
+    if (pszArgs && *pszArgs)
+    {
+        if (!strcmp(pszArgs, "all")) 
+            fAll = true;
+        else if (!strcmp(pszArgs, "scr") || !strcmp(pszArgs, "screen")) 
+            fAll = false;
+        else
+        {
+            pHlp->pfnPrintf(pHlp, "Invalid argument: '%s'\n", pszArgs);
+            return;
+        }
+    }
+
+    /*
+     * Check that we're in text mode and that the VRAM is accessible.
+     */
     if (!(pThis->gr[6] & 1))
     {
@@ -4139 +4254 @@
             uint32_t offStart;
             uint32_t uLineCompareIgn;
-            uint32_t uVDisp;
-            uint32_t uCharHeight;
-            uint32_t uLines;
-            uint32_t uDblScan;
-
             vga_get_offsets(pThis, &cbLine, &offStart, &uLineCompareIgn);
             if (!cbLine)
                 cbLine = 80 * 8;
-
-            uVDisp = pThis->cr[0x12] + ((pThis->cr[7] & 2) << 7) + ((pThis->cr[7] & 0x40) << 4) + 1;
-            uCharHeight = (pThis->cr[9] & 0x1f) + 1;
-            uDblScan = pThis->cr[9] >> 7;
-            uLines = uVDisp / (uCharHeight << uDblScan);
-            if (uLines < 25)
-                uLines = 25;
-
-            uint32_t cRows = offStart / cbLine + uLines;
-            uint32_t cCols = cbLine / 8;
-            if (cRows * cCols * 8 <= pThis->vram_size)
-            {
-                /*
-                 * Do the dumping.
-                 */
-                uint32_t row, col;
-                for (col = 0; col < cCols; ++col)
-                    pHlp->pfnPrintf(pHlp, "-");
-                pHlp->pfnPrintf(pHlp, "\n");
-                for (row = 0; row < cRows; ++row)
-                {
-                    if (offStart != 0 && pbSrc == pThis->vram_ptrR3 + offStart)
-                        for (col = 0; col < cCols; ++col)
-                            pHlp->pfnPrintf(pHlp, "-");
-                    for (col = 0; col < cCols; ++col)
-                    {
-                        if (RT_C_IS_PRINT(*pbSrc))
-                            pHlp->pfnPrintf(pHlp, "%c", *pbSrc);
-                        else
-                            pHlp->pfnPrintf(pHlp, ".");
-                        pbSrc += 8;   /* chars are spaced 8 bytes apart */
-                    }
-                    pbSrc += cbLine & 7;
-                    pHlp->pfnPrintf(pHlp, "\n");
-                }
-                for (col = 0; col < cCols; ++col)
-                    pHlp->pfnPrintf(pHlp, "-");
-                pHlp->pfnPrintf(pHlp, "\n");
+            offStart *= 8;
+
+            uint32_t uVDisp      = pThis->cr[0x12] + ((pThis->cr[7] & 2) << 7) + ((pThis->cr[7] & 0x40) << 4) + 1;
+            uint32_t uCharHeight = (pThis->cr[9] & 0x1f) + 1;
+            uint32_t uDblScan    = pThis->cr[9] >> 7;
+            uint32_t cScrRows    = uVDisp / (uCharHeight << uDblScan);
+            if (cScrRows < 25)
+                cScrRows = 25;
+            uint32_t iScrBegin   = offStart / cbLine;
+            uint32_t cRows       = iScrBegin + cScrRows;
+            uint32_t cCols       = cbLine / 8;
+
+            if (fAll) {
+                vgaInfoTextWorker(pThis, pHlp, offStart - iScrBegin * cbLine, cbLine, 
+                                  cCols, cRows, iScrBegin, iScrBegin + cScrRows);
+            } else {
+                vgaInfoTextWorker(pThis, pHlp, offStart, cbLine, cCols, cScrRows, 0, cScrRows);
             }
-            else
-                pHlp->pfnPrintf(pHlp, "Outside VRAM! (%ux%u)\n", cRows, cCols);
         }
         else
@@ -4195 +4282 @@
         pHlp->pfnPrintf(pHlp, "Not in text mode!\n");
 }
+
 
 /**
@@ -4211 +4299 @@
     Assert(sizeof(s->sr) >= 8);
     for (i = 0; i < 5; ++i)
-    {
         pHlp->pfnPrintf(pHlp, " SR%02X:%02X", i, s->sr[i]);
-    }
     pHlp->pfnPrintf(pHlp, "\n");
 }
+
 
 /**
@@ -4248 +4335 @@
 }
 
+
 /**
  * Info handler, device version. Dumps VGA Graphics Controller registers.
@@ -4268 +4356 @@
     pHlp->pfnPrintf(pHlp, "\n");
 }
+
 
 /**
@@ -4316 +4405 @@
     }
 }
+
 
 /**
@@ -4347 +4437 @@
 }
 
+
 /* -=-=-=-=-=- Ring 3: IBase -=-=-=-=-=- */
 
@@ -4468 +4559 @@
 }
 
-/* Internal worker called under pThis->lock. */
+
+/** 
+ * Internal vgaPortUpdateDisplayAll worker called under pThis->lock. 
+ */ 
 static int updateDisplayAll(PVGASTATE pThis)
 {
@@ -4475 +4569 @@
     /* The dirty bits array has been just cleared, reset handlers as well. */
     if (pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS32)
-    {
         PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
-    }
     if (pThis->fRemappedVGA)
     {
@@ -4547 +4639 @@
     return VINF_SUCCESS;
 }
+
 
 /**
@@ -4580 +4673 @@
 
     /*
-     * The display connector interface is temporarily replaced with the fake one.
-     */
-    PDMIDISPLAYCONNECTOR Connector;
-    memset(&Connector, 0, sizeof (PDMIDISPLAYCONNECTOR));
-
-    /*
-     * Allocate the buffer for 32 bits per pixel bitmap.
+     * Allocate the buffer for 32 bits per pixel bitmap                       
+     *                                                                        
+     * Note! The size can't be zero or greater than the size of the VRAM.
+     *       Inconsistent VGA device state can cause the incorrect size values.
      */
     size_t cbRequired = pThis->last_scr_width * 4 * pThis->last_scr_height;
-
-    /* The size can't be zero or greater than the size of the VRAM.
-     * Inconsistent VGA device state can cause the incorrect size values.
-     */
     if (cbRequired && cbRequired <= pThis->vram_size)
     {
         uint8_t *pu8Data = (uint8_t *)RTMemAlloc(cbRequired);
-
-        if (pu8Data == NULL)
-        {
-            rc = VERR_NO_MEMORY;
-        }
-        else
+        if (pu8Data != NULL)
         {
             /*
@@ -4607 +4688 @@
              * All other are already set to NULL.
              */
-
+            /* The display connector interface is temporarily replaced with the fake one. */
+            PDMIDISPLAYCONNECTOR Connector;
+            RT_ZERO(Connector);
             Connector.pu8Data       = pu8Data;
             Connector.cBits         = 32;
@@ -4626 +4709 @@
             pThis->fRenderVRAM = 1;             /* force the guest VRAM rendering to the given buffer. */
 
-            /* Make the screenshot.
+            /* 
+             * Make the screenshot.
              *
              * The second parameter is 'false' because the current display state is being rendered to an
@@ -4654 +4738 @@
                 /* If we do not return a success, then the data buffer must be freed. */
                 RTMemFree(pu8Data);
+                if (RT_SUCCESS_NP(rc))
+                {
+                    AssertMsgFailed(("%Rrc\n", rc));
+                    rc = VERR_INTERNAL_ERROR_5;
+                }
             }
         }
+        else
+            rc = VERR_NO_MEMORY;
     }
     else