Changeset 35694 in vbox

Timestamp:

Jan 24, 2011 5:35:59 PM (14 years ago)

Author:

vboxsync

Message:

Debugger console: more cleanup.

Location:

trunk

Files:

• include/VBox/dbg.h (modified) (5 diffs)
• include/VBox/vmm/dbgf.h (modified) (1 diff)
• src/VBox/Debugger/DBGCCmdHlp.cpp (modified) (18 diffs)
• src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (29 diffs)
• src/VBox/Debugger/DBGCInternal.h (modified) (2 diffs)
• src/VBox/VMM/VMMR3/CSAM.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/DBGFBp.cpp (modified) (15 diffs)
• src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMR3/STAM.cpp (modified) (5 diffs)
• src/VBox/VMM/include/DBGFInternal.h (modified) (1 diff)
• src/recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/include/VBox/dbg.h

@@ -371 +371 @@
 typedef struct DBGCCMDHLP *PDBGCCMDHLP;
 
-/**
- * Command helper for writing text to the debug console.
- *
- * @returns VBox status.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pvBuf       What to write.
- * @param   cbBuf       Number of bytes to write.
- * @param   pcbWritten  Where to store the number of bytes actually written.
- *                      If NULL the entire buffer must be successfully written.
- */
-typedef DECLCALLBACK(int) FNDBGCHLPWRITE(PDBGCCMDHLP pCmdHlp, const void *pvBuf, size_t cbBuf, size_t *pcbWritten);
-/** Pointer to a FNDBGCHLPWRITE() function. */
-typedef FNDBGCHLPWRITE *PFNDBGCHLPWRITE;
-
-/**
- * Command helper for writing formatted text to the debug console.
- *
- * @returns VBox status.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pcb         Where to store the number of bytes written.
- * @param   pszFormat   The format string.
- *                      This is using the log formatter, so it's format extensions can be used.
- * @param   ...         Arguments specified in the format string.
- */
-typedef DECLCALLBACK(int) FNDBGCHLPPRINTF(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten, const char *pszFormat, ...);
-/** Pointer to a FNDBGCHLPPRINTF() function. */
-typedef FNDBGCHLPPRINTF *PFNDBGCHLPPRINTF;
-
-/**
- * Command helper for writing formatted text to the debug console.
- *
- * @returns VBox status.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pcb         Where to store the number of bytes written.
- * @param   pszFormat   The format string.
- *                      This is using the log formatter, so it's format extensions can be used.
- * @param   args        Arguments specified in the format string.
- */
-typedef DECLCALLBACK(int) FNDBGCHLPPRINTFV(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten, const char *pszFormat, va_list args);
-/** Pointer to a FNDBGCHLPPRINTFV() function. */
-typedef FNDBGCHLPPRINTFV *PFNDBGCHLPPRINTFV;
-
-/**
- * Command helper for formatting and error message for a VBox status code.
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   rc          The VBox status code.
- * @param   pszFormat   Format string for additional messages. Can be NULL.
- * @param   ...         Format arguments, optional.
- */
-typedef DECLCALLBACK(int) FNDBGCHLPVBOXERROR(PDBGCCMDHLP pCmdHlp, int rc, const char *pszFormat, ...);
-/** Pointer to a FNDBGCHLPVBOXERROR() function. */
-typedef FNDBGCHLPVBOXERROR *PFNDBGCHLPVBOXERROR;
-
-/**
- * Command helper for formatting and error message for a VBox status code.
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   rc          The VBox status code.
- * @param   pcb         Where to store the number of bytes written.
- * @param   pszFormat   Format string for additional messages. Can be NULL.
- * @param   args        Format arguments, optional.
- */
-typedef DECLCALLBACK(int) FNDBGCHLPVBOXERRORV(PDBGCCMDHLP pCmdHlp, int rc, const char *pszFormat, va_list args);
-/** Pointer to a FNDBGCHLPVBOXERRORV() function. */
-typedef FNDBGCHLPVBOXERRORV *PFNDBGCHLPVBOXERRORV;
-
-/**
- * Command helper for reading memory specified by a DBGC variable.
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pVM         VM handle if GC or physical HC address.
- * @param   pvBuffer    Where to store the read data.
- * @param   cbRead      Number of bytes to read.
- * @param   pVarPointer DBGC variable specifying where to start reading.
- * @param   pcbRead     Where to store the number of bytes actually read.
- *                      This optional, but it's useful when read GC virtual memory where a
- *                      page in the requested range might not be present.
- *                      If not specified not-present failure or end of a HC physical page
- *                      will cause failure.
- */
-typedef DECLCALLBACK(int) FNDBGCHLPMEMREAD(PDBGCCMDHLP pCmdHlp, PVM pVM, void *pvBuffer, size_t cbRead, PCDBGCVAR pVarPointer, size_t *pcbRead);
-/** Pointer to a FNDBGCHLPMEMREAD() function. */
-typedef FNDBGCHLPMEMREAD *PFNDBGCHLPMEMREAD;
-
-/**
- * Command helper for writing memory specified by a DBGC variable.
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pVM         VM handle if GC or physical HC address.
- * @param   pvBuffer    What to write.
- * @param   cbWrite     Number of bytes to write.
- * @param   pVarPointer DBGC variable specifying where to start reading.
- * @param   pcbWritten  Where to store the number of bytes written.
- *                      This is optional. If NULL be aware that some of the buffer
- *                      might have been written to the specified address.
- */
-typedef DECLCALLBACK(int) FNDBGCHLPMEMWRITE(PDBGCCMDHLP pCmdHlp, PVM pVM, const void *pvBuffer, size_t cbWrite, PCDBGCVAR pVarPointer, size_t *pcbWritten);
-/** Pointer to a FNDBGCHLPMEMWRITE() function. */
-typedef FNDBGCHLPMEMWRITE *PFNDBGCHLPMEMWRITE;
-
-
-
-/**
- * Executes command an expression.
- * (Hopefully the parser and functions are fully reentrant.)
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pszExpr     The expression. Format string with the format DBGC extensions.
- * @param   ...         Format arguments.
- */
-typedef DECLCALLBACK(int) FNDBGCHLPEXEC(PDBGCCMDHLP pCmdHlp, const char *pszExpr, ...);
-/** Pointer to a FNDBGCHLPEVAL() function. */
-typedef FNDBGCHLPEXEC *PFNDBGCHLPEXEC;
-
 
 /**
@@ -497 +377 @@
 typedef struct DBGCCMDHLP
 {
-    /** Pointer to a FNDBCHLPWRITE() function. */
-    PFNDBGCHLPWRITE         pfnWrite;
-    /** Pointer to a FNDBGCHLPPRINTF() function. */
-    PFNDBGCHLPPRINTF        pfnPrintf;
-    /** Pointer to a FNDBGCHLPPRINTFV() function. */
-    PFNDBGCHLPPRINTFV       pfnPrintfV;
-    /** Pointer to a FNDBGCHLPVBOXERROR() function. */
-    PFNDBGCHLPVBOXERROR     pfnVBoxError;
-    /** Pointer to a FNDBGCHLPVBOXERRORV() function. */
-    PFNDBGCHLPVBOXERRORV    pfnVBoxErrorV;
-    /** Pointer to a FNDBGCHLPMEMREAD() function. */
-    PFNDBGCHLPMEMREAD       pfnMemRead;
-    /** Pointer to a FNDBGCHLPMEMWRITE() function. */
-    PFNDBGCHLPMEMWRITE      pfnMemWrite;
-    /** Pointer to a FNDBGCHLPEXEC() function. */
-    PFNDBGCHLPEXEC          pfnExec;
+    /** Magic value (DBGCCMDHLP_MAGIC). */
+    uint32_t                u32Magic;
+
+    /**
+     * Command helper for writing formatted text to the debug console.
+     *
+     * @returns VBox status.
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   pcb         Where to store the number of bytes written.
+     * @param   pszFormat   The format string.
+     *                      This is using the log formatter, so it's format extensions can be used.
+     * @param   ...         Arguments specified in the format string.
+     */
+    DECLCALLBACKMEMBER(int, pfnPrintf)(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten, const char *pszFormat, ...);
+
+    /**
+     * Command helper for writing formatted text to the debug console.
+     *
+     * @returns VBox status.
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   pcb         Where to store the number of bytes written.
+     * @param   pszFormat   The format string.
+     *                      This is using the log formatter, so it's format extensions can be used.
+     * @param   args        Arguments specified in the format string.
+     */
+    DECLCALLBACKMEMBER(int, pfnPrintfV)(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten, const char *pszFormat, va_list args);
+
+    /**
+     * Command helper for formatting and error message for a VBox status code.
+     *
+     * @returns VBox status code appropriate to return from a command.
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   rc          The VBox status code.
+     * @param   pszFormat   Format string for additional messages. Can be NULL.
+     * @param   ...         Format arguments, optional.
+     */
+    DECLCALLBACKMEMBER(int, pfnVBoxError)(PDBGCCMDHLP pCmdHlp, int rc, const char *pszFormat, ...);
+
+    /**
+     * Command helper for formatting and error message for a VBox status code.
+     *
+     * @returns VBox status code appropriate to return from a command.
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   rc          The VBox status code.
+     * @param   pcb         Where to store the number of bytes written.
+     * @param   pszFormat   Format string for additional messages. Can be NULL.
+     * @param   args        Format arguments, optional.
+     */
+    DECLCALLBACKMEMBER(int, pfnVBoxErrorV)(PDBGCCMDHLP pCmdHlp, int rc, const char *pszFormat, va_list args);
+
+    /**
+     * Command helper for reading memory specified by a DBGC variable.
+     *
+     * @returns VBox status code appropriate to return from a command.
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   pVM         VM handle if GC or physical HC address.
+     * @param   pvBuffer    Where to store the read data.
+     * @param   cbRead      Number of bytes to read.
+     * @param   pVarPointer DBGC variable specifying where to start reading.
+     * @param   pcbRead     Where to store the number of bytes actually read.
+     *                      This optional, but it's useful when read GC virtual memory where a
+     *                      page in the requested range might not be present.
+     *                      If not specified not-present failure or end of a HC physical page
+     *                      will cause failure.
+     */
+    DECLCALLBACKMEMBER(int, pfnMemRead)(PDBGCCMDHLP pCmdHlp, PVM pVM, void *pvBuffer, size_t cbRead, PCDBGCVAR pVarPointer, size_t *pcbRead);
+
+    /**
+     * Command helper for writing memory specified by a DBGC variable.
+     *
+     * @returns VBox status code appropriate to return from a command.
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   pVM         VM handle if GC or physical HC address.
+     * @param   pvBuffer    What to write.
+     * @param   cbWrite     Number of bytes to write.
+     * @param   pVarPointer DBGC variable specifying where to start reading.
+     * @param   pcbWritten  Where to store the number of bytes written.
+     *                      This is optional. If NULL be aware that some of the buffer
+     *                      might have been written to the specified address.
+     */
+    DECLCALLBACKMEMBER(int, pfnMemWrite)(PDBGCCMDHLP pCmdHlp, PVM pVM, const void *pvBuffer, size_t cbWrite, PCDBGCVAR pVarPointer, size_t *pcbWritten);
+
+    /**
+     * Executes command an expression.
+     * (Hopefully the parser and functions are fully reentrant.)
+     *
+     * @returns VBox status code appropriate to return from a command.
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   pszExpr     The expression. Format string with the format DBGC extensions.
+     * @param   ...         Format arguments.
+     */
+    DECLCALLBACKMEMBER(int, pfnExec)(PDBGCCMDHLP pCmdHlp, const char *pszExpr, ...);
 
     /**
@@ -537 +493 @@
      */
     DECLCALLBACKMEMBER(int, pfnFailV)(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, const char *pszFormat, va_list va);
