Changeset 103433 in vbox for trunk/src/VBox/Debugger

Timestamp:

Feb 19, 2024 12:11:34 PM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161760

Message:

Debugger: Some warning fixes, bugref:3409

Location:

trunk/src/VBox/Debugger

Files:

• DBGCCommands.cpp (modified) (2 diffs)
• DBGCEmulateCodeView.cpp (modified) (12 diffs)
• DBGCEval.cpp (modified) (5 diffs)
• DBGCGdbRemoteStub.cpp (modified) (5 diffs)
• DBGCRemoteKd.cpp (modified) (2 diffs)

trunk/src/VBox/Debugger/DBGCCommands.cpp

@@ -1313 +1313 @@
         "none", "bytes", "elements"
     };
-    int rc;
+    int rc = VINF_SUCCESS;
 
     for (unsigned iArg = 0; iArg < cArgs; iArg++)
@@ -1426 +1426 @@
 
     NOREF(pCmd); NOREF(pUVM);
-    return 0;
+    return rc;
 }
 

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -1591 +1591 @@
         if (pszErr)
         {
+            uint32_t cchErr = (uint32_t)strlen(pszErr);
+
             pDumpBb->cchHeight++;
-            pDumpBb->cchWidth = RT_MAX(pDumpBb->cchWidth, (uint32_t)strlen(pszErr));
+            pDumpBb->cchWidth = RT_MAX(pDumpBb->cchWidth, cchErr);
         }
     }
@@ -1600 +1602 @@
         int rc = DBGFR3FlowBbQueryInstr(hFlowBb, i, NULL, NULL, &pszInstr);
         AssertRC(rc);
-        pDumpBb->cchWidth = RT_MAX(pDumpBb->cchWidth, (uint32_t)strlen(pszInstr));
+
+        uint32_t cchInstr = (uint32_t)strlen(pszInstr);
+        pDumpBb->cchWidth = RT_MAX(pDumpBb->cchWidth, cchInstr);
     }
     pDumpBb->cchWidth += 4; /* Include spacing and border left and right. */
@@ -1758 +1762 @@
  * Fills in the dump states for the basic blocks and branch tables.
  *
- * @returns VBox status code.
  * @param   hFlowIt             The control flow graph iterator handle.
  * @param   hFlowBranchTblIt    The control flow graph branch table iterator handle.
@@ -1766 +1769 @@
  * @param   cBranchTbls         Number of branch tables.
  */
-static int dbgcCmdUnassembleCfgDumpCalcDimensions(DBGFFLOWIT hFlowIt, DBGFFLOWBRANCHTBLIT hFlowBranchTblIt,
-                                                  PDBGCFLOWBBDUMP paDumpBb, PDBGCFLOWBRANCHTBLDUMP paDumpBranchTbl,
-                                                  uint32_t cBbs, uint32_t cBranchTbls)
+static void dbgcCmdUnassembleCfgDumpCalcDimensions(DBGFFLOWIT hFlowIt, DBGFFLOWBRANCHTBLIT hFlowBranchTblIt,
+                                                   PDBGCFLOWBBDUMP paDumpBb, PDBGCFLOWBRANCHTBLDUMP paDumpBranchTbl,
+                                                   uint32_t cBbs, uint32_t cBranchTbls)
 {
     RT_NOREF2(cBbs, cBranchTbls);
@@ -1795 +1798 @@
         }
     }
-
-    return VINF_SUCCESS;
 }
 
@@ -1829 +1830 @@
     if (RT_SUCCESS(rc))
     {
-        rc = dbgcCmdUnassembleCfgDumpCalcDimensions(hCfgIt, hFlowBranchTblIt, paDumpBb, paDumpBranchTbl,
-                                                    cBbs, cBranchTbls);
+        dbgcCmdUnassembleCfgDumpCalcDimensions(hCfgIt, hFlowBranchTblIt, paDumpBb, paDumpBranchTbl,
+                                               cBbs, cBranchTbls);
 
         /* Calculate the ASCII screen dimensions and create one. */
@@ -2167 +2168 @@
     }
 
+    int rc;
+#if 0 /** @todo Unused right now. */
     /*
      * Convert physical and host addresses to guest addresses.
      */
     RTDBGAS hDbgAs = pDbgc->hDbgAs;
-    int rc;
     switch (pDbgc->DisasmPos.enmType)
     {
@@ -2192 +2194 @@
         default: AssertFailed(); break;
     }
+#endif
 
     DBGFADDRESS CurAddr;
@@ -3163 +3166 @@
         }
     }
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -5067 +5070 @@
  * @param   cVars   The number of variables.
  */
-int dbgcVarsToBytes(PDBGCCMDHLP pCmdHlp, void *pvBuf, uint32_t *pcbBuf, size_t cbUnit, PCDBGCVAR paVars, unsigned cVars)
+static int dbgcVarsToBytes(PDBGCCMDHLP pCmdHlp, void *pvBuf, uint32_t *pcbBuf, size_t cbUnit, PCDBGCVAR paVars, unsigned cVars)
 {
     union
@@ -6644 +6647 @@
     pDbgc->pLastPos = &pDbgc->DisasmPos;
 
+
+    int rc;
+#if 0 /** @todo unused right now */
     /*
      * Convert physical and host addresses to guest addresses.
      */
     RTDBGAS hDbgAs = pDbgc->hDbgAs;
-    int rc;
     switch (pDbgc->DisasmPos.enmType)
     {
@@ -6669 +6674 @@
         default: AssertFailed(); break;
     }
+#endif
 
     DBGFADDRESS CurAddr;

trunk/src/VBox/Debugger/DBGCEval.cpp

@@ -96 +96 @@
  * @param   pDbgc               The DBGC instance.
  */
-size_t dbgcGetFreeScratchSpace(PDBGC pDbgc)
+static size_t dbgcGetFreeScratchSpace(PDBGC pDbgc)
 {
     return sizeof(pDbgc->achScratch) - (pDbgc->pszScratch - &pDbgc->achScratch[0]);
@@ -109 +109 @@
  * @param   cbRequested         The number of bytes to allocate.
  */
-char *dbgcAllocStringScatch(PDBGC pDbgc, size_t cbRequested)
+static char *dbgcAllocStringScatch(PDBGC pDbgc, size_t cbRequested)
 {
     if (cbRequested > dbgcGetFreeScratchSpace(pDbgc))
@@ -1091 +1091 @@
      */
     PDBGCVAR        pArg        = &pDbgc->aArgs[pDbgc->iArg];
-    PCDBGCVARDESC   pPrevDesc   = NULL;
     unsigned        cCurDesc    = 0;
-    unsigned        iVar        = 0;
     unsigned        iVarDesc    = 0;
     *pcArgs = 0;
@@ -1263 +1261 @@
             if (RT_SUCCESS(rc))
             {
-                pArg->pDesc = pPrevDesc = &paVarDescs[iVarDesc];
+                pArg->pDesc = &paVarDescs[iVarDesc];
                 cCurDesc++;
                 RTMemFree(pszArgsCopy);
@@ -1295 +1293 @@
          * Next argument.
          */
-        iVar++;
         pArg++;
         pDbgc->iArg++;

trunk/src/VBox/Debugger/DBGCGdbRemoteStub.cpp

@@ -1382 +1382 @@
             if (RT_SUCCESS(rc))
                 rc = dbgcGdbStubCtxReplySendData(pThis, &achReply[0], cchStr);
+            if (RT_SUCCESS(rc))
+                rc = dbgcGdbStubCtxReplySendEnd(pThis);
             pThis->idCpuNextThrdInfoQuery++;
         }
-
-        rc = dbgcGdbStubCtxReplySendEnd(pThis);
     }
 
@@ -1453 +1453 @@
         return VERR_NET_PROTOCOL_ERROR;
 
-    cbArgs--;
+    /*cbArgs--;*/ /* Not used */
     pbArgs++;
 
@@ -1567 +1567 @@
 
     pbArgs++;
-    cbArgs--;
+    /*cbArgs--;*/ /* Not used */
 
     /** @todo For now we don't care about multiple threads and ignore thread IDs and multiple actions. */
@@ -2419 +2419 @@
                     rc = pDbgc->CmdHlp.pfnExec(&pDbgc->CmdHlp, "r eflags.rf = 1");
             }
+
+            if (RT_FAILURE(rc))
+                pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "Executing the breakpoint %u (%s) failed with %Rrc!\n",
+                                        pEvent->u.Bp.hBp, dbgcGetEventCtx(pEvent->enmCtx), rc);
 
             rc = dbgcGdbStubCtxReplySendSigTrap(pThis);
@@ -2552 +2556 @@
  * @param   pThis   Pointer to the GDB stub context.
  */
-int dbgcGdbStubRun(PGDBSTUBCTX pThis)
+static int dbgcGdbStubRun(PGDBSTUBCTX pThis)
 {
     /* Select the register set based on the CPU mode. */

trunk/src/VBox/Debugger/DBGCRemoteKd.cpp

@@ -4292 +4292 @@
  * @param   pThis   Pointer to the KD context.
  */
-int dbgcKdRun(PKDCTX pThis)
+static int dbgcKdRun(PKDCTX pThis)
 {
     /*
@@ -4346 +4346 @@
              */
             if (pThis->Dbgc.pIo->pfnInput(pThis->Dbgc.pIo, 1000))
-            {
                 rc = dbgcKdCtxRecv(pThis);
-                if (RT_FAILURE(rc))
-                    break;
-            }
             else if (   pThis->msRecvTimeout != RT_INDEFINITE_WAIT
                      && (RTTimeMilliTS() - pThis->tsRecvLast >= pThis->msRecvTimeout))
                 rc = dbgcKdCtxRecvTimeout(pThis);
+
+            if (RT_FAILURE(rc))
+                break;
         }
         else