Changeset 35694 in vbox for trunk/src/recompiler/VBoxRecompiler.c

Timestamp:

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

Author:

vboxsync

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

69620

Message:

Debugger console: more cleanup.

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (1 diff)

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 */