+
+    /**
+     * Print an error and fail the current command.
+     *
+     * @returns VBox status code to pass upwards.
+     *
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   pCmd        The failing command.
+     * @param   rc          The status code indicating the failure.  This will
+     *                      be appended to the message after a colon (': ').
+     * @param   pszFormat   The error message format string.
+     * @param   va          Format arguments.
+     *
+     * @see     DBGCCmdHlpFailRc
+     */
+    DECLCALLBACKMEMBER(int, pfnFailRcV)(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, int rc, const char *pszFormat, va_list va);
+
+    /**
+     * Parser error.
+     *
+     * @returns VBox status code to pass upwards.
+     *
+     * @param   pCmdHlp     Pointer to the command callback structure.
+     * @param   pCmd        The failing command, can be NULL but shouldn't.
+     * @param   iArg        The offending argument, -1 when lazy.
+     * @param   pszExpr     The expression.
+     * @param   iLine       The line number.
+     */
+    DECLCALLBACKMEMBER(int, pfnParserError)(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, int iArg, const char *pszExpr, unsigned iLine);
 
     /**
@@ -615 +600 @@
     DECLCALLBACKMEMBER(PCDBGFINFOHLP, pfnGetDbgfOutputHlp)(PDBGCCMDHLP pCmdHlp);
 
+    /** End marker (DBGCCMDHLP_MAGIC). */
+    uint32_t                u32EndMarker;
 } DBGCCMDHLP;
+
+/** Magic value for DBGCCMDHLP::u32Magic. (Fyodor Mikhaylovich Dostoyevsky) */
+#define DBGCCMDHLP_MAGIC    UINT32_C(18211111)
 
 
@@ -706 +696 @@
     return rc;
 }
