"Quiet mode" is now turned off, if dropping into the debugger, both b…

…y using -V and by triggering unimplemented instructions.

git-svn-id: file:///home/ryo_on/repos/gxemul-repo/gxemul/trunk@5660 dbbdf1f2-f3a0-11dc-8807-f0e41a653009

HISTORY

@@ -4442,3 +4442,5 @@ Changelog for GXemul:
 		Renaming old testmips to oldtestmips, so that the name
 		testmips can be used by the new framework.
 20100131	Reimplementing a slow version of the st.d M88K instruction.
+		"Quiet mode" is now turned off, if dropping into the debugger,
+		both by using -V and by triggering unimplemented instructions.

man/gxemul.1

@@ -87,9 +87,13 @@ Remember to use quotes if your shell gives special meaning to parentheses.
 .It Fl H
 Display a list of available machine templates.
 .It Fl q
-Quiet mode (suppress debug messages).
+Start up in Quiet mode (i.e. suppress debug messages). If an error occurs
+during emulation which stops execution and drops the user into the debugger,
+quiet mode is turned off.
 .It Fl V
-Start up in interactive mode, paused.
+Start up in interactive mode, paused. If this option is used,
+.Fl q
+is ignored.
 .El
 .Pp
 Any files supplied on the command line when using the
@@ -447,7 +451,9 @@ Force the single-step debugger to be entered at the end of a simulation.
 .It Fl q
 Quiet mode; this suppresses startup messages.
 .It Fl V
-Start up in the single-step debugger, paused.
+Start up in the single-step debugger, paused. If this option is used,
+.Fl q
+is ignored.
 .It Fl v
 Increase verbosity (show more debug messages). This option can be used
 multiple times.

src/components/cpu/CPUDyntransComponent.cc

@@ -343,8 +343,14 @@ void CPUDyntransComponent::DyntransToBeTranslatedDone(struct DyntransIC* ic)
 
 	if (ic->f == NULL || ic->f == instr_abort_in_delay_slot) {
 		abort = true;
-		UI* ui = GetUI();
 
+		// Instruction translation failed. If we were running in
+		// quiet mode, then simply dropping into the GXemul> prompt
+		// with no good explanation would be bad, so we always turn
+		// off quiet mode on Aborts:
+		GetRunningGXemulInstance()->SetQuietMode(false);
+
+		UI* ui = GetUI();
 		if (ui != NULL) {
 			bool isSingleStepping = GetRunningGXemulInstance()->GetRunState() == GXemul::SingleStepping;
 

src/old_main/main.cc

@@ -584,6 +584,10 @@ int get_cmd_args(int argc, char *argv[], struct emul *emul,
 	extra_argc = argc;
 	extra_argv = argv;
 
+	// If -V is used, -q is ignored.
+	if (single_step == ENTER_SINGLE_STEPPING)
+		quiet_mode = 0;
+
 	if (type == NULL && subtype == NULL &&
 	    (single_step == ENTER_SINGLE_STEPPING || argc > 0)) {
 		int res = 0;