From ed09174e35d31547d3b89f366890022fd1bee1ac Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Sat, 29 Mar 2014 09:12:57 +0000 Subject: [PATCH] ARM: Migrate from 'regset_from_core_section' to 'iterate_over_regset_sections' For ARM BSD targets, don't define the gdbarch method 'regset_from_core_section', but the iterator method instead. gdb/ChangeLog: * arm-tdep.h (armbsd_regset_from_core_section): Remove prototype. (armbsd_iterate_over_regset_sections): New prototype. * armbsd-tdep.c (armbsd_regset_from_core_section): Remove. (armbsd_iterate_over_regset_sections): New. * armobsd-tdep.c (armobsd_init_abi): Adjust gdbarch initialization. --- gdb/ChangeLog | 9 +++++++++ gdb/arm-tdep.h | 8 +++++--- gdb/armbsd-tdep.c | 20 ++++++++------------ gdb/armobsd-tdep.c | 4 ++-- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index af139f1..c9be5c0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2014-09-30 Andreas Arnez + * arm-tdep.h (armbsd_regset_from_core_section): Remove prototype. + (armbsd_iterate_over_regset_sections): New prototype. + * armbsd-tdep.c (armbsd_regset_from_core_section): Remove. + (armbsd_iterate_over_regset_sections): New. + * armobsd-tdep.c (armobsd_init_abi): Adjust gdbarch + initialization. + +2014-09-30 Andreas Arnez + * alpha-linux-tdep.c (alpha_linux_regset_from_core_section): Remove. (alpha_linux_iterate_over_regset_sections): New. (alpha_linux_init_abi): Adjust gdbarch initialization. diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h index 29669d0..1d55e78 100644 --- a/gdb/arm-tdep.h +++ b/gdb/arm-tdep.h @@ -341,9 +341,11 @@ extern int arm_process_record (struct gdbarch *gdbarch, /* Return the appropriate register set for the core section identified by SECT_NAME and SECT_SIZE. */ -extern const struct regset * - armbsd_regset_from_core_section (struct gdbarch *gdbarch, - const char *sect_name, size_t sect_size); +extern void + armbsd_iterate_over_regset_sections (struct gdbarch *gdbarch, + iterate_over_regset_sections_cb *cb, + void *cb_data, + const struct regcache *regcache); /* Target descriptions. */ extern struct target_desc *tdesc_arm_with_m; diff --git a/gdb/armbsd-tdep.c b/gdb/armbsd-tdep.c index 62e82b8..c4c5fd0 100644 --- a/gdb/armbsd-tdep.c +++ b/gdb/armbsd-tdep.c @@ -107,18 +107,14 @@ static const struct regset armbsd_fpregset = armbsd_supply_fpregset }; -/* Return the appropriate register set for the core section identified - by SECT_NAME and SECT_SIZE. */ +/* Iterate over supported core file register note sections. */ -const struct regset * -armbsd_regset_from_core_section (struct gdbarch *gdbarch, - const char *sect_name, size_t sect_size) +void +armbsd_iterate_over_regset_sections (struct gdbarch *gdbarch, + iterate_over_regset_sections_cb *cb, + void *cb_data, + const struct regcache *regcache) { - if (strcmp (sect_name, ".reg") == 0 && sect_size >= ARMBSD_SIZEOF_GREGS) - return &armbsd_gregset; - - if (strcmp (sect_name, ".reg2") == 0 && sect_size >= ARMBSD_SIZEOF_FPREGS) - return &armbsd_fpregset; - - return NULL; + cb (".reg", ARMBSD_SIZEOF_GREGS, &armbsd_gregset, NULL, cb_data); + cb (".reg2", ARMBSD_SIZEOF_FPREGS, &armbsd_fpregset, NULL, cb_data); } diff --git a/gdb/armobsd-tdep.c b/gdb/armobsd-tdep.c index f4904a3..d7bfddc 100644 --- a/gdb/armobsd-tdep.c +++ b/gdb/armobsd-tdep.c @@ -91,8 +91,8 @@ armobsd_init_abi (struct gdbarch_info info, tdep->jb_pc = 24; tdep->jb_elt_size = 4; - set_gdbarch_regset_from_core_section - (gdbarch, armbsd_regset_from_core_section); + set_gdbarch_iterate_over_regset_sections + (gdbarch, armbsd_iterate_over_regset_sections); /* OpenBSD/arm uses -fpcc-struct-return by default. */ tdep->struct_return = pcc_struct_return; -- 2.7.4