aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog13
-rw-r--r--gdb/NEWS6
-rw-r--r--gdb/doc/ChangeLog9
-rw-r--r--gdb/doc/gdb.texinfo19
-rw-r--r--gdb/exceptions.h3
-rw-r--r--gdb/mi/mi-main.c12
-rw-r--r--gdb/mi/mi-parse.c3
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.mi/mi-undefined-cmd.exp33
9 files changed, 97 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e90469..a6a36ef 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2013-12-03 Pedro Alves <palves@redhat.com>
+ Joel Brobecker <brobecker@adacore.com>
+
+ * exceptions.h (enum_errors) <UNDEFINED_COMMAND_ERROR>: New enum.
+ * mi/mi-parse.c (mi_parse): Throw UNDEFINED_COMMAND_ERROR instead
+ of a regular error when the GDB/MI command does not exist.
+ * mi/mi-main.c (mi_cmd_list_features): Add
+ "undefined-command-error-code".
+ (mi_print_exception): Print an "undefined-command"
+ error code if EXCEPTION.ERROR is UNDEFINED_COMMAND_ERROR.
+ * NEWS: Add entry documenting the new "code" variable in
+ "^error" result records.
+
2013-12-03 Joel Brobecker <brobecker@adacore.com>
* mi/mi-cmds.h (mi_cmd_info_gdb_mi_command): Declare.
diff --git a/gdb/NEWS b/gdb/NEWS
index 5cc4862..51dc43a 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -161,6 +161,12 @@ show code-cache
** The new command -info-gdb-mi-command allows the user to determine
whether a GDB/MI command is supported or not.
+ ** The "^error" result record returned when trying to execute an undefined
+ GDB/MI command now provides a variable named "code" whose content is the
+ "undefined-command" error code. Support for this feature can be verified
+ by using the "-list-features" command, which should contain
+ "undefined-command-error-code".
+
** The -trace-save MI command can optionally save trace buffer in Common
Trace Format now.
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 329c293..fdb05c5 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,5 +1,14 @@
2013-12-03 Joel Brobecker <brobecker@adacore.com>
+ * gdb.texinfo (GDB/MI Result Records): Fix the syntax of the
+ "^error" result record concerning the error message. Document
+ the error code that may also be part of that result record.
+ (GDB/MI Miscellaneous Commands): Document the
+ "undefined-command-error-code" element in the output of
+ the "-list-features" GDB/MI command.
+
+2013-12-03 Joel Brobecker <brobecker@adacore.com>
+
* gdb.texinfo (GDB/MI Miscellaneous Commands): Document
the new -info-gdb-mi-command GDB/MI command. Document
the meaning of "-info-gdb-mi-command" in the output of
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 5b1021b..75633c9 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -29333,10 +29333,19 @@ which threads are resumed.
@findex ^connected
@value{GDBN} has connected to a remote target.
-@item "^error" "," @var{c-string}
+@item "^error" "," "msg=" @var{c-string} [ "," "code=" @var{c-string} ]
@findex ^error
-The operation failed. The @code{@var{c-string}} contains the corresponding
-error message.
+The operation failed. The @code{msg=@var{c-string}} variable contains
+the corresponding error message.
+
+If present, the @code{code=@var{c-string}} variable provides an error
+code on which consumers can rely on to detect the corresponding
+error condition. At present, only one error code is defined:
+
+@table @samp
+@item "undefined-command"
+Indicates that the command causing the error does not exist.
+@end table
@item "^exit"
@findex ^exit
@@ -35204,6 +35213,10 @@ Indicates that all @sc{gdb/mi} commands accept the @option{--language}
option (@pxref{Context management}).
@item info-gdb-mi-command
Indicates support for the @code{-info-gdb-mi-command} command.
+@item undefined-command-error-code
+Indicates support for the "undefined-command" error code in error result
+records, produced when trying to execute an undefined @sc{gdb/mi} command
+(@pxref{GDB/MI Result Records}).
@end table
@subheading The @code{-list-target-features} Command
diff --git a/gdb/exceptions.h b/gdb/exceptions.h
index 129d29a..a3a28f4 100644
--- a/gdb/exceptions.h
+++ b/gdb/exceptions.h
@@ -93,6 +93,9 @@ enum errors {
aborted as the inferior state is no longer valid. */
TARGET_CLOSE_ERROR,
+ /* An undefined command was executed. */
+ UNDEFINED_COMMAND_ERROR,
+
/* Add more errors here. */
NR_ERRORS
};
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 48c8d09..3a0e6a8 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -1818,6 +1818,7 @@ mi_cmd_list_features (char *command, char **argv, int argc)
ui_out_field_string (uiout, NULL, "ada-exceptions");
ui_out_field_string (uiout, NULL, "language-option");
ui_out_field_string (uiout, NULL, "info-gdb-mi-command");
+ ui_out_field_string (uiout, NULL, "undefined-command-error-code");
#if HAVE_PYTHON
if (gdb_python_initialized)
@@ -2023,7 +2024,16 @@ mi_print_exception (const char *token, struct gdb_exception exception)
fputs_unfiltered ("unknown error", raw_stdout);
else
fputstr_unfiltered (exception.message, '"', raw_stdout);
- fputs_unfiltered ("\"\n", raw_stdout);
+ fputs_unfiltered ("\"", raw_stdout);
+
+ switch (exception.error)
+ {
+ case UNDEFINED_COMMAND_ERROR:
+ fputs_unfiltered (",code=\"undefined-command\"", raw_stdout);
+ break;
+ }
+
+ fputs_unfiltered ("\n", raw_stdout);
}
void
diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c
index a2634f1..a092759 100644
--- a/gdb/mi/mi-parse.c
+++ b/gdb/mi/mi-parse.c
@@ -285,7 +285,8 @@ mi_parse (const char *cmd, char **token)
/* Find the command in the MI table. */
parse->cmd = mi_lookup (parse->command);
if (parse->cmd == NULL)
- error (_("Undefined MI command: %s"), parse->command);
+ throw_error (UNDEFINED_COMMAND_ERROR,
+ _("Undefined MI command: %s"), parse->command);
/* Skip white space following the command. */
chp = skip_spaces_const (chp);
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 43a7c67..bc4bcbb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2013-12-03 Joel Brobecker <brobecker@adacore.com>
+ * gdb.mi/mi-undefined-cmd.exp: New testcase.
+
+2013-12-03 Joel Brobecker <brobecker@adacore.com>
+
* gdb.mi/mi-i-cmd.exp: New file.
2013-12-02 Doug Evans <dje@google.com>
diff --git a/gdb/testsuite/gdb.mi/mi-undefined-cmd.exp b/gdb/testsuite/gdb.mi/mi-undefined-cmd.exp
new file mode 100644
index 0000000..8df0a76
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/mi-undefined-cmd.exp
@@ -0,0 +1,33 @@
+# Copyright 2013 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+load_lib mi-support.exp
+set MIFLAGS "-i=mi"
+
+gdb_exit
+if [mi_gdb_start] {
+ continue
+}
+
+
+# First, verify that the debugger correctly advertises support
+# for the "undefined-command" error code...
+mi_gdb_test "-list-features" \
+ "\\^done,features=\\\[.*\"undefined-command-error-code\".*\\\]" \
+ "-list-features should include \"undefined-command-error-code\""
+
+mi_gdb_test "-undefined-command" \
+ "\\^error,.*,code=\"undefined-command\"" \
+ "error code when executing undefined command"
generated by cgit v1.1 at 2024-12-30 04:06:05 +0000