+
+/**
+ * Print an error and fail the current command.
+ *
+ * Usage example:
+ * @code
+    int rc = VMMR3Something(pVM);
+    if (RT_FAILURE(rc))
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "VMMR3Something");
+    return VINF_SUCCESS;
+ * @endcode
+ *
+ * @returns VBox status code to pass upwards.
+ *
+ * @param   pCmdHlp     Pointer to the command callback structure.
+ * @param   pCmd        The failing command.
+ * @param   rc          The status code indicating the failure.
+ * @param   pszFormat   The error message format string.
+ * @param   ...         Format arguments.
+ */
+DECLINLINE(int) DBGCCmdHlpFailRc(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, int rc, const char *pszFormat, ...)
+{
+    va_list va;
+
+    va_start(va, pszFormat);
+    rc = pCmdHlp->pfnFailRcV(pCmdHlp, pCmd, rc, pszFormat, va);
+    va_end(va);
+
+    return rc;
+}
+
+/**
+ * @copydoc DBGCCMDHLP::pfnParserError
+ */
+DECLINLINE(int) DBGCCmdHlpParserError(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, int iArg, const char *pszExpr, unsigned iLine)
+{
+    return pCmdHlp->pfnParserError(pCmdHlp, pCmd, iArg, pszExpr, iLine);
+}
+
+/** Assert+return like macro for checking parser sanity.
+ * Returns with failure if the precodition is not met. */
+#define DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, iArg, expr) \
+    do { \
+        if (!(expr)) \
+            return DBGCCmdHlpParserError(pCmdHlp, pCmd, iArg, #expr, __LINE__); \
+    } while (0)
+
+/** Assert+return like macro that the VM handle is present.
+ * Returns with failure if the VM handle is NIL.  */
+#define DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM) \
+    do { \
+        if (!(pVM)) \
+            return DBGCCmdHlpFail(pCmdHlp, pCmd, "No VM selected"); \
+    } while (0)
 
 /**

trunk/include/VBox/vmm/dbgf.h

@@ -378 +378 @@
 
 
-VMMR3DECL(int)  DBGFR3BpSet(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, PRTUINT piBp);
+VMMR3DECL(int)  DBGFR3BpSet(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, uint32_t *piBp);
 VMMR3DECL(int)  DBGFR3BpSetReg(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable,
-                               uint8_t fType, uint8_t cb, PRTUINT piBp);
-VMMR3DECL(int)  DBGFR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, PRTUINT piBp);
-VMMR3DECL(int)  DBGFR3BpClear(PVM pVM, RTUINT iBp);
-VMMR3DECL(int)  DBGFR3BpEnable(PVM pVM, RTUINT iBp);
-VMMR3DECL(int)  DBGFR3BpDisable(PVM pVM, RTUINT iBp);
+                               uint8_t fType, uint8_t cb, uint32_t *piBp);
+VMMR3DECL(int)  DBGFR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, uint32_t *piBp);
+VMMR3DECL(int)  DBGFR3BpClear(PVM pVM, uint32_t iBp);
+VMMR3DECL(int)  DBGFR3BpEnable(PVM pVM, uint32_t iBp);
+VMMR3DECL(int)  DBGFR3BpDisable(PVM pVM, uint32_t iBp);
 
 /**

trunk/src/VBox/Debugger/DBGCCmdHlp.cpp

@@ -37 +37 @@
 
 /**
- * Command helper for writing text to the debug console.
- *
- * @returns VBox status.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pvBuf       What to write.
- * @param   cbBuf       Number of bytes to write.
- * @param   pcbWritten  Where to store the number of bytes actually written.
- *                      If NULL the entire buffer must be successfully written.
- */
-static DECLCALLBACK(int) dbgcHlpWrite(PDBGCCMDHLP pCmdHlp, const void *pvBuf, size_t cbBuf, size_t *pcbWritten)
-{
-    PDBGC   pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
-    return pDbgc->pBack->pfnWrite(pDbgc->pBack, pvBuf, cbBuf, pcbWritten);
-}
-
-
-/**
- * Command helper for writing formatted text to the debug console.
- *
- * @returns VBox status.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pcb         Where to store the number of bytes written.
- * @param   pszFormat   The format string.
- *                      This is using the log formatter, so it's format extensions can be used.
- * @param   ...         Arguments specified in the format string.
+ * @interface_method_impl{DBGCCMDHLP,pfnPrintf}
  */
 static DECLCALLBACK(int) dbgcHlpPrintf(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten, const char *pszFormat, ...)
@@ -77 +53 @@
 
 /**
- * Callback to format non-standard format specifiers.
+ * Callback to format non-standard format specifiers, employed by dbgcPrintfV
+ * and others.
  *
  * @returns The number of bytes formatted.
@@ -190 +167 @@
 
 /**
- * Output callback.
+ * Output callback employed by dbgcHlpPrintfV.
  *
  * @returns number of bytes written.
@@ -199 +176 @@
 static DECLCALLBACK(size_t) dbgcFormatOutput(void *pvArg, const char *pachChars, size_t cbChars)
 {
-    PDBGC   pDbgc = (PDBGC)pvArg;
+    PDBGC pDbgc = (PDBGC)pvArg;
     if (cbChars)
     {
         int rc = pDbgc->pBack->pfnWrite(pDbgc->pBack, pachChars, cbChars, NULL);
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+            pDbgc->chLastOutput = pachChars[cbChars - 1];
+        else
         {
             pDbgc->rcOutput = rc;
@@ -216 +195 @@
 
 /**
- * Command helper for writing formatted text to the debug console.
- *
- * @returns VBox status.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pcbWritten  Where to store the number of bytes written.
- * @param   pszFormat   The format string.
- *                      This is using the log formatter, so it's format extensions can be used.
- * @param   args        Arguments specified in the format string.
+ * @interface_method_impl{DBGCCMDHLP,pfnPrintfV}
  */
 static DECLCALLBACK(int) dbgcHlpPrintfV(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten, const char *pszFormat, va_list args)
@@ -243 +215 @@
 
 /**
- * Reports an error from a DBGF call.
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to command helpers.
- * @param   rc          The VBox status code returned by a DBGF call.
- * @param   pszFormat   Format string for additional messages. Can be NULL.
- * @param   ...         Format arguments, optional.
+ * @interface_method_impl{DBGCCMDHLP,pfnVBoxErrorV}
  */
 static DECLCALLBACK(int) dbgcHlpVBoxErrorV(PDBGCCMDHLP pCmdHlp, int rc, const char *pszFormat, va_list args)
@@ -271 +237 @@
 
 /**
- * Reports an error from a DBGF call.
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to command helpers.
- * @param   rc          The VBox status code returned by a DBGF call.
- * @param   pszFormat   Format string for additional messages. Can be NULL.
- * @param   ...         Format arguments, optional.
+ * @interface_method_impl{DBGCCMDHLP,pfnVBoxError}
  */
 static DECLCALLBACK(int) dbgcHlpVBoxError(PDBGCCMDHLP pCmdHlp, int rc, const char *pszFormat, ...)
@@ -290 +250 @@
 
 /**
- * Command helper for reading memory specified by a DBGC variable.
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pVM         VM handle if GC or physical HC address.
- * @param   pvBuffer    Where to store the read data.
- * @param   cbRead      Number of bytes to read.
- * @param   pVarPointer DBGC variable specifying where to start reading.
- * @param   pcbRead     Where to store the number of bytes actually read.
- *                      This optional, but it's useful when read GC virtual memory where a
- *                      page in the requested range might not be present.
- *                      If not specified not-present failure or end of a HC physical page
- *                      will cause failure.
+ * @interface_method_impl{DBGCCMDHLP,pfnMemRead}
  */
 static DECLCALLBACK(int) dbgcHlpMemRead(PDBGCCMDHLP pCmdHlp, PVM pVM, void *pvBuffer, size_t cbRead, PCDBGCVAR pVarPointer, size_t *pcbRead)
@@ -472 +420 @@
 }
 
-/**
- * Command helper for writing memory specified by a DBGC variable.
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pVM         VM handle if GC or physical HC address.
- * @param   pvBuffer    What to write.
- * @param   cbWrite     Number of bytes to write.
- * @param   pVarPointer DBGC variable specifying where to start reading.
- * @param   pcbWritten  Where to store the number of bytes written.
- *                      This is optional. If NULL be aware that some of the buffer
- *                      might have been written to the specified address.
+
+/**
+ * @interface_method_impl{DBGCCMDHLP,pfnMemWrite}
  */
 static DECLCALLBACK(int) dbgcHlpMemWrite(PDBGCCMDHLP pCmdHlp, PVM pVM, const void *pvBuffer, size_t cbWrite, PCDBGCVAR pVarPointer, size_t *pcbWritten)
@@ -618 +557 @@
 
 /**
- * Executes one command expression.
- * (Hopefully the parser and functions are fully reentrant.)
- *
- * @returns VBox status code appropriate to return from a command.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pszExpr     The expression. Format string with the format DBGC extensions.
- * @param   ...         Format arguments.
+ * @interface_method_impl{DBGCCMDHLP,pfnHlpExec}
  */
 static DECLCALLBACK(int) dbgcHlpExec(PDBGCCMDHLP pCmdHlp, const char *pszExpr, ...)
@@ -694 +627 @@
     if (RT_FAILURE(pDbgc->rcOutput))
         return pDbgc->rcOutput;
+    if (pDbgc->chLastOutput != '\n')
+        dbgcFormatOutput(pDbgc, "\n", 1);
+    return VERR_DBGC_COMMAND_FAILED;
+}
+
+
+/**
+ * @copydoc DBGCCMDHLP::pfnFailV
+ */
+static DECLCALLBACK(int) dbgcHlpFailRcV(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, int rc, const char *pszFormat, va_list va)
+{
+    PDBGC pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
+
+    /*
+     * Do the formatting and output.
+     */
+    pDbgc->rcOutput = VINF_SUCCESS;
+    RTStrFormat(dbgcFormatOutput, pDbgc, dbgcStringFormatter, pDbgc, "%s: error: ", pCmd->pszCmd);
+    if (RT_FAILURE(pDbgc->rcOutput))
+        return pDbgc->rcOutput;
+    RTStrFormatV(dbgcFormatOutput, pDbgc, dbgcStringFormatter, pDbgc, pszFormat, va);
+    if (RT_FAILURE(pDbgc->rcOutput))
+        return pDbgc->rcOutput;
+    RTStrFormat(dbgcFormatOutput, pDbgc, dbgcStringFormatter, pDbgc, ": %Rrc\n", rc);
+    if (RT_FAILURE(pDbgc->rcOutput))
+        return pDbgc->rcOutput;
+
     return VERR_DBGC_COMMAND_FAILED;
 }
