Changeset 64507 in vbox for trunk/src/VBox/VMM/VMMR3/DBGFR3Cfg.cpp

Timestamp:

Nov 1, 2016 12:05:15 PM (8 years ago)

Author:

vboxsync

Message:

DBGFR3Cfg: Bugfixes, correctly split a basic block transferring any errors and setting the correct end address

File:

• trunk/src/VBox/VMM/VMMR3/DBGFR3Cfg.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFR3Cfg.cpp

@@ -464 +464 @@
         {
             /* Move instructions over. */
-            pCfgBbNew->cInstr = cInstrNew;
-            pCfgBbNew->AddrEnd = pCfgBb->AddrEnd;
+            pCfgBbNew->cInstr     = cInstrNew;
+            pCfgBbNew->AddrEnd    = pCfgBb->AddrEnd;
             pCfgBbNew->enmEndType = pCfgBb->enmEndType;
+            pCfgBbNew->fFlags     = pCfgBb->fFlags & ~DBGF_CFG_BB_F_ENTRY;
+
+            /* Move any error to the new basic block and clear them in the old basic block. */
+            pCfgBbNew->rcError    = pCfgBb->rcError;
+            pCfgBbNew->pszErr     = pCfgBb->pszErr;
+            pCfgBb->rcError       = VINF_SUCCESS;
+            pCfgBb->pszErr        = NULL;
+            pCfgBb->fFlags       &= ~DBGF_CFG_BB_F_INCOMPLETE_ERR;
 
             memcpy(&pCfgBbNew->aInstr[0], &pCfgBb->aInstr[idxInstrSplit], cInstrNew * sizeof(DBGFCFGBBINSTR));
             pCfgBb->cInstr     = idxInstrSplit;
             pCfgBb->enmEndType = DBGFCFGBBENDTYPE_UNCOND;
-            pCfgBb->AddrEnd    = pCfgBb->aInstr[idxInstrSplit].AddrInstr;
+            pCfgBb->AddrEnd    = pCfgBb->aInstr[idxInstrSplit-1].AddrInstr;
             pCfgBb->AddrTarget = pCfgBbNew->AddrStart;
-            DBGFR3AddrAdd(&pCfgBb->AddrEnd, pCfgBb->aInstr[idxInstrSplit].cbInstr - 1);
+            DBGFR3AddrAdd(&pCfgBb->AddrEnd, pCfgBb->aInstr[idxInstrSplit-1].cbInstr - 1);
             RT_BZERO(&pCfgBb->aInstr[idxInstrSplit], cInstrNew * sizeof(DBGFCFGBBINSTR));
 
@@ -584 +592 @@
             break;
         }
+
+        pCfgBb->fFlags &= ~DBGF_CFG_BB_F_EMPTY;
 
         rc = dbgfR3DisasInstrStateEx(pUVM, idCpu, &AddrDisasm, fFlags,
@@ -610 +620 @@
                 PDBGFCFGBBINSTR pInstr = &pCfgBb->aInstr[pCfgBb->cInstr];
 
-                pCfgBb->fFlags &= ~DBGF_CFG_BB_F_EMPTY;
-
                 pInstr->AddrInstr = AddrDisasm;
                 pInstr->cbInstr   = DisState.cbInstr;
@@ -618 +626 @@
 
                 pCfgBb->AddrEnd = AddrDisasm;
-                DBGFR3AddrSub(&pCfgBb->AddrEnd, 1);
+                DBGFR3AddrAdd(&pCfgBb->AddrEnd, pInstr->cbInstr - 1);
                 DBGFR3AddrAdd(&AddrDisasm, pInstr->cbInstr);
 
@@ -1007 +1015 @@
     pDumpBb->pCfgBb = pCfgBb;
     pDumpBb->cchHeight = pCfgBb->cInstr + 4; /* Include spacing and border top and bottom. */
+    pDumpBb->cchWidth = 0;
     if (   RT_FAILURE(pCfgBb->rcError)
         && pCfgBb->pszErr)
@@ -1013 +1022 @@
         pDumpBb->cchWidth = RT_MAX(pDumpBb->cchWidth, (uint32_t)strlen(pCfgBb->pszErr));
     }
-    pDumpBb->cchWidth = 0;
     for (unsigned i = 0; i < pCfgBb->cInstr; i++)
         pDumpBb->cchWidth = RT_MAX(pDumpBb->cchWidth, (uint32_t)strlen(pCfgBb->aInstr[i].pszInstr));
@@ -1178 +1186 @@
             cchWidth = RT_MAX(cchWidth, pDumpBb->cchWidth);
             cchHeight += pDumpBb->cchHeight;
+
+            /* Incomplete blocks don't have a successor. */
+            if (pDumpBb->pCfgBb->fFlags & DBGF_CFG_BB_F_INCOMPLETE_ERR)
+                continue;
+
             switch (pDumpBb->pCfgBb->enmEndType)
             {
@@ -1222 +1235 @@
                 uY += paDumpBb[i].cchHeight;
 
+                /* Incomplete blocks don't have a successor. */
+                if (paDumpBb[i].pCfgBb->fFlags & DBGF_CFG_BB_F_INCOMPLETE_ERR)
+                    continue;
+
                 switch (paDumpBb[i].pCfgBb->enmEndType)
                 {
@@ -1247 +1264 @@
             {
                 PDBGFCFGDUMPBB pDumpBb = &paDumpBb[i];
+
+                /* Incomplete blocks don't have a successor. */
+                if (pDumpBb->pCfgBb->fFlags & DBGF_CFG_BB_F_INCOMPLETE_ERR)
+                    continue;
 
                 switch (pDumpBb->pCfgBb->enmEndType)