diff options
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/configure.tgt | 2 | ||||
| -rw-r--r-- | gdb/sparc-tdep.c | 24 | ||||
| -rw-r--r-- | gdb/sparc64fbsd-nat.c | 1 | ||||
| -rw-r--r-- | gdb/sparc64fbsd-tdep.c | 4 |
5 files changed, 27 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fdbe981..77abe1b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,17 @@ 2014-09-30 Andreas Arnez <arnez@linux.vnet.ibm.com> + * sparc-tdep.c (sparc_regset_from_core_section): Remove. + (sparc_iterate_over_regset_sections): New. + (sparc32_gdbarch_init): Adjust gdbarch initialization. + * configure.tgt (gdb_target_obs): Add fbsd-tdep.o for SPARC FreeBSD + targets. + * sparc64fbsd-tdep.c (fbsd-tdep.h): Include. + (sparc64fbsd_init_abi): Call fbsd_init_abi. + * sparc64fbsd-nat.c (_initialize_sparc64fbsd_nat): Do not set + target method 'make_corefile_notes'. + +2014-09-30 Andreas Arnez <arnez@linux.vnet.ibm.com> + * sh-linux-tdep.c (sh_linux_init_abi): Set tdep fields 'sizeof_gregset' and 'sizeof_fpregset'. * sh-tdep.c (sh_regset_from_core_section): Remove. diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 3111a2c..9aea728 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -543,7 +543,7 @@ sparc64-*-linux*) sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu) # Target: FreeBSD/sparc64 gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64fbsd-tdep.o \ - solib-svr4.o \ + fbsd-tdep.o solib-svr4.o \ ravenscar-thread.o sparc-ravenscar-thread.o" ;; sparc-*-netbsd* | sparc-*-knetbsd*-gnu) diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index bcd4f6e..7eb3b18 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -1645,22 +1645,18 @@ sparc_write_pc (struct regcache *regcache, CORE_ADDR pc) } -/* Return the appropriate register set for the core section identified - by SECT_NAME and SECT_SIZE. */ +/* Iterate over core file register note sections. */ -static const struct regset * -sparc_regset_from_core_section (struct gdbarch *gdbarch, - const char *sect_name, size_t sect_size) +static void +sparc_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 (gdbarch); - if (strcmp (sect_name, ".reg") == 0 && sect_size >= tdep->sizeof_gregset) - return tdep->gregset; - - if (strcmp (sect_name, ".reg2") == 0 && sect_size >= tdep->sizeof_fpregset) - return tdep->fpregset; - - return NULL; + cb (".reg", tdep->sizeof_gregset, tdep->gregset, NULL, cb_data); + cb (".reg2", tdep->sizeof_fpregset, tdep->fpregset, NULL, cb_data); } @@ -1740,8 +1736,8 @@ sparc32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* If we have register sets, enable the generic core file support. */ if (tdep->gregset) - set_gdbarch_regset_from_core_section (gdbarch, - sparc_regset_from_core_section); + set_gdbarch_iterate_over_regset_sections + (gdbarch, sparc_iterate_over_regset_sections); register_sparc_ravenscar_ops (gdbarch); diff --git a/gdb/sparc64fbsd-nat.c b/gdb/sparc64fbsd-nat.c index 59a2004..67ed8f5 100644 --- a/gdb/sparc64fbsd-nat.c +++ b/gdb/sparc64fbsd-nat.c @@ -72,7 +72,6 @@ _initialize_sparc64fbsd_nat (void) t = sparc_target (); t->to_pid_to_exec_file = fbsd_pid_to_exec_file; t->to_find_memory_regions = fbsd_find_memory_regions; - t->to_make_corefile_notes = fbsd_make_corefile_notes; add_target (t); sparc_gregmap = &sparc64fbsd_gregmap; diff --git a/gdb/sparc64fbsd-tdep.c b/gdb/sparc64fbsd-tdep.c index 568db72..0ba6c6d 100644 --- a/gdb/sparc64fbsd-tdep.c +++ b/gdb/sparc64fbsd-tdep.c @@ -28,6 +28,7 @@ #include "trad-frame.h" #include "sparc64-tdep.h" +#include "fbsd-tdep.h" #include "solib-svr4.h" /* From <machine/reg.h>. */ @@ -221,6 +222,9 @@ sparc64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + /* Generic FreeBSD support. */ + fbsd_init_abi (info, gdbarch); + tdep->gregset = &sparc64fbsd_gregset; tdep->sizeof_gregset = 256; |