@@ -778 +738 @@
 
 /**
- * Converts a DBGC variable to a number.
- *
- * @returns VBox status code.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pVar        The variable to convert.
- * @param   pu64Number  Where to store the number value.
+ * @interface_method_impl{DBGCCMDHLP,pfnVarToNumber}
  */
 static DECLCALLBACK(int) dbgcHlpVarToNumber(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, uint64_t *pu64Number)
@@ -823 +778 @@
 
 /**
- * Converts a DBGC variable to a boolean.
- *
- * @returns VBox status code.
- * @param   pCmdHlp     Pointer to the command callback structure.
- * @param   pVar        The variable to convert.
- * @param   pf          Where to store the boolean.
+ * @interface_method_impl{DBGCCMDHLP,pfnVarToBool}
  */
 static DECLCALLBACK(int) dbgcHlpVarToBool(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, bool *pf)
@@ -1255 +1205 @@
 
 /**
- * Info helper callback wrapper - print formatted string.
- *
- * @param   pHlp        Pointer to this structure.
- * @param   pszFormat   The format string.
- * @param   ...         Arguments.
+ * @interface_method_impl{DBGFINFOHLP,pfnPrintf}
  */
 static DECLCALLBACK(void) dbgcHlpGetDbgfOutputHlp_Printf(PCDBGFINFOHLP pHlp, const char *pszFormat, ...)
@@ -1272 +1218 @@
 
 /**
- * Info helper callback wrapper - print formatted string.
- *
- * @param   pHlp        Pointer to this structure.
- * @param   pszFormat   The format string.
- * @param   args        Argument list.
+ * @interface_method_impl{DBGFINFOHLP,pfnPrintfV}
  */
 static DECLCALLBACK(void) dbgcHlpGetDbgfOutputHlp_PrintfV(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list args)
@@ -1310 +1252 @@
 void dbgcInitCmdHlp(PDBGC pDbgc)
 {
-    pDbgc->CmdHlp.pfnWrite              = dbgcHlpWrite;
+    pDbgc->CmdHlp.u32Magic              = DBGCCMDHLP_MAGIC;
     pDbgc->CmdHlp.pfnPrintfV            = dbgcHlpPrintfV;
     pDbgc->CmdHlp.pfnPrintf             = dbgcHlpPrintf;
@@ -1320 +1262 @@
     pDbgc->CmdHlp.pfnExec               = dbgcHlpExec;
     pDbgc->CmdHlp.pfnFailV              = dbgcHlpFailV;
+    pDbgc->CmdHlp.pfnFailRcV            = dbgcHlpFailRcV;
     pDbgc->CmdHlp.pfnVarToDbgfAddr      = dbgcHlpVarToDbgfAddr;
     pDbgc->CmdHlp.pfnVarFromDbgfAddr    = dbgcHlpVarFromDbgfAddr;
@@ -1327 +1270 @@
     pDbgc->CmdHlp.pfnVarConvert         = dbgcHlpVarConvert;
     pDbgc->CmdHlp.pfnGetDbgfOutputHlp   = dbgcHlpGetDbgfOutputHlp;
-}
-
+    pDbgc->CmdHlp.u32EndMarker          = DBGCCMDHLP_MAGIC;
+}
+

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -390 +390 @@
 static DECLCALLBACK(int) dbgcCmdGo(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult)
 {
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+
     /*
      * Check if the VM is halted or not before trying to resume it.
      */
     if (!DBGFR3IsHalted(pVM))
-        pCmdHlp->pfnPrintf(pCmdHlp, NULL, "warning: The VM is already running...\n");
-    else
-    {
-        int rc = DBGFR3Resume(pVM);
-        if (RT_FAILURE(rc))
-            return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "Executing DBGFR3Resume().");
-    }
-
-    NOREF(pCmd);
-    NOREF(paArgs);
-    NOREF(cArgs);
-    NOREF(pResult);
-    return 0;
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "The VM is already running");
+
+    int rc = DBGFR3Resume(pVM);
+    if (RT_FAILURE(rc))
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGFR3Resume");
+
+    NOREF(paArgs); NOREF(cArgs); NOREF(pResult);
+    return VINF_SUCCESS;
 }
 
@@ -422 +419 @@
 static DECLCALLBACK(int) dbgcCmdBrkAccess(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR /*pResult*/)
 {
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+
     /*
      * Interpret access type.
@@ -427 +426 @@
     if (    !strchr("xrwi", paArgs[0].u.pszString[0])
         ||  paArgs[0].u.pszString[1])
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Invalid access type '%s' for '%s'. Valid types are 'e', 'r', 'w' and 'i'.\n",
-                                  paArgs[0].u.pszString, pCmd->pszCmd);
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "Invalid access type '%s' for '%s'. Valid types are 'e', 'r', 'w' and 'i'",
+                              paArgs[0].u.pszString, pCmd->pszCmd);
     uint8_t fType = 0;
     switch (paArgs[0].u.pszString[0])
@@ -442 +441 @@
      */
     if (fType == X86_DR7_RW_EO && paArgs[1].u.u64Number != 1)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Invalid access size %RX64 for '%s'. 'x' access type requires size 1!\n",
-                                  paArgs[1].u.u64Number, pCmd->pszCmd);
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "Invalid access size %RX64 for '%s'. 'x' access type requires size 1!",
+                              paArgs[1].u.u64Number, pCmd->pszCmd);
     switch (paArgs[1].u.u64Number)
     {
@@ -452 +451 @@
         /*case 8: - later*/
         default:
-            return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Invalid access size %RX64 for '%s'. 1, 2 or 4!\n",
-                                      paArgs[1].u.u64Number, pCmd->pszCmd);
+            return DBGCCmdHlpFail(pCmdHlp, pCmd, "Invalid access size %RX64 for '%s'. 1, 2 or 4!",
+                                  paArgs[1].u.u64Number, pCmd->pszCmd);
     }
     uint8_t cb = (uint8_t)paArgs[1].u.u64Number;
@@ -461 +460 @@
      */
     DBGFADDRESS Address;
-    int rc = pCmdHlp->pfnVarToDbgfAddr(pCmdHlp, &paArgs[2], &Address);
+    int rc = DBGCCmdHlpVarToDbgfAddr(pCmdHlp, &paArgs[2], &Address);
     if (RT_FAILURE(rc))
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Couldn't convert '%DV' to a DBGF address, rc=%Rrc.\n", &paArgs[2], rc);
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGCCmdHlpVarToDbgfAddr(,%DV,)", &paArgs[2]);
 
     /*
@@ -491 +490 @@
      * Try set the breakpoint.
      */
-    RTUINT iBp;
+    uint32_t iBp;
     rc = DBGFR3BpSetReg(pVM, &Address, iHitTrigger, iHitDisable, fType, cb, &iBp);
     if (RT_SUCCESS(rc))
@@ -498 +497 @@
         rc = dbgcBpAdd(pDbgc, iBp, pszCmds);
         if (RT_SUCCESS(rc))
-            return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Set access breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
+            return DBGCCmdHlpPrintf(pCmdHlp, "Set access breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
         if (rc == VERR_DBGC_BP_EXISTS)
         {
             rc = dbgcBpUpdate(pDbgc, iBp, pszCmds);
             if (RT_SUCCESS(rc))
-                return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Updated access breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
+                return DBGCCmdHlpPrintf(pCmdHlp, "Updated access breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
         }
         int rc2 = DBGFR3BpClear(pDbgc->pVM, iBp);
         AssertRC(rc2);
     }
-    return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Failed to set access breakpoint at %RGv, rc=%Rrc.\n", Address.FlatPtr, rc);
+    return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "Failed to set access breakpoint at %RGv", Address.FlatPtr);
 }
 
