X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Freggroups.c;h=ae7d4ceeb722c29547fbcfe13d2e5a51a68b4030;hb=8cc2a9796024f2dd472985cc8ed1c65a85ec9a35;hp=7dd05628519dde3ae72f454c71c328f121923bfa;hpb=7e6d0ac8cf0eaa6ada55d45ceae22713e2e98e69;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/reggroups.c b/gdb/reggroups.c index 7dd0562851..ae7d4ceeb7 100644 --- a/gdb/reggroups.c +++ b/gdb/reggroups.c @@ -1,6 +1,6 @@ /* Register groupings for GDB, the GNU debugger. - Copyright 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002-2017 Free Software Foundation, Inc. Contributed by Red Hat. @@ -8,7 +8,7 @@ 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 2 of the License, or + 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, @@ -17,14 +17,12 @@ 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, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ #include "defs.h" +#include "arch-utils.h" #include "reggroups.h" #include "gdbtypes.h" -#include "gdb_assert.h" #include "regcache.h" #include "command.h" #include "gdbcmd.h" /* For maintenanceprintlist. */ @@ -40,7 +38,8 @@ struct reggroup struct reggroup * reggroup_new (const char *name, enum reggroup_type type) { - struct reggroup *group = XMALLOC (struct reggroup); + struct reggroup *group = XNEW (struct reggroup); + group->name = name; group->type = type; return group; @@ -81,6 +80,7 @@ reggroups_init (struct gdbarch *gdbarch) { struct reggroups *groups = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct reggroups); + groups->last = &groups->first; return groups; } @@ -102,14 +102,15 @@ add_group (struct reggroups *groups, struct reggroup *group, void reggroup_add (struct gdbarch *gdbarch, struct reggroup *group) { - struct reggroups *groups = gdbarch_data (gdbarch, reggroups_data); + struct reggroups *groups + = (struct reggroups *) gdbarch_data (gdbarch, reggroups_data); if (groups == NULL) { /* ULGH, called during architecture initialization. Patch things up. */ - groups = reggroups_init (gdbarch); - set_gdbarch_data (gdbarch, reggroups_data, groups); + groups = (struct reggroups *) reggroups_init (gdbarch); + deprecated_set_gdbarch_data (gdbarch, reggroups_data, groups); } add_group (groups, group, GDBARCH_OBSTACK_ZALLOC (gdbarch, struct reggroup_el)); @@ -129,7 +130,7 @@ reggroup_next (struct gdbarch *gdbarch, struct reggroup *last) /* Don't allow this function to be called during architecture creation. If there are no groups, use the default groups list. */ - groups = gdbarch_data (gdbarch, reggroups_data); + groups = (struct reggroups *) gdbarch_data (gdbarch, reggroups_data); gdb_assert (groups != NULL); if (groups->first == NULL) groups = &default_groups; @@ -150,6 +151,35 @@ reggroup_next (struct gdbarch *gdbarch, struct reggroup *last) return NULL; } +/* See reggroups.h. */ + +struct reggroup * +reggroup_prev (struct gdbarch *gdbarch, struct reggroup *curr) +{ + struct reggroups *groups; + struct reggroup_el *el; + struct reggroup *prev; + + /* Don't allow this function to be called during architecture + creation. If there are no groups, use the default groups list. */ + groups = (struct reggroups *) gdbarch_data (gdbarch, reggroups_data); + gdb_assert (groups != NULL); + if (groups->first == NULL) + groups = &default_groups; + + prev = NULL; + for (el = groups->first; el != NULL; el = el->next) + { + gdb_assert (el->group != NULL); + if (el->group == curr) + return prev; + prev = el->group; + } + if (curr == NULL) + return prev; + return NULL; +} + /* Is REGNUM a member of REGGROUP? */ int default_register_reggroup_p (struct gdbarch *gdbarch, int regnum, @@ -159,16 +189,14 @@ default_register_reggroup_p (struct gdbarch *gdbarch, int regnum, int float_p; int raw_p; - if (REGISTER_NAME (regnum) == NULL - || *REGISTER_NAME (regnum) == '\0') + if (gdbarch_register_name (gdbarch, regnum) == NULL + || *gdbarch_register_name (gdbarch, regnum) == '\0') return 0; if (group == all_reggroup) return 1; vector_p = TYPE_VECTOR (register_type (gdbarch, regnum)); float_p = TYPE_CODE (register_type (gdbarch, regnum)) == TYPE_CODE_FLT; - /* FIXME: cagney/2003-04-13: Can't yet use gdbarch_num_regs - (gdbarch), as not all architectures are multi-arch. */ - raw_p = regnum < NUM_REGS; + raw_p = regnum < gdbarch_num_regs (gdbarch); if (group == float_reggroup) return float_p; if (group == vector_reggroup) @@ -192,6 +220,7 @@ reggroups_dump (struct gdbarch *gdbarch, struct ui_file *file) /* Group name. */ { const char *name; + if (group == NULL) name = "Group"; else @@ -202,6 +231,7 @@ reggroups_dump (struct gdbarch *gdbarch, struct ui_file *file) /* Group type. */ { const char *type; + if (group == NULL) type = "Type"; else @@ -215,7 +245,7 @@ reggroups_dump (struct gdbarch *gdbarch, struct ui_file *file) type = "internal"; break; default: - internal_error (__FILE__, __LINE__, "bad switch"); + internal_error (__FILE__, __LINE__, _("bad switch")); } } fprintf_unfiltered (file, " %-10s", type); @@ -234,15 +264,17 @@ reggroups_dump (struct gdbarch *gdbarch, struct ui_file *file) static void maintenance_print_reggroups (char *args, int from_tty) { + struct gdbarch *gdbarch = get_current_arch (); + if (args == NULL) - reggroups_dump (current_gdbarch, gdb_stdout); + reggroups_dump (gdbarch, gdb_stdout); else { - struct ui_file *file = gdb_fopen (args, "w"); - if (file == NULL) - perror_with_name ("maintenance print reggroups"); - reggroups_dump (current_gdbarch, file); - ui_file_delete (file); + stdio_file file; + + if (!file.open (args, "w")) + perror_with_name (_("maintenance print reggroups")); + reggroups_dump (gdbarch, &file); } } @@ -268,21 +300,21 @@ extern initialize_file_ftype _initialize_reggroup; /* -Wmissing-prototypes */ void _initialize_reggroup (void) { - reggroups_data = register_gdbarch_data (reggroups_init); + reggroups_data = gdbarch_data_register_post_init (reggroups_init); /* The pre-defined list of groups. */ - add_group (&default_groups, general_reggroup, XMALLOC (struct reggroup_el)); - add_group (&default_groups, float_reggroup, XMALLOC (struct reggroup_el)); - add_group (&default_groups, system_reggroup, XMALLOC (struct reggroup_el)); - add_group (&default_groups, vector_reggroup, XMALLOC (struct reggroup_el)); - add_group (&default_groups, all_reggroup, XMALLOC (struct reggroup_el)); - add_group (&default_groups, save_reggroup, XMALLOC (struct reggroup_el)); - add_group (&default_groups, restore_reggroup, XMALLOC (struct reggroup_el)); + add_group (&default_groups, general_reggroup, XNEW (struct reggroup_el)); + add_group (&default_groups, float_reggroup, XNEW (struct reggroup_el)); + add_group (&default_groups, system_reggroup, XNEW (struct reggroup_el)); + add_group (&default_groups, vector_reggroup, XNEW (struct reggroup_el)); + add_group (&default_groups, all_reggroup, XNEW (struct reggroup_el)); + add_group (&default_groups, save_reggroup, XNEW (struct reggroup_el)); + add_group (&default_groups, restore_reggroup, XNEW (struct reggroup_el)); add_cmd ("reggroups", class_maintenance, - maintenance_print_reggroups, "\ + maintenance_print_reggroups, _("\ Print the internal register group names.\n\ -Takes an optional file parameter.", +Takes an optional file parameter."), &maintenanceprintlist); }