diff options
| -rw-r--r-- | gdb/ChangeLog | 25 | ||||
| -rw-r--r-- | gdb/Makefile.in | 3 | ||||
| -rw-r--r-- | gdb/cp-abi.c | 166 | ||||
| -rw-r--r-- | gdb/cp-abi.h | 7 | ||||
| -rw-r--r-- | gdb/gnu-v2-abi.c | 4 | ||||
| -rw-r--r-- | gdb/gnu-v3-abi.c | 2 | ||||
| -rw-r--r-- | gdb/hpacc-abi.c | 2 | ||||
| -rw-r--r-- | gdb/minsyms.c | 2 |
8 files changed, 187 insertions, 24 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c10c49d..361fa9e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,28 @@ +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. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 90f6ab1..c60d9fa 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1593,7 +1593,8 @@ corefile.o: corefile.c $(defs_h) $(gdb_string_h) $(inferior_h) $(symtab_h) \ corelow.o: corelow.c $(defs_h) $(gdb_string_h) $(frame_h) $(inferior_h) \ $(symtab_h) $(command_h) $(bfd_h) $(target_h) $(gdbcore_h) \ $(gdbthread_h) $(regcache_h) $(symfile_h) $(readline_h) -cp-abi.o: cp-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(gdb_string_h) +cp-abi.o: cp-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(command_h) \ + $(gdbcmd_h) $(ui_out_h) $(gdb_string_h) cp-support.o: cp-support.c $(defs_h) $(cp_support_h) cp-valprint.o: cp-valprint.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \ $(gdbtypes_h) $(expression_h) $(value_h) $(command_h) $(gdbcmd_h) \ diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c index 36d2992..3aa9966 100644 --- a/gdb/cp-abi.c +++ b/gdb/cp-abi.c @@ -21,13 +21,20 @@ #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) @@ -71,8 +78,8 @@ baseclass_offset (struct type *type, int index, char *valaddr, } 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; @@ -87,24 +94,157 @@ value_rtti_type (struct value *v, int *full, int *top, int *using_enc) 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); +} diff --git a/gdb/cp-abi.h b/gdb/cp-abi.h index 7c1e952..e119514 100644 --- a/gdb/cp-abi.h +++ b/gdb/cp-abi.h @@ -163,11 +163,8 @@ struct cp_abi_ops }; -extern struct cp_abi_ops *cp_abis; -extern int num_cp_abis; -extern struct cp_abi_ops current_cp_abi; -extern int register_cp_abi (struct cp_abi_ops abi); -extern int switch_to_cp_abi (const char *short_name); +extern int register_cp_abi (struct cp_abi_ops *abi); +extern void set_cp_abi_as_auto_default (const char *short_name); #endif diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c index 90186cc..47d6e12 100644 --- a/gdb/gnu-v2-abi.c +++ b/gdb/gnu-v2-abi.c @@ -405,6 +405,6 @@ void _initialize_gnu_v2_abi (void) { init_gnuv2_ops (); - register_cp_abi (gnu_v2_abi_ops); - switch_to_cp_abi ("gnu-v2"); + register_cp_abi (&gnu_v2_abi_ops); + set_cp_abi_as_auto_default (gnu_v2_abi_ops.shortname); } diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c index 2b4e01a..7e66ee9 100644 --- a/gdb/gnu-v3-abi.c +++ b/gdb/gnu-v3-abi.c @@ -453,5 +453,5 @@ _initialize_gnu_v3_abi (void) { init_gnuv3_ops (); - register_cp_abi (gnu_v3_abi_ops); + register_cp_abi (&gnu_v3_abi_ops); } diff --git a/gdb/hpacc-abi.c b/gdb/hpacc-abi.c index 6753cd7..799d4c7 100644 --- a/gdb/hpacc-abi.c +++ b/gdb/hpacc-abi.c @@ -324,5 +324,5 @@ _initialize_hpacc_abi (void) regcomp (&operator_pattern, "^This will never match anything, please fill it in$", REG_NOSUB); - register_cp_abi (hpacc_abi_ops); + register_cp_abi (&hpacc_abi_ops); } diff --git a/gdb/minsyms.c b/gdb/minsyms.c index e3f649e..5c2ca46 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -921,7 +921,7 @@ install_minimal_symbols (struct objfile *objfile) const char *name = DEPRECATED_SYMBOL_NAME (&objfile->msymbols[i]); if (name[0] == '_' && name[1] == 'Z') { - switch_to_cp_abi ("gnu-v3"); + set_cp_abi_as_auto_default ("gnu-v3"); break; } } |