@@ -524 +523 @@
 static DECLCALLBACK(int) dbgcCmdBrkClear(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR /*pResult*/)
 {
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+
     /*
      * Enumerate the arguments.
      */
     PDBGC   pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
-    int     rc = VINF_SUCCESS;
+    int     rc    = VINF_SUCCESS;
     for (unsigned iArg = 0; iArg < cArgs && RT_SUCCESS(rc); iArg++)
     {
@@ -534 +535 @@
         {
             /* one */
-            RTUINT iBp = (RTUINT)paArgs[iArg].u.u64Number;
-            if (iBp != paArgs[iArg].u.u64Number)
+            uint32_t iBp = (uint32_t)paArgs[iArg].u.u64Number;
+            if (iBp == paArgs[iArg].u.u64Number)
             {
-                rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Breakpoint id %RX64 is too large!\n", paArgs[iArg].u.u64Number);
-                break;
+                int rc2 = DBGFR3BpClear(pVM, iBp);
+                if (RT_FAILURE(rc2))
+                    rc = DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc2, "DBGFR3BpClear(,%#x)", iBp);
+                if (RT_SUCCESS(rc2) || rc2 == VERR_DBGF_BP_NOT_FOUND)
+                    dbgcBpDelete(pDbgc, iBp);
             }
-            int rc2 = DBGFR3BpClear(pVM, iBp);
-            if (RT_FAILURE(rc2))
-                rc = pCmdHlp->pfnVBoxError(pCmdHlp, rc2, "DBGFR3BpClear failed for breakpoint %u!\n", iBp);
-            if (RT_SUCCESS(rc2) || rc2 == VERR_DBGF_BP_NOT_FOUND)
-                dbgcBpDelete(pDbgc, iBp);
+            else
+                rc = DBGCCmdHlpFail(pCmdHlp, pCmd, "Breakpoint id %RX64 is too large", paArgs[iArg].u.u64Number);
         }
         else if (!strcmp(paArgs[iArg].u.pszString, "all"))
@@ -552 +553 @@
             while (pBp)
             {
-                RTUINT iBp = pBp->iBp;
+                uint32_t iBp = pBp->iBp;
                 pBp = pBp->pNext;
 
                 int rc2 = DBGFR3BpClear(pVM, iBp);
                 if (RT_FAILURE(rc2))
-                    rc = pCmdHlp->pfnVBoxError(pCmdHlp, rc2, "DBGFR3BpClear failed for breakpoint %u!\n", iBp);
+                    rc = DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc2, "DBGFR3BpClear(,%#x)", iBp);
                 if (RT_SUCCESS(rc2) || rc2 == VERR_DBGF_BP_NOT_FOUND)
                     dbgcBpDelete(pDbgc, iBp);
@@ -563 +564 @@
         }
         else
-        {
-            /* invalid parameter */
-            rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Invalid argument '%s' to '%s'!\n", paArgs[iArg].u.pszString, pCmd->pszCmd);
-            break;
-        }
+            rc = DBGCCmdHlpFail(pCmdHlp, pCmd, "Invalid argument '%s'", paArgs[iArg].u.pszString);
     }
     return rc;
@@ -594 +591 @@
         {
             /* one */
-            RTUINT iBp = (RTUINT)paArgs[iArg].u.u64Number;
-            if (iBp != paArgs[iArg].u.u64Number)
+            uint32_t iBp = (uint32_t)paArgs[iArg].u.u64Number;
+            if (iBp == paArgs[iArg].u.u64Number)
             {
-                rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Breakpoint id %RX64 is too large!\n", paArgs[iArg].u.u64Number);
-                break;
+                rc = DBGFR3BpDisable(pVM, iBp);
+                if (RT_FAILURE(rc))
+                    rc = DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGFR3BpDisable failed for breakpoint %#x", iBp);
             }
-            rc = DBGFR3BpDisable(pVM, iBp);
-            if (RT_FAILURE(rc))
-                rc = pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3BpDisable failed for breakpoint %u!\n", iBp);
+            else
+                rc = DBGCCmdHlpFail(pCmdHlp, pCmd, "Breakpoint id %RX64 is too large", paArgs[iArg].u.u64Number);
         }
         else if (!strcmp(paArgs[iArg].u.pszString, "all"))
@@ -610 +607 @@
             for (PDBGCBP pBp = pDbgc->pFirstBp; pBp; pBp = pBp->pNext)
             {
-                rc = DBGFR3BpDisable(pVM, pBp->iBp);
-                if (RT_FAILURE(rc))
-                    rc = pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3BpDisable failed for breakpoint %u!\n", pBp->iBp);
+                int rc2 = DBGFR3BpDisable(pVM, pBp->iBp);
+                if (RT_FAILURE(rc2))
+                    rc = DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc2, "DBGFR3BpDisable failed for breakpoint %#x", pBp->iBp);
             }
         }
         else
-        {
-            /* invalid parameter */
-            rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Invalid argument '%s' to '%s'!\n", paArgs[iArg].u.pszString, pCmd->pszCmd);
-            break;
-        }
+            rc = DBGCCmdHlpFail(pCmdHlp, pCmd, "Invalid argument '%s'", paArgs[iArg].u.pszString);
     }
     return rc;
@@ -638 +631 @@
 static DECLCALLBACK(int) dbgcCmdBrkEnable(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR /*pResult*/)
 {
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+
     /*
      * Enumerate the arguments.
@@ -647 +642 @@
         {
             /* one */
-            RTUINT iBp = (RTUINT)paArgs[iArg].u.u64Number;
-            if (iBp != paArgs[iArg].u.u64Number)
+            uint32_t iBp = (uint32_t)paArgs[iArg].u.u64Number;
+            if (iBp == paArgs[iArg].u.u64Number)
             {
-                rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Breakpoint id %RX64 is too large!\n", paArgs[iArg].u.u64Number);
-                break;
+                rc = DBGFR3BpEnable(pVM, iBp);
+                if (RT_FAILURE(rc))
+                    rc = DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGFR3BpEnable failed for breakpoint %#x", iBp);
             }
-            rc = DBGFR3BpEnable(pVM, iBp);
-            if (RT_FAILURE(rc))
-                rc = pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3BpEnable failed for breakpoint %u!\n", iBp);
+            else
+                rc = DBGCCmdHlpFail(pCmdHlp, pCmd, "Breakpoint id %RX64 is too large", paArgs[iArg].u.u64Number);
         }
         else if (!strcmp(paArgs[iArg].u.pszString, "all"))
@@ -663 +658 @@
             for (PDBGCBP pBp = pDbgc->pFirstBp; pBp; pBp = pBp->pNext)
             {
-                rc = DBGFR3BpEnable(pVM, pBp->iBp);
-                if (RT_FAILURE(rc))
-                    rc = pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3BpEnable failed for breakpoint %u!\n", pBp->iBp);
+                int rc2 = DBGFR3BpEnable(pVM, pBp->iBp);
+                if (RT_FAILURE(rc2))
+                    rc = DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc2, "DBGFR3BpEnable failed for breakpoint %#x", pBp->iBp);
             }
         }
         else
-        {
-            /* invalid parameter */
-            rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Invalid argument '%s' to '%s'!\n", paArgs[iArg].u.pszString, pCmd->pszCmd);
-            break;
-        }
+            rc = DBGCCmdHlpFail(pCmdHlp, pCmd, "Invalid argument '%s'", paArgs[iArg].u.pszString);
     }
     return rc;
@@ -689 +680 @@
 static DECLCALLBACK(int) dbgcEnumBreakpointsCallback(PVM pVM, void *pvUser, PCDBGFBP pBp)
 {
-    PDBGC pDbgc = (PDBGC)pvUser;
+    PDBGC   pDbgc   = (PDBGC)pvUser;
     PDBGCBP pDbgcBp = dbgcBpGet(pDbgc, pBp->iBp);
 
@@ -722 +713 @@
     }
 
-    pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "%2u %c %d %c %RGv %04RX64 (%04RX64 to ",
-                            pBp->iBp, pBp->fEnabled ? 'e' : 'd', cb, chType,
-                            pBp->GCPtr, pBp->cHits, pBp->iHitTrigger);
+    DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%4#x %c %d %c %RGv %04RX64 (%04RX64 to ",
+                     pBp->iBp, pBp->fEnabled ? 'e' : 'd', cb, chType,
+                     pBp->GCPtr, pBp->cHits, pBp->iHitTrigger);
     if (pBp->iHitDisable == ~(uint64_t)0)
-        pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "~0)  ");
+        DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "~0)  ");
     else
