From 3636e6083c1dc792e2fe0142f45e9f86cc593528 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Fri, 29 Nov 2013 16:51:36 +0000 Subject: [PATCH] MN10300: Migrate from 'regset_from_core_section' to 'iterate_over_regset_sections'. For MN10300 GNU/Linux targets, no longer define the gdbarch method 'regset_from_core_section', but the iterator method instead. gdb/ChangeLog: * mn10300-linux-tdep.c (am33_regset_from_core_section): Remove. (am33_iterate_over_regset_sections): New. (am33_linux_init_osabi): Adjust gdbarch initialization. --- gdb/ChangeLog | 6 ++++++ gdb/mn10300-linux-tdep.c | 23 ++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aa66018c8ee..8bd3276ae2d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-09-30 Andreas Arnez + + * mn10300-linux-tdep.c (am33_regset_from_core_section): Remove. + (am33_iterate_over_regset_sections): New. + (am33_linux_init_osabi): Adjust gdbarch initialization. + 2014-09-30 Andreas Arnez * mips-linux-tdep.c (mips_linux_regset_from_core_section): Remove. diff --git a/gdb/mn10300-linux-tdep.c b/gdb/mn10300-linux-tdep.c index 023c61d0b3a..9e6844d386f 100644 --- a/gdb/mn10300-linux-tdep.c +++ b/gdb/mn10300-linux-tdep.c @@ -457,17 +457,18 @@ static const struct regset am33_fpregset = NULL, am33_supply_fpregset_method, am33_collect_fpregset_method }; -/* Create a struct regset from a corefile register section. */ +/* Iterate over core file register note sections. */ -static const struct regset * -am33_regset_from_core_section (struct gdbarch *gdbarch, - const char *sect_name, - size_t sect_size) +static void +am33_iterate_over_regset_sections (struct gdbarch *gdbarch, + iterate_over_regset_sections_cb *cb, + void *cb_data, + const struct regcache *regcache) { - if (sect_size == sizeof (mn10300_elf_fpregset_t)) - return &am33_fpregset; - else - return &am33_gregset; + cb (".reg", sizeof (mn10300_elf_gregset_t), &am33_gregset, + NULL, cb_data); + cb (".reg2", sizeof(mn10300_elf_fpregset_t), &am33_fpregset, + NULL, cb_data); } static void @@ -714,8 +715,8 @@ am33_linux_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch) { linux_init_abi (info, gdbarch); - set_gdbarch_regset_from_core_section (gdbarch, - am33_regset_from_core_section); + set_gdbarch_iterate_over_regset_sections + (gdbarch, am33_iterate_over_regset_sections); set_solib_svr4_fetch_link_map_offsets (gdbarch, svr4_ilp32_fetch_link_map_offsets); -- 2.30.2