From 5fac247f472389db46e7612d9e425991f77d64b7 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Fri, 29 Nov 2013 16:41:28 +0000 Subject: [PATCH] M32R: Migrate from 'regset_from_core_section' to 'iterate_over_regset_sections' For m32r GNU/Linux targets, don't define the gdbarch method 'regset_from_core_section', but the iterator method instead. gdb/ChangeLog: * m32r-linux-tdep.c (M32R_LINUX_GREGS_SIZE): New macro. (m32r_linux_regset_from_core_section): Remove. (m32r_linux_iterate_over_regset_sections): New. (m32r_linux_init_abi): Adjust gdbarch initialization. --- gdb/ChangeLog | 7 +++++++ gdb/m32r-linux-tdep.c | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2e749f4deeb..9b822b457f4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-09-30 Andreas Arnez + + * m32r-linux-tdep.c (M32R_LINUX_GREGS_SIZE): New macro. + (m32r_linux_regset_from_core_section): Remove. + (m32r_linux_iterate_over_regset_sections): New. + (m32r_linux_init_abi): Adjust gdbarch initialization. + 2014-09-30 Andreas Arnez * amd64obsd-tdep.c (amd64obsd_regset_from_core_section): Remove. diff --git a/gdb/m32r-linux-tdep.c b/gdb/m32r-linux-tdep.c index 5499902a022..2133c0ce281 100644 --- a/gdb/m32r-linux-tdep.c +++ b/gdb/m32r-linux-tdep.c @@ -344,6 +344,8 @@ static int m32r_pt_regs_offset[] = { #define SPU_OFFSET (4 * 23) #define SPI_OFFSET (4 * 26) +#define M32R_LINUX_GREGS_SIZE (4 * 28) + static void m32r_linux_supply_gregset (const struct regset *regset, struct regcache *regcache, int regnum, @@ -433,14 +435,13 @@ static const struct regset m32r_linux_gregset = { m32r_linux_supply_gregset, m32r_linux_collect_gregset }; -static const struct regset * -m32r_linux_regset_from_core_section (struct gdbarch *core_arch, - const char *sect_name, size_t sect_size) +static void +m32r_linux_iterate_over_regset_sections (struct gdbarch *gdbarch, + iterate_over_regset_sections_cb *cb, + void *cb_data, + const struct regcache *regcache) { - struct gdbarch_tdep *tdep = gdbarch_tdep (core_arch); - if (strcmp (sect_name, ".reg") == 0) - return &m32r_linux_gregset; - return NULL; + cb (".reg", M32R_LINUX_GREGS_SIZE, &m32r_linux_gregset, NULL, cb_data); } static void @@ -462,8 +463,8 @@ m32r_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) (gdbarch, svr4_ilp32_fetch_link_map_offsets); /* Core file support. */ - set_gdbarch_regset_from_core_section - (gdbarch, m32r_linux_regset_from_core_section); + set_gdbarch_iterate_over_regset_sections + (gdbarch, m32r_linux_iterate_over_regset_sections); /* Enable TLS support. */ set_gdbarch_fetch_tls_load_module_address (gdbarch,