-        pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "%04RX64)");
+        DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%04RX64)");
 
     /*
@@ -740 +731 @@
     {
         if (!off)
-            pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "%s", Sym.szName);
+            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%s", Sym.szName);
         else if (off > 0)
-            pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "%s+%RGv", Sym.szName, off);
+            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%s+%RGv", Sym.szName, off);
         else
-            pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "%s+%RGv", Sym.szName, -off);
+            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%s+%RGv", Sym.szName, -off);
     }
 
@@ -753 +744 @@
     {
         if (pDbgcBp->cchCmd)
-            pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\n  cmds: '%s'\n",
-                                    pDbgcBp->szCmd);
+            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "\n  cmds: '%s'\n", pDbgcBp->szCmd);
         else
-            pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\n");
+            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "\n");
     }
     else
-        pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, " [unknown bp]\n");
+        DBGCCmdHlpPrintf(&pDbgc->CmdHlp, " [unknown bp]\n");
 
     return VINF_SUCCESS;
@@ -775 +765 @@
  * @param   cArgs       Number of arguments in the array.
  */
-static DECLCALLBACK(int) dbgcCmdBrkList(PCDBGCCMD /*pCmd*/, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR /*paArgs*/, unsigned /*cArgs*/, PDBGCVAR /*pResult*/)
-{
+static DECLCALLBACK(int) dbgcCmdBrkList(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR /*paArgs*/, unsigned cArgs, PDBGCVAR /*pResult*/)
+{
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+    DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, -1, cArgs == 0);
+
+    /*
+     * Enumerate the breakpoints.
+     */
     PDBGC pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
-
-    /*
-     * Enumerate the breakpoints.
-     */
     int rc = DBGFR3BpEnum(pVM, dbgcEnumBreakpointsCallback, pDbgc);
     if (RT_FAILURE(rc))
-        return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3BpEnum failed.\n");
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGFR3BpEnum");
     return rc;
 }
@@ -799 +791 @@
  * @param   cArgs       Number of arguments in the array.
  */
-static DECLCALLBACK(int) dbgcCmdBrkSet(PCDBGCCMD /*pCmd*/, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR /*pResult*/)
+static DECLCALLBACK(int) dbgcCmdBrkSet(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR /*pResult*/)
 {
     /*
@@ -805 +797 @@
      */
     DBGFADDRESS Address;
-    int rc = pCmdHlp->pfnVarToDbgfAddr(pCmdHlp, &paArgs[0], &Address);
+    int rc = DBGCCmdHlpVarToDbgfAddr(pCmdHlp, &paArgs[0], &Address);
     if (RT_FAILURE(rc))
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Couldn't convert '%DV' to a DBGF address, rc=%Rrc.\n", &paArgs[0], rc);
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGCCmdHlpVarToDbgfAddr(,'%DV',)", &paArgs[0]);
 
     /*
@@ -835 +827 @@
      * Try set the breakpoint.
      */
-    RTUINT iBp;
+    uint32_t iBp;
     rc = DBGFR3BpSet(pVM, &Address, iHitTrigger, iHitDisable, &iBp);
     if (RT_SUCCESS(rc))
     {
-        PDBGC   pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
+        PDBGC pDbgc = DBGC_CMDHLP2DBGC(pCmdHlp);
         rc = dbgcBpAdd(pDbgc, iBp, pszCmds);
         if (RT_SUCCESS(rc))
-            return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Set breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
+            return DBGCCmdHlpPrintf(pCmdHlp, "Set breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
         if (rc == VERR_DBGC_BP_EXISTS)
         {
             rc = dbgcBpUpdate(pDbgc, iBp, pszCmds);
             if (RT_SUCCESS(rc))
-                return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Updated breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
+                return DBGCCmdHlpPrintf(pCmdHlp, "Updated breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
         }
         int rc2 = DBGFR3BpClear(pDbgc->pVM, iBp);
         AssertRC(rc2);
     }
-    return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Failed to set breakpoint at %RGv, rc=%Rrc.\n", Address.FlatPtr, rc);
+    return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "Failed to set breakpoint at %RGv", Address.FlatPtr);
 }
 
@@ -866 +858 @@
  * @param   cArgs       Number of arguments in the array.
  */
-static DECLCALLBACK(int) dbgcCmdBrkREM(PCDBGCCMD /*pCmd*/, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR /*pResult*/)
+static DECLCALLBACK(int) dbgcCmdBrkREM(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR /*pResult*/)
 {
     /*
@@ -872 +864 @@
      */
     DBGFADDRESS Address;
-    int rc = pCmdHlp->pfnVarToDbgfAddr(pCmdHlp, &paArgs[0], &Address);
+    int rc = DBGCCmdHlpVarToDbgfAddr(pCmdHlp, &paArgs[0], &Address);
     if (RT_FAILURE(rc))
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Couldn't convert '%DV' to a DBGF address, rc=%Rrc.\n", &paArgs[0], rc);
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGCCmdHlpVarToDbgfAddr(,'%DV',)", &paArgs[0]);
 
     /*
@@ -902 +894 @@
      * Try set the breakpoint.
      */
-    RTUINT iBp;
+    uint32_t iBp;
     rc = DBGFR3BpSetREM(pVM, &Address, iHitTrigger, iHitDisable, &iBp);
     if (RT_SUCCESS(rc))
@@ -909 +901 @@
         rc = dbgcBpAdd(pDbgc, iBp, pszCmds);
         if (RT_SUCCESS(rc))
-            return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Set REM breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
+            return DBGCCmdHlpPrintf(pCmdHlp, "Set REM breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
         if (rc == VERR_DBGC_BP_EXISTS)
         {
             rc = dbgcBpUpdate(pDbgc, iBp, pszCmds);
             if (RT_SUCCESS(rc))
-                return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Updated REM breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
+                return DBGCCmdHlpPrintf(pCmdHlp, "Updated REM breakpoint %u at %RGv\n", iBp, Address.FlatPtr);
         }
         int rc2 = DBGFR3BpClear(pDbgc->pVM, iBp);
         AssertRC(rc2);
     }
-    return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: Failed to set REM breakpoint at %RGv, rc=%Rrc.\n", Address.FlatPtr, rc);
+    return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "Failed to set REM breakpoint at %RGv", Address.FlatPtr);
 }
 

trunk/src/VBox/Debugger/DBGCInternal.h

@@ -80 +80 @@
     struct DBGCBP  *pNext;
     /** The breakpoint identifier. */
-    RTUINT          iBp;
+    uint32_t        iBp;
     /** The size of the command. */
     size_t          cchCmd;
@@ -239 +239 @@
     /** rc from the last dbgcHlpPrintfV(). */
     int                 rcOutput;
+    /** The last character we wrote. */
+    char                chLastOutput;
+
     /** rc from the last command. */
     int                 rcCmd;

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

@@ -2663 +2663 @@
 
 #ifdef VBOX_WITH_DEBUGGER
+
 /**
  * The '.csamoff' command.
@@ -2675 +2676 @@
 static DECLCALLBACK(int) csamr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult)
 {
-    /*
-     * Validate input.
-     */
-    if (!pVM)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: The command requires VM to be selected.\n");
-
-    CSAMDisableScanning(pVM);
-    return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "CSAM Scanning disabled\n");
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+
+    int rc = CSAMDisableScanning(pVM);
+    if (RT_FAILURE(rc))
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "CSAMDisableScanning");
+    return DBGCCmdHlpPrintf(pCmdHlp, "CSAM Scanning disabled\n");
 }
 
@@ -2697 +2696 @@
 static DECLCALLBACK(int) csamr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult)
 {
-    /*
-     * Validate input.
-     */
-    if (!pVM)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: The command requires VM to be selected.\n");
-
-    CSAMEnableScanning(pVM);
-    return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "CSAM Scanning enabled\n");
-}
-#endif
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+
+    int rc = CSAMEnableScanning(pVM);
+    if (RT_FAILURE(rc))
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "CSAMEnableScanning");
+    return DBGCCmdHlpPrintf(pCmdHlp, "CSAM Scanning enabled\n");
+}
+
+#endif /* VBOX_WITH_DEBUGGER */

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

