[RFC/Ada 2/2] Implement GDB/MI equivalent of "info exceptions" CLI command.

Joel Brobecker
2013-11-07T15:05:33Z

This patch implements a new GDB/MI command implementing the equivalent
of the "info exceptions" CLI command. The command syntax is:

-info-ada-exception [REGEXP]

Here is an example of usage (slightly formatted by hand to make it
easier to read):

-info-ada-exceptions ions\.a_
^done,ada-exceptions=
{nr_rows="2",nr_cols="2",
hdr=[{width="1",alignment="-1",col_name="name",colhdr="Name"},
{width="1",alignment="-1",col_name="address",colhdr="Address"}],
body=[{name="global_exceptions.a_global_exception",
address="0x0000000000613a80"},
{name="global_exceptions.a_private_exception",
address="0x0000000000613ac0"}]}

gdb/Changelog:

* mi/mi-cmds.h (mi_cmd_info_ada_exceptions): Add declaration.
* mi/mi-cmds.c (mi_cmds): Add entry for -info-ada-exceptions
command.
* mi/mi-cmd-info.c: #include "ada-lang.c" and "arch-utils.c".
(mi_cmd_info_ada_exceptions): New function.

gdb/testsuite/ChangeLog:

* gdb.ada/mi_exc_info: New testcase.

Tested on x86_64-linux, no regression.
OK to commit?

Thank you!
--
Joel

---
gdb/mi/mi-cmd-info.c | 51 +++++++++++++++++++++++++++++
gdb/mi/mi-cmds.c | 1 +
gdb/mi/mi-cmds.h | 1 +
gdb/testsuite/gdb.ada/mi_exc_info.exp | 51 +++++++++++++++++++++++++++++
gdb/testsuite/gdb.ada/mi_exc_info/const.ads | 18 ++++++++++
gdb/testsuite/gdb.ada/mi_exc_info/foo.adb | 20 +++++++++++
6 files changed, 142 insertions(+)
create mode 100644 gdb/testsuite/gdb.ada/mi_exc_info.exp
create mode 100644 gdb/testsuite/gdb.ada/mi_exc_info/const.ads
create mode 100644 gdb/testsuite/gdb.ada/mi_exc_info/foo.adb

diff --git a/gdb/mi/mi-cmd-info.c b/gdb/mi/mi-cmd-info.c
index 8eb4220..aa4d210 100644
--- a/gdb/mi/mi-cmd-info.c
+++ b/gdb/mi/mi-cmd-info.c
@@ -19,6 +19,57 @@
#include "defs.h"
#include "osdata.h"
#include "mi-cmds.h"
+#include "ada-lang.h"
+#include "arch-utils.h"
+
+/* Implement the "-info-ada-exceptions" GDB/MI command. */
+
+void
+mi_cmd_info_ada_exceptions (char *command, char **argv, int argc)
+{
+ struct ui_out *uiout = current_uiout;
+ struct gdbarch *gdbarch = get_current_arch ();
+ char *regexp;
+ struct cleanup *old_chain;
+ VEC(ada_exc_info) *exceptions;
+ int ix;
+ struct ada_exc_info *info;
+
+ switch (argc)
+ {
+ case 0:
+ regexp = NULL;
+ break;
+ case 1:
+ regexp = argv[0];
+ break;
+ default:
+ error (_("Usage: -info-ada-exceptions [REGEXP]"));
+ break;
+ }
+
+ exceptions = ada_exceptions_list (regexp);
+ old_chain = make_cleanup (VEC_cleanup (ada_exc_info), &exceptions);
+
+ make_cleanup_ui_out_table_begin_end
+ (uiout, 2, VEC_length (ada_exc_info, exceptions), "ada-exceptions");
+ ui_out_table_header (uiout, 1, ui_left, "name", "Name");
+ ui_out_table_header (uiout, 1, ui_left, "address", "Address");
+ ui_out_table_body (uiout);
+
+ for (ix = 0; VEC_iterate(ada_exc_info, exceptions, ix, info); ix++)
+ {
+ struct cleanup *sub_chain;
+
+ sub_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
+ ui_out_field_string (uiout, "name", info->name);
+ ui_out_field_core_addr (uiout, "address", gdbarch, info->addr);
+
+ do_cleanups (sub_chain);
+ }
+
+ do_cleanups (old_chain);
+}

