PPC: Migrate from 'regset_from_core_section' to 'iterate_over_regset_sections'

For PPC targets, no longer define the gdbarch method
'regset_from_core_section', but the iterator method instead.

gdb/ChangeLog:

	* configure.tgt (gdb_target_obs): Add fbsd-tdep.o for PowerPC
	FreeBSD targets.
	* ppcfbsd-nat.c (_initialize_ppcfbsd_nat): Do not set target
	method 'make_corefile_notes'.
	* ppcfbsd-tdep.c (fbsd-tdep.h): Include.
	(ppcfbsd_regset_from_core_section): Remove.
	(ppcfbsd_iterate_over_regset_sections): New.
	(ppcfbsd_init_abi): Call fbsd_init_abi.  Adjust gdbarch
	initialization.
	* ppcnbsd-tdep.c (ppcnbsd_regset_from_core_section): Remove.
	(ppcnbsd_iterate_over_regset_sections): New.
	(ppcnbsd_init_abi): Adjust.
	* ppcobsd-tdep.c (ppcobsd_regset_from_core_section): Remove.
	(ppcobsd_iterate_over_regset_sections): New.
	(ppcobsd_init_abi): Adjust.
	* rs6000-aix-tdep.c (rs6000_aix_regset_from_core_section): Remove.
	(rs6000_aix_iterate_over_regset_sections): New.
	(rs6000_aix_init_osabi): Adjust.
This commit is contained in:
Andreas Arnez 2014-09-10 08:42:07 +00:00 committed by Andreas Krebbel
parent c5b8d704bc
commit 23ea9aebce
7 changed files with 69 additions and 61 deletions

View File

@ -1,3 +1,24 @@
2014-09-30 Andreas Arnez <arnez@linux.vnet.ibm.com>
* configure.tgt (gdb_target_obs): Add fbsd-tdep.o for PowerPC
FreeBSD targets.
* ppcfbsd-nat.c (_initialize_ppcfbsd_nat): Do not set target
method 'make_corefile_notes'.
* ppcfbsd-tdep.c (fbsd-tdep.h): Include.
(ppcfbsd_regset_from_core_section): Remove.
(ppcfbsd_iterate_over_regset_sections): New.
(ppcfbsd_init_abi): Call fbsd_init_abi. Adjust gdbarch
initialization.
* ppcnbsd-tdep.c (ppcnbsd_regset_from_core_section): Remove.
(ppcnbsd_iterate_over_regset_sections): New.
(ppcnbsd_init_abi): Adjust.
* ppcobsd-tdep.c (ppcobsd_regset_from_core_section): Remove.
(ppcobsd_iterate_over_regset_sections): New.
(ppcobsd_init_abi): Adjust.
* rs6000-aix-tdep.c (rs6000_aix_regset_from_core_section): Remove.
(rs6000_aix_iterate_over_regset_sections): New.
(rs6000_aix_init_osabi): Adjust.
2014-09-30 Andreas Arnez <arnez@linux.vnet.ibm.com>
* nios2-linux-tdep.c (NIOS2_GREGS_SIZE): New macro.

View File

@ -415,7 +415,7 @@ nios2*-*-*)
powerpc*-*-freebsd*)
# Target: FreeBSD/powerpc
gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \
ppcfbsd-tdep.o solib-svr4.o \
ppcfbsd-tdep.o fbsd-tdep.o solib-svr4.o \
ravenscar-thread.o ppc-ravenscar-thread.o"
;;

View File

@ -214,7 +214,6 @@ _initialize_ppcfbsd_nat (void)
t->to_store_registers = ppcfbsd_store_inferior_registers;
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);
/* Support debugging kernel virtual memory images. */

View File

@ -33,6 +33,7 @@
#include "ppc-tdep.h"
#include "ppc64-tdep.h"
#include "ppcfbsd-tdep.h"
#include "fbsd-tdep.h"
#include "solib-svr4.h"
@ -128,24 +129,21 @@ ppc_fbsd_fpregset (void)
return &ppc32_fbsd_fpregset;
}
/* 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 *
ppcfbsd_regset_from_core_section (struct gdbarch *gdbarch,
const char *sect_name, size_t sect_size)
static void
ppcfbsd_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 >= 148)
{
if (tdep->wordsize == 4)
return &ppc32_fbsd_gregset;
else
return &ppc64_fbsd_gregset;
}
if (strcmp (sect_name, ".reg2") == 0 && sect_size >= 264)
return &ppc32_fbsd_fpregset;
return NULL;
if (tdep->wordsize == 4)
cb (".reg", 148, &ppc32_fbsd_gregset, NULL, cb_data);
else
cb (".reg", 296, &ppc64_fbsd_gregset, NULL, cb_data);
cb (".reg2", 264, &ppc32_fbsd_fpregset, NULL, cb_data);
}
/* Default page size. */
@ -300,6 +298,9 @@ ppcfbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
/* Generic FreeBSD support. */
fbsd_init_abi (info, gdbarch);
/* FreeBSD doesn't support the 128-bit `long double' from the psABI. */
set_gdbarch_long_double_bit (gdbarch, 64);
set_gdbarch_long_double_format (gdbarch, floatformats_ieee_double);
@ -329,8 +330,8 @@ ppcfbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
set_gdbarch_gcore_bfd_target (gdbarch, "elf64-powerpc");
}
set_gdbarch_regset_from_core_section
(gdbarch, ppcfbsd_regset_from_core_section);
set_gdbarch_iterate_over_regset_sections
(gdbarch, ppcfbsd_iterate_over_regset_sections);
set_gdbarch_fetch_tls_load_module_address (gdbarch,
svr4_fetch_objfile_link_map);