@@ -38 +38 @@
 RT_C_DECLS_BEGIN
 static DECLCALLBACK(int) dbgfR3BpSetReg(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable,
-                                        uint8_t u8Type, uint8_t cb, PRTUINT piBp);
-static DECLCALLBACK(int) dbgfR3BpSetInt3(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable, PRTUINT piBp);
-static DECLCALLBACK(int) dbgfR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable, PRTUINT piBp);
-static DECLCALLBACK(int) dbgfR3BpClear(PVM pVM, RTUINT iBp);
-static DECLCALLBACK(int) dbgfR3BpEnable(PVM pVM, RTUINT iBp);
-static DECLCALLBACK(int) dbgfR3BpDisable(PVM pVM, RTUINT iBp);
+                                        uint8_t u8Type, uint8_t cb, uint32_t *piBp);
+static DECLCALLBACK(int) dbgfR3BpSetInt3(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable, uint32_t *piBp);
+static DECLCALLBACK(int) dbgfR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable, uint32_t *piBp);
+static DECLCALLBACK(int) dbgfR3BpClear(PVM pVM, uint32_t iBp);
+static DECLCALLBACK(int) dbgfR3BpEnable(PVM pVM, uint32_t iBp);
+static DECLCALLBACK(int) dbgfR3BpDisable(PVM pVM, uint32_t iBp);
 static DECLCALLBACK(int) dbgfR3BpEnum(PVM pVM, PFNDBGFBPENUM pfnCallback, void *pvUser);
 static int dbgfR3BpRegArm(PVM pVM, PDBGFBP pBp);
@@ -101 +101 @@
      * Determine which array to search.
      */
-    unsigned cBps;
-    PRTUINT  pcBpsCur;
-    PDBGFBP  paBps;
+    unsigned    cBps;
+    uint32_t   *pcBpsCur;
+    PDBGFBP     paBps;
     switch (enmType)
     {
@@ -149 +149 @@
  * @param   iBp     The breakpoint id.
  */
-static PDBGFBP dbgfR3BpGet(PVM pVM, RTUINT iBp)
+static PDBGFBP dbgfR3BpGet(PVM pVM, uint32_t iBp)
 {
     /* Find it. */
@@ -278 +278 @@
  * @thread  Any thread.
  */
-VMMR3DECL(int) DBGFR3BpSet(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, PRTUINT piBp)
+VMMR3DECL(int) DBGFR3BpSet(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, uint32_t *piBp)
 {
     /*
@@ -303 +303 @@
  * @thread  Any thread.
  */
-static DECLCALLBACK(int) dbgfR3BpSetInt3(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable, PRTUINT piBp)
+static DECLCALLBACK(int) dbgfR3BpSetInt3(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable, uint32_t *piBp)
 {
     /*
@@ -435 +435 @@
  */
 VMMR3DECL(int) DBGFR3BpSetReg(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable,
-                              uint8_t fType, uint8_t cb, PRTUINT piBp)
+                              uint8_t fType, uint8_t cb, uint32_t *piBp)
 {
     /** @todo SMP - broadcast, VT-x/AMD-V. */
@@ -466 +466 @@
  */
 static DECLCALLBACK(int) dbgfR3BpSetReg(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable,
-                                        uint8_t fType, uint8_t cb, PRTUINT piBp)
+                                        uint8_t fType, uint8_t cb, uint32_t *piBp)
 {
     /*
@@ -603 +603 @@
  * @thread  Any thread.
  */
-VMMR3DECL(int) DBGFR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, PRTUINT piBp)
+VMMR3DECL(int) DBGFR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t iHitTrigger, uint64_t iHitDisable, uint32_t *piBp)
 {
     /*
@@ -628 +628 @@
  * @internal
  */
-static DECLCALLBACK(int) dbgfR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable, PRTUINT piBp)
+static DECLCALLBACK(int) dbgfR3BpSetREM(PVM pVM, PCDBGFADDRESS pAddress, uint64_t *piHitTrigger, uint64_t *piHitDisable, uint32_t *piBp)
 {
     /*
@@ -695 +695 @@
  * @thread  Any thread.
  */
-VMMR3DECL(int) DBGFR3BpClear(PVM pVM, RTUINT iBp)
+VMMR3DECL(int) DBGFR3BpClear(PVM pVM, uint32_t iBp)
 {
     /*
@@ -715 +715 @@
  * @internal
  */
-static DECLCALLBACK(int) dbgfR3BpClear(PVM pVM, RTUINT iBp)
+static DECLCALLBACK(int) dbgfR3BpClear(PVM pVM, uint32_t iBp)
 {
     /*
@@ -768 +768 @@
  * @thread  Any thread.
  */
-VMMR3DECL(int) DBGFR3BpEnable(PVM pVM, RTUINT iBp)
+VMMR3DECL(int) DBGFR3BpEnable(PVM pVM, uint32_t iBp)
 {
     /*
@@ -788 +788 @@
  * @internal
  */
-static DECLCALLBACK(int) dbgfR3BpEnable(PVM pVM, RTUINT iBp)
+static DECLCALLBACK(int) dbgfR3BpEnable(PVM pVM, uint32_t iBp)
 {
     /*
@@ -841 +841 @@
  * @thread  Any thread.
  */
-VMMR3DECL(int) DBGFR3BpDisable(PVM pVM, RTUINT iBp)
+VMMR3DECL(int) DBGFR3BpDisable(PVM pVM, uint32_t iBp)
 {
     /*
@@ -861 +861 @@
  * @internal
  */
-static DECLCALLBACK(int) dbgfR3BpDisable(PVM pVM, RTUINT iBp)
+static DECLCALLBACK(int) dbgfR3BpDisable(PVM pVM, uint32_t iBp)
 {
     /*

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

@@ -86 +86 @@
     {  1,           1,          DBGCVAR_CAT_STRING,     0,                              "direction",    "write/read." },
     {  1,           1,          DBGCVAR_CAT_STRING,     0,                              "filename",     "Filename." },
-    {  1,           1,          DBGCVAR_CAT_STRING,     0,                              "errcode",      "IPRT error code." },
+    {  1,           1,          DBGCVAR_CAT_NUMBER,     0,                              "errcode",      "VBox status code." },
 };
 
@@ -699 +699 @@
 static DECLCALLBACK(int) pdmacEpFileErrorInject(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR pArgs, unsigned cArgs, PDBGCVAR pResult)
 {
-    bool fWrite;
-    PPDMASYNCCOMPLETIONEPCLASSFILE pEpClassFile;
-
     /*
      * Validate input.
      */
-    if (!pVM)
-        return DBGCCmdHlpPrintf(pCmdHlp, "error: The command requires a VM to be selected.\n");
-    if (    cArgs != 3
-        ||  pArgs[0].enmType != DBGCVAR_TYPE_STRING
-        ||  pArgs[1].enmType != DBGCVAR_TYPE_STRING
-        ||  pArgs[2].enmType != DBGCVAR_TYPE_STRING)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: parser error, invalid arguments.\n");
-
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
+    DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, -1, cArgs == 3);
+    DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, 0, pArgs[0].enmType == DBGCVAR_TYPE_STRING);
+    DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, 1, pArgs[1].enmType == DBGCVAR_TYPE_STRING);
+    DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, 2, pArgs[2].enmType == DBGCVAR_TYPE_NUMBER);
+
+    PPDMASYNCCOMPLETIONEPCLASSFILE pEpClassFile;
     pEpClassFile = (PPDMASYNCCOMPLETIONEPCLASSFILE)pVM->pUVM->pdm.s.apAsyncCompletionEndpointClass[PDMASYNCCOMPLETIONEPCLASSTYPE_FILE];
 
     /* Syntax is "read|write <filename> <status code>" */
+    bool fWrite;
     if (!RTStrCmp(pArgs[0].u.pszString, "read"))
         fWrite = false;
@@ -721 +718 @@
         fWrite = true;
     else
-    {
-        DBGCCmdHlpPrintf(pCmdHlp, "error: invalid transefr direction '%s'.\n", pArgs[0].u.pszString);
-        return VINF_SUCCESS;
-    }
-
-    /* Search for the matching endpoint. */
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "invalid transfer direction '%s'", pArgs[0].u.pszString);
+
+    int32_t rcToInject = (int32_t)pArgs[2].u.u64Number;
+    if ((uint64_t)rcToInject != pArgs[2].u.u64Number)
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "The status code '%lld' is out of range", pArgs[0].u.u64Number);
+
+
+    /*
+     * Search for the matching endpoint.
+     */
     RTCritSectEnter(&pEpClassFile->Core.CritSect);
+
     PPDMASYNCCOMPLETIONENDPOINTFILE pEpFile = (PPDMASYNCCOMPLETIONENDPOINTFILE)pEpClassFile->Core.pEndpointsHead;
-
     while (pEpFile)
     {
@@ -736 +737 @@
         pEpFile = (PPDMASYNCCOMPLETIONENDPOINTFILE)pEpFile->Core.pNext;
     }
-
     if (pEpFile)
     {
-        int rcToInject = RTStrToInt32(pArgs[2].u.pszString);
-
+        /*
+         * Do the job.
+         */
         if (fWrite)
             ASMAtomicXchgS32(&pEpFile->rcReqWrite, rcToInject);
         else
-            ASMAtomicXchgS32(&pEpFile->rcReqRead, rcToInject);
-
-            DBGCCmdHlpPrintf(pCmdHlp, "Injected %Rrc into '%s' for %s\n",
-                             rcToInject, pArgs[1].u.pszString, pArgs[0].u.pszString);
-    }
-    else
-        DBGCCmdHlpPrintf(pCmdHlp, "No file with name '%s' found\n", NULL, pArgs[1].u.pszString);
+            ASMAtomicXchgS32(&pEpFile->rcReqRead,  rcToInject);
+
+        DBGCCmdHlpPrintf(pCmdHlp, "Injected %Rrc into '%s' for %s\n",
+                         (int)rcToInject, pArgs[1].u.pszString, pArgs[0].u.pszString);
+    }
 
     RTCritSectLeave(&pEpClassFile->Core.CritSect);
+
+    if (!pEpFile)
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "No file with name '%s' found", pArgs[1].u.pszString);
     return VINF_SUCCESS;
 }
