diff options
| author | Andrew Stubbs <andrew.stubbs@st.com> | 2009-10-21 14:14:56 +0000 |
|---|---|---|
| committer | Andrew Stubbs <andrew.stubbs@st.com> | 2009-10-21 14:14:56 +0000 |
| commit | d29c6083d546070f481d2aa4d068026f9b17c579 (patch) | |
| tree | c5324dad2dee5e6556017260eb459e09332ff5c5 /gdb/shnbsd-nat.c | |
| parent | 848a7828eea90dbef67bed575d061d7d973c9aa3 (diff) | |
| download | gdb-d29c6083d546070f481d2aa4d068026f9b17c579.tar.gz | |
2009-10-21 Andrew Stubbs <ams@codesourcery.com>
Joel Brobecker <brobecker@adacore.com>
* Makefile.in (HFILES_NO_SRCDIR): Remove shnbsd-tdep.h
* configure.tgt (sh*-*-linux*): Add corelow.o to gdb_target_obs.
* sh-linux-tdep.c: Include sh-tdep.h.
(REGSx16): New macro.
(gregs_table, fpregs_table): New variables.
(sh_linux_init_abi): Set core_gregmap and fpregmap.
* sh-tdep.c: Include regset.h.
(sh_corefile_supply_regset): New function.
(sh_corefile_collect_regset): New function.
(sh_corefile_gregset, sh_corefile_fpregset): New variables.
(sh_regset_from_core_section): New function.
(sh_gdbarch_init): Set up tdep value.
Call set_gdbarch_regset_from_core_section.
* sh-tdep.h (PC_REGNUM): New enum value.
(struct sh_corefile_regs): New type.
(sh_corefile_gregset): Export variable.
(sh_corefile_supply_regset): New prototype.
(sh_corefile_collect_regset): New prototype.
* shnbsd-tdep.c: Remove include of regcache.h, gdb_assert.h and
shnbsd-tdep.h.
(regmap): Use new definition using struct sh_corefile_regs.
(shnbsd_supply_gregset, shnbsd_collect_gregset): Delete.
(shnbsd_gregset): Delete.
(shnbsd_regset_from_core_section): Delete.
(shnbsd_supply_reg, shnbsd_fill_reg): Use new regset interface.
(shnbsd_init_abi): Set core_gregmap.
(shnbsd_supply_reg): Delete.
(shnbsd_fill_reg): Delete.
(SHNBSD_SIZEOF_GREGS): Move ...
* shnbsd-nat.c (SHNBSD_SIZEOF_GREGS): ... to here.
Remove include of shnbsd-tdep.h.
(shnbsd_fetch_inferior_registers): Replace shnbsd_supply_reg call
with sh_corefile_supply_regset.
(shnbsd_store_inferior_registers): Replace shnbsd_fill_reg call with
sh_corefile_collect_regset.
* shnbsd-tdep.h: Delete file.
Diffstat (limited to 'gdb/shnbsd-nat.c')
| -rw-r--r-- | gdb/shnbsd-nat.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gdb/shnbsd-nat.c b/gdb/shnbsd-nat.c index 90b04060086..1aad4baaf2f 100644 --- a/gdb/shnbsd-nat.c +++ b/gdb/shnbsd-nat.c @@ -28,7 +28,6 @@ #include <machine/reg.h> #include "sh-tdep.h" -#include "shnbsd-tdep.h" #include "inf-ptrace.h" #include "regcache.h" @@ -40,6 +39,9 @@ || (regno) == MACH_REGNUM || (regno) == MACL_REGNUM \ || (regno) == SR_REGNUM) +/* Sizeof `struct reg' in <machine/reg.h>. */ +#define SHNBSD_SIZEOF_GREGS (21 * 4) + static void shnbsd_fetch_inferior_registers (struct target_ops *ops, struct regcache *regcache, int regno) @@ -52,7 +54,9 @@ shnbsd_fetch_inferior_registers (struct target_ops *ops, (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1) perror_with_name (_("Couldn't get registers")); - shnbsd_supply_reg (regcache, (char *) &inferior_registers, regno); + sh_corefile_supply_regset (&sh_corefile_gregset, regcache, regno, + (char *) &inferior_registers, + SHNBSD_SIZEOF_GREGS); if (regno != -1) return; @@ -71,7 +75,9 @@ shnbsd_store_inferior_registers (struct target_ops *ops, (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1) perror_with_name (_("Couldn't get registers")); - shnbsd_fill_reg (regcache, (char *) &inferior_registers, regno); + sh_corefile_collect_regset (&sh_corefile_gregset, regcache, regno, + (char *) &inferior_registers, + SHNBSD_SIZEOF_GREGS); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &inferior_registers, 0) == -1) |