+2003-03-05 James Ingham <jingham@apple.com>
+ Daniel Jacobowitz <drow@mvista.com>
+
+ * cp-abi.c: Include "command.h", "gdbcmd.h", and "ui-out.h".
+ (auto_cp_abi): New variable.
+ (current_cp_abi, num_cp_abis): Make static.
+ (CP_ABI_MAX): Define.
+ (cp_abis): Turn into an array.
+ (value_virtual_fn_field): Fix formatting.
+ (switch_to_cp_abi, register_cp_abi): Update. register_cp_abi now
+ takes a pointer.
+ (set_cp_abi_as_auto_default, set_cp_abi_cmd, show_cp_abi_cmd)
+ (list_cp_abis, _initialize_cp_abi): New functions.
+ * cp-abi.h: Add prototype for set_cp_abi_as_auto_default. Remove
+ declarations for cp_abis, num_cp_abis, current_cp_abi, and
+ switch_to_cp_abi. Update prototype for register_cp_abi.
+ * Makefile.in (cp-abi.o): Update dependencies.
+ * minsyms.c (install_minimal_symbols): Call set_cp_abi_as_auto_default
+ instead of switch_to_cp_abi.
+ * gnu-v2-abi.c (_initialize_gnu_v2_abi): Likewise. Update call to
+ register_cp_abi.
+ * gnu-v3-abi.c (_initialize_gnu_v3_abi): Update call to
+ register_cp_abi.
+ * hpacc-abi.c (_initialize_hpacc_abi): Likewise.
+
2003-03-05 Daniel Jacobowitz <drow@mvista.com>
* dwarf2expr.c (new_dwarf_expr_context): Add (void) to definition.
#include "defs.h"
#include "value.h"
#include "cp-abi.h"
+#include "command.h"
+#include "gdbcmd.h"
+#include "ui-out.h"
+
#include "gdb_string.h"
-struct cp_abi_ops current_cp_abi;
+static struct cp_abi_ops *find_cp_abi (const char *short_name);
-struct cp_abi_ops *cp_abis;
+static struct cp_abi_ops current_cp_abi = { "", NULL };
+static struct cp_abi_ops auto_cp_abi = { "auto", NULL };
-int num_cp_abis = 0;
+#define CP_ABI_MAX 8
+static struct cp_abi_ops *cp_abis[CP_ABI_MAX];
+static int num_cp_abis = 0;
enum ctor_kinds
is_constructor_name (const char *name)
}
struct value *
-value_virtual_fn_field (struct value **arg1p, struct fn_field * f, int j,
- struct type * type, int offset)
+value_virtual_fn_field (struct value **arg1p, struct fn_field *f, int j,
+ struct type *type, int offset)
{
if ((current_cp_abi.virtual_fn_field) == NULL)
return NULL;
return (*current_cp_abi.rtti_type) (v, full, top, using_enc);
}
+/* Set the current C++ ABI to SHORT_NAME. */
+
+static int
+switch_to_cp_abi (const char *short_name)
+{
+ struct cp_abi_ops *abi;
+
+ abi = find_cp_abi (short_name);
+ if (abi == NULL)
+ return 0;
+
+ current_cp_abi = *abi;
+ return 1;
+}
+
+/* Add ABI to the list of supported C++ ABI's. */
+
int
-register_cp_abi (struct cp_abi_ops abi)
+register_cp_abi (struct cp_abi_ops *abi)
{
- cp_abis =
- xrealloc (cp_abis, (num_cp_abis + 1) * sizeof (struct cp_abi_ops));
+ if (num_cp_abis == CP_ABI_MAX)
+ internal_error (__FILE__, __LINE__,
+ "Too many C++ ABIs, please increase CP_ABI_MAX in cp-abi.c");
+
cp_abis[num_cp_abis++] = abi;
return 1;
+}
+
+/* Set the ABI to use in "auto" mode to SHORT_NAME. */
+void
+set_cp_abi_as_auto_default (const char *short_name)
+{
+ char *new_longname, *new_doc;
+ struct cp_abi_ops *abi = find_cp_abi (short_name);
+
+ if (abi == NULL)
+ internal_error (__FILE__, __LINE__,
+ "Cannot find C++ ABI \"%s\" to set it as auto default.",
+ short_name);
+
+ if (auto_cp_abi.longname != NULL)
+ xfree ((char *) auto_cp_abi.longname);
+ if (auto_cp_abi.doc != NULL)
+ xfree ((char *) auto_cp_abi.doc);
+
+ auto_cp_abi = *abi;
+
+ auto_cp_abi.shortname = "auto";
+ new_longname = xmalloc (strlen ("currently ") + 1 + strlen (abi->shortname)
+ + 1 + 1);
+ sprintf (new_longname, "currently \"%s\"", abi->shortname);
+ auto_cp_abi.longname = new_longname;
+
+ new_doc = xmalloc (strlen ("Automatically selected; currently ")
+ + 1 + strlen (abi->shortname) + 1 + 1);
+ sprintf (new_doc, "Automatically selected; currently \"%s\"", abi->shortname);
+ auto_cp_abi.doc = new_doc;
+
+ /* Since we copy the current ABI into current_cp_abi instead of
+ using a pointer, if auto is currently the default, we need to
+ reset it. */
+ if (strcmp (current_cp_abi.shortname, "auto") == 0)
+ switch_to_cp_abi ("auto");
}
-int
-switch_to_cp_abi (const char *short_name)
+/* Return the ABI operations associated with SHORT_NAME. */
+
+static struct cp_abi_ops *
+find_cp_abi (const char *short_name)
{
int i;
+
for (i = 0; i < num_cp_abis; i++)
- if (strcmp (cp_abis[i].shortname, short_name) == 0)
- current_cp_abi = cp_abis[i];
- return 1;
+ if (strcmp (cp_abis[i]->shortname, short_name) == 0)
+ return cp_abis[i];
+
+ return NULL;
}
+/* Display the list of registered C++ ABIs. */
+
+static void
+list_cp_abis (int from_tty)
+{
+ struct cleanup *cleanup_chain;
+ int i;
+ ui_out_text (uiout, "The available C++ ABIs are:\n");
+
+ cleanup_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "cp-abi-list");
+ for (i = 0; i < num_cp_abis; i++)
+ {
+ char pad[14];
+ int padcount;
+
+ ui_out_text (uiout, " ");
+ ui_out_field_string (uiout, "cp-abi", cp_abis[i]->shortname);
+
+ padcount = 16 - 2 - strlen (cp_abis[i]->shortname);
+ pad[padcount] = 0;
+ while (padcount > 0)
+ pad[--padcount] = ' ';
+ ui_out_text (uiout, pad);
+
+ ui_out_field_string (uiout, "doc", cp_abis[i]->doc);
+ ui_out_text (uiout, "\n");
+ }
+ do_cleanups (cleanup_chain);
+}
+
+/* Set the current C++ ABI, or display the list of options if no
+ argument is given. */
+
+static void
+set_cp_abi_cmd (char *args, int from_tty)
+{
+ if (args == NULL)
+ {
+ list_cp_abis (from_tty);
+ return;
+ }
+
+ if (!switch_to_cp_abi (args))
+ error ("Could not find \"%s\" in ABI list", args);
+}
+
+/* Show the currently selected C++ ABI. */
+
+static void
+show_cp_abi_cmd (char *args, int from_tty)
+{
+ ui_out_text (uiout, "The currently selected C++ ABI is \"");
+
+ ui_out_field_string (uiout, "cp-abi", current_cp_abi.shortname);
+ ui_out_text (uiout, "\" (");
+ ui_out_field_string (uiout, "longname", current_cp_abi.longname);
+ ui_out_text (uiout, ").\n");
+}
+
+void
+_initialize_cp_abi (void)
+{
+ register_cp_abi (&auto_cp_abi);
+ switch_to_cp_abi ("auto");
+
+ add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd,
+ "Set the ABI used for inspecting C++ objects.\n"
+ "\"set cp-abi\" with no arguments will list the available ABIs.",
+ &setlist);
+
+ add_cmd ("cp-abi", class_obscure, show_cp_abi_cmd,
+ "Show the ABI used for inspecting C++ objects.", &showlist);
+}
projects / binutils-gdb.git / commitdiff