-#endif
+#endif /* VBOX_WITH_DEBUGGER */
 
 static int pdmacFileInitialize(PPDMASYNCCOMPLETIONEPCLASS pClassGlobals, PCFGMNODE pCfgNode)
@@ -830 +832 @@
     if (RT_SUCCESS(rc))
     {
-        rc = DBGCRegisterCommands(&g_aCmds[0], 1);
+        rc = DBGCRegisterCommands(&g_aCmds[0], RT_ELEMENTS(g_aCmds));
         AssertRC(rc);
     }

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

@@ -172 +172 @@
 {
     /* pszCmd,      cArgsMin, cArgsMax, paArgDesc,          cArgDescs,                  pResultDesc,        fFlags,     pfnHandler          pszSyntax,          ....pszDescription */
-    { "stats",      0,        1,        &g_aArgPat[0],      RT_ELEMENTS(g_aArgPat),        NULL,               0,          stamR3CmdStats,     "[pattern]",        "Display statistics." },
-    { "statsreset", 0,        1,        &g_aArgPat[0],      RT_ELEMENTS(g_aArgPat),        NULL,               0,          stamR3CmdStatsReset,"[pattern]",        "Resets statistics." }
+    { "stats",      0,        1,        &g_aArgPat[0],      RT_ELEMENTS(g_aArgPat),     NULL,               0,          stamR3CmdStats,     "[pattern]",        "Display statistics." },
+    { "statsreset", 0,        1,        &g_aArgPat[0],      RT_ELEMENTS(g_aArgPat),     NULL,               0,          stamR3CmdStatsReset,"[pattern]",        "Resets statistics." }
 };
 #endif
@@ -1922 +1922 @@
      * Validate input.
      */
-    if (!pVM)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: The command requires VM to be selected.\n");
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
     PUVM pUVM = pVM->pUVM;
     if (!pUVM->stam.s.pHead)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Sorry, no statistics present.\n");
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "No statistics present");
 
     /*
@@ -1932 +1931 @@
      */
     STAMR3PRINTONEARGS Args;
-    Args.pVM = pVM;
-    Args.pvArg = pCmdHlp;
-    Args.pfnPrintf = stamR3EnumDbgfPrintf;
+    Args.pVM        = pVM;
+    Args.pvArg      = pCmdHlp;
+    Args.pfnPrintf  = stamR3EnumDbgfPrintf;
 
     return stamR3EnumU(pUVM, cArgs ? paArgs[0].u.pszString : NULL, true /* fUpdateRing0 */, stamR3PrintOne, &Args);
@@ -1974 +1973 @@
      * Validate input.
      */
-    if (!pVM)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: The command requires VM to be selected.\n");
+    DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
     PUVM pUVM = pVM->pUVM;
     if (!pUVM->stam.s.pHead)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Sorry, no statistics present.\n");
+        return DBGCCmdHlpFail(pCmdHlp, pCmd, "No statistics present");
 
     /*
@@ -1985 +1983 @@
     int rc = STAMR3ResetU(pUVM, cArgs ? paArgs[0].u.pszString : NULL);
     if (RT_SUCCESS(rc))
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "info: Statistics reset.\n");
-
-    return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "Resetting statistics.\n");
+        return DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "STAMR3ResetU");
+    return DBGCCmdHlpPrintf(pCmdHlp, "Statistics have been reset.\n");
 }
 

trunk/src/VBox/VMM/include/DBGFInternal.h

@@ -245 +245 @@
     bool                        fSymInited;
     /** Alignment padding. */
-    RTUINT                      uAlignment0;
+    uint32_t                    uAlignment0;
 
     /** The number of hardware breakpoints. */
-    RTUINT                      cHwBreakpoints;
+    uint32_t                    cHwBreakpoints;
     /** The number of active breakpoints. */
-    RTUINT                      cBreakpoints;
+    uint32_t                    cBreakpoints;
     /** Array of hardware breakpoints. (0..3)
      * This is shared among all the CPUs because life is much simpler that way. */

trunk/src/recompiler/VBoxRecompiler.c

@@ -3669 +3669 @@
 static DECLCALLBACK(int) remR3CmdDisasEnableStepping(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult)
 {
-    bool fEnable;
     int rc;
 
-    /* print status */
     if (cArgs == 0)
-        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "DisasStepping is %s\n",
-                                  pVM->rem.s.Env.state & CPU_EMULATE_SINGLE_STEP ? "enabled" : "disabled");
-
-    /* convert the argument and change the mode. */
-    rc = pCmdHlp->pfnVarToBool(pCmdHlp, &paArgs[0], &fEnable);
-    if (RT_FAILURE(rc))
-        return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "boolean conversion failed!\n");
-    rc = REMR3DisasEnableStepping(pVM, fEnable);
-    if (RT_FAILURE(rc))
-        return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "REMR3DisasEnableStepping failed!\n");
+        /*
+         * Print the current status.
+         */
+        rc = DBGCCmdHlpPrintf(pCmdHlp, "DisasStepping is %s\n",
+                              pVM->rem.s.Env.state & CPU_EMULATE_SINGLE_STEP ? "enabled" : "disabled");
+    else
+    {
+        /*
+         * Convert the argument and change the mode.
+         */
+        bool fEnable;
+        rc = DBGCCmdHlpVarToBool(pCmdHlp, &paArgs[0], &fEnable);
+        if (RT_SUCCESS(rc))
+        {
+            rc = REMR3DisasEnableStepping(pVM, fEnable);
+            if (RT_SUCCESS(rc))
+                rc = DBGCCmdHlpPrintf(pCmdHlp, "DisasStepping was %s\n", fEnable ? "enabled" : "disabled");
+            else
+                rc = DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "REMR3DisasEnableStepping");
+        }
+        else
+            rc = DBGCCmdHlpFailRc(pCmdHlp, pCmd, rc, "DBGCCmdHlpVarToBool");
+    }
     return rc;
 }
-#endif
+#endif /* VBOX_WITH_DEBUGGER && !win.amd64 */