void
mi_cmd_info_os (char *command, char **argv, int argc)
diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index 1b8ec92..496a8aa 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -124,6 +124,7 @@ static struct mi_cmd mi_cmds[] =
DEF_MI_CMD_CLI ("gdb-version", "show version", 0),
DEF_MI_CMD_MI ("inferior-tty-set", mi_cmd_inferior_tty_set),
DEF_MI_CMD_MI ("inferior-tty-show", mi_cmd_inferior_tty_show),
+ DEF_MI_CMD_MI ("info-ada-exceptions", mi_cmd_info_ada_exceptions),
DEF_MI_CMD_MI ("info-os", mi_cmd_info_os),
DEF_MI_CMD_MI ("interpreter-exec", mi_cmd_interpreter_exec),
DEF_MI_CMD_MI ("list-features", mi_cmd_list_features),
diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h
index bbca54d..cb8aac1 100644
--- a/gdb/mi/mi-cmds.h
+++ b/gdb/mi/mi-cmds.h
@@ -73,6 +73,7 @@ extern mi_cmd_argv_ftype mi_cmd_file_list_exec_source_files;
extern mi_cmd_argv_ftype mi_cmd_gdb_exit;
extern mi_cmd_argv_ftype mi_cmd_inferior_tty_set;
extern mi_cmd_argv_ftype mi_cmd_inferior_tty_show;
+extern mi_cmd_argv_ftype mi_cmd_info_ada_exceptions;
extern mi_cmd_argv_ftype mi_cmd_info_os;
extern mi_cmd_argv_ftype mi_cmd_interpreter_exec;
extern mi_cmd_argv_ftype mi_cmd_list_features;
diff --git a/gdb/testsuite/gdb.ada/mi_exc_info.exp b/gdb/testsuite/gdb.ada/mi_exc_info.exp
new file mode 100644
index 0000000..b77ccbc
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/mi_exc_info.exp
@@ -0,0 +1,51 @@
+# 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 "ada.exp"
+
+standard_ada_testfile foo
+
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+ return -1
+}
+
+load_lib mi-support.exp
+set MIFLAGS "-i=mi"
+
+gdb_exit
+if [mi_gdb_start] {
+ continue
+}
+
+mi_delete_breakpoints
+mi_gdb_reinitialize_dir $srcdir/$subdir
+mi_gdb_load ${binfile}
+
+mi_gdb_test "-info-ada-exceptions" \
+ "\\^done,ada-exceptions={nr_rows=\"5\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"program_error\",address=\"$hex\"},{name=\"storage_error\",address=\"$hex\"},{name=\"tasking_error\",address=\"$hex\"},{name=\"const.aint_global_e\",address=\"$hex\"}\\\]}" \
+ "-info-ada-exceptions"
+
+mi_gdb_test "-info-ada-exceptions task" \
+ "\\^done,ada-exceptions={nr_rows=\"1\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"tasking_error\",address=\"$hex\"}\\\]}" \
+ "-info-ada-exceptions task"
+
+mi_gdb_test "-info-ada-exceptions global" \
+ "\\^done,ada-exceptions={nr_rows=\"1\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"const.aint_global_e\",address=\"$hex\"}\\\]}" \
+ "-info-ada-exceptions global"
+
+mi_gdb_test "-info-ada-exceptions const.aint" \
+ "\\^done,ada-exceptions={nr_rows=\"2\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"const.aint_global_e\",address=\"$hex\"}\\\]}" \
+ "-info-ada-exceptions const.aint"
+
diff --git a/gdb/testsuite/gdb.ada/mi_exc_info/const.ads b/gdb/testsuite/gdb.ada/mi_exc_info/const.ads
new file mode 100644
index 0000000..753241e
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/mi_exc_info/const.ads
@@ -0,0 +1,18 @@
+-- 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/>.
+
+package Const is
+ Aint_Global_E : exception;
+end Const;
diff --git a/gdb/testsuite/gdb.ada/mi_exc_info/foo.adb b/gdb/testsuite/gdb.ada/mi_exc_info/foo.adb
new file mode 100644
index 0000000..e047db2
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/mi_exc_info/foo.adb
@@ -0,0 +1,20 @@
+-- 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/>.
+
+with Const; use Const;
+procedure Foo is
+begin
+ raise Aint_Global_E;
+end Foo;
--
1.8.1.2