View File

@ -51,20 +51,16 @@ const struct regset ppcnbsd_fpregset =
ppc_supply_fpregset
};
/* 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 *
ppcnbsd_regset_from_core_section (struct gdbarch *gdbarch,
const char *sect_name, size_t sect_size)
static void
ppcnbsd_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 >= 148)
return &ppcnbsd_gregset;
if (strcmp (sect_name, ".reg2") == 0 && sect_size >= 264)
return &ppcnbsd_fpregset;
return NULL;
cb (".reg", 148, &ppcnbsd_gregset, NULL, cb_data);
cb (".reg2", 264, &ppcnbsd_fpregset, NULL, cb_data);
}
@ -185,8 +181,8 @@ ppcnbsd_init_abi (struct gdbarch_info info,
set_solib_svr4_fetch_link_map_offsets
(gdbarch, svr4_ilp32_fetch_link_map_offsets);
set_gdbarch_regset_from_core_section
(gdbarch, ppcnbsd_regset_from_core_section);
set_gdbarch_iterate_over_regset_sections
(gdbarch, ppcnbsd_iterate_over_regset_sections);
tramp_frame_prepend_unwinder (gdbarch, &ppcnbsd_sigtramp);
tramp_frame_prepend_unwinder (gdbarch, &ppcnbsd2_sigtramp);

View File

@ -80,17 +80,15 @@ const struct regset ppcobsd_fpregset =
ppc_supply_fpregset
};
/* 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 *
ppcobsd_regset_from_core_section (struct gdbarch *gdbarch,
const char *sect_name, size_t sect_size)
static void
ppcobsd_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 >= 412)
return &ppcobsd_gregset;
return NULL;
cb (".reg", 412, &ppcobsd_gregset, NULL, cb_data);
}
@ -257,8 +255,8 @@ ppcobsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
set_solib_svr4_fetch_link_map_offsets
(gdbarch, svr4_ilp32_fetch_link_map_offsets);
set_gdbarch_regset_from_core_section
(gdbarch, ppcobsd_regset_from_core_section);
set_gdbarch_iterate_over_regset_sections
(gdbarch, ppcobsd_iterate_over_regset_sections);
frame_unwind_append_unwinder (gdbarch, &ppcobsd_sigtramp_frame_unwind);
}

View File

@ -147,25 +147,18 @@ static const struct regset rs6000_aix64_regset =
rs6000_aix_collect_regset,
};
/* 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 *
rs6000_aix_regset_from_core_section (struct gdbarch *gdbarch,
const char *sect_name, size_t sect_size)
static void
rs6000_aix_iterate_over_regset_sections (struct gdbarch *gdbarch,
iterate_over_regset_sections_cb *cb,
void *cb_data,
const struct regcache *regcache)
{
if (gdbarch_tdep (gdbarch)->wordsize == 4)
{
if (strcmp (sect_name, ".reg") == 0 && sect_size >= 592)
return &rs6000_aix32_regset;
}
cb (".reg", 592, &rs6000_aix32_regset, NULL, cb_data);
else
{
if (strcmp (sect_name, ".reg") == 0 && sect_size >= 576)
return &rs6000_aix64_regset;
}
return NULL;
cb (".reg", 576, &rs6000_aix64_regset, NULL, cb_data);
}
@ -1065,8 +1058,8 @@ rs6000_aix_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch)
(gdbarch, rs6000_convert_from_func_ptr_addr);
/* Core file support. */
set_gdbarch_regset_from_core_section
(gdbarch, rs6000_aix_regset_from_core_section);
set_gdbarch_iterate_over_regset_sections
(gdbarch, rs6000_aix_iterate_over_regset_sections);
set_gdbarch_core_xfer_shared_libraries_aix
(gdbarch, rs6000_aix_core_xfer_shared_libraries_aix);