forked from Imagelibrary/binutils-gdb
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.
This commit is contained in:
Andrew Stubbs
@@ -22,163 +22,51 @@
|
||||
|
||||
#include "defs.h"
|
||||
#include "gdbcore.h"
|
||||
#include "regcache.h"
|
||||
#include "regset.h"
|
||||
#include "value.h"
|
||||
#include "osabi.h"
|
||||
|
||||
#include "gdb_assert.h"
|
||||
#include "gdb_string.h"
|
||||
|
||||
#include "sh-tdep.h"
|
||||
#include "shnbsd-tdep.h"
|
||||
#include "solib-svr4.h"
|
||||
|
||||
/* Convert an r0-r15 register number into an offset into a ptrace
|
||||
/* Convert a register number into an offset into a ptrace
|
||||
register structure. */
|
||||
static const int regmap[] =
|
||||
static const struct sh_corefile_regmap regmap[] =
|
||||
{
|
||||
(20 * 4), /* r0 */
|
||||
(19 * 4), /* r1 */
|
||||
(18 * 4), /* r2 */
|
||||
(17 * 4), /* r3 */
|
||||
(16 * 4), /* r4 */
|
||||
(15 * 4), /* r5 */
|
||||
(14 * 4), /* r6 */
|
||||
(13 * 4), /* r7 */
|
||||
(12 * 4), /* r8 */
|
||||
(11 * 4), /* r9 */
|
||||
(10 * 4), /* r10 */
|
||||
( 9 * 4), /* r11 */
|
||||
( 8 * 4), /* r12 */
|
||||
( 7 * 4), /* r13 */
|
||||
( 6 * 4), /* r14 */
|
||||
( 5 * 4), /* r15 */
|
||||
{R0_REGNUM, 20 * 4},
|
||||
{R0_REGNUM + 1, 19 * 4},
|
||||
{R0_REGNUM + 2, 18 * 4},
|
||||
{R0_REGNUM + 3, 17 * 4},
|
||||
{R0_REGNUM + 4, 16 * 4},
|
||||
{R0_REGNUM + 5, 15 * 4},
|
||||
{R0_REGNUM + 6, 14 * 4},
|
||||
{R0_REGNUM + 7, 13 * 4},
|
||||
{R0_REGNUM + 8, 12 * 4},
|
||||
{R0_REGNUM + 9, 11 * 4},
|
||||
{R0_REGNUM + 10, 10 * 4},
|
||||
{R0_REGNUM + 11, 9 * 4},
|
||||
{R0_REGNUM + 12, 8 * 4},
|
||||
{R0_REGNUM + 13, 7 * 4},
|
||||
{R0_REGNUM + 14, 6 * 4},
|
||||
{R0_REGNUM + 15, 5 * 4},
|
||||
{PC_REGNUM, 0 * 4},
|
||||
{SR_REGNUM, 1 * 4},
|
||||
{PR_REGNUM, 2 * 4},
|
||||
{MACH_REGNUM, 3 * 4},
|
||||
{MACL_REGNUM, 4 * 4},
|
||||
{-1 /* Terminator. */, 0}
|
||||
};
|
||||
|
||||
/* Sizeof `struct reg' in <machine/reg.h>. */
|
||||
#define SHNBSD_SIZEOF_GREGS (21 * 4)
|
||||
|
||||
/* Supply register REGNUM from the buffer specified by GREGS and LEN
|
||||
in the general-purpose register set REGSET to register cache
|
||||
REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */
|
||||
|
||||
static void
|
||||
shnbsd_supply_gregset (const struct regset *regset,
|
||||
struct regcache *regcache,
|
||||
int regnum, const void *gregs, size_t len)
|
||||
{
|
||||
struct gdbarch *gdbarch = get_regcache_arch (regcache);
|
||||
const gdb_byte *regs = gregs;
|
||||
int i;
|
||||
|
||||
gdb_assert (len >= SHNBSD_SIZEOF_GREGS);
|
||||
|
||||
if (regnum == gdbarch_pc_regnum (gdbarch) || regnum == -1)
|
||||
regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch),
|
||||
regs + (0 * 4));
|
||||
|
||||
if (regnum == SR_REGNUM || regnum == -1)
|
||||
regcache_raw_supply (regcache, SR_REGNUM, regs + (1 * 4));
|
||||
|
||||
if (regnum == PR_REGNUM || regnum == -1)
|
||||
regcache_raw_supply (regcache, PR_REGNUM, regs + (2 * 4));
|
||||
|
||||
if (regnum == MACH_REGNUM || regnum == -1)
|
||||
regcache_raw_supply (regcache, MACH_REGNUM, regs + (3 * 4));
|
||||
|
||||
if (regnum == MACL_REGNUM || regnum == -1)
|
||||
regcache_raw_supply (regcache, MACL_REGNUM, regs + (4 * 4));
|
||||
|
||||
for (i = R0_REGNUM; i <= (R0_REGNUM + 15); i++)
|
||||
{
|
||||
if (regnum == i || regnum == -1)
|
||||
regcache_raw_supply (regcache, i, regs + regmap[i - R0_REGNUM]);
|
||||
}
|
||||
}
|
||||
|
||||
/* Collect register REGNUM in the general-purpose register set
|
||||
REGSET. from register cache REGCACHE into the buffer specified by
|
||||
GREGS and LEN. If REGNUM is -1, do this for all registers in
|
||||
REGSET. */
|
||||
|
||||
static void
|
||||
shnbsd_collect_gregset (const struct regset *regset,
|
||||
const struct regcache *regcache,
|
||||
int regnum, void *gregs, size_t len)
|
||||
{
|
||||
struct gdbarch *gdbarch = get_regcache_arch (regcache);
|
||||
gdb_byte *regs = gregs;
|
||||
int i;
|
||||
|
||||
gdb_assert (len >= SHNBSD_SIZEOF_GREGS);
|
||||
|
||||
if (regnum == gdbarch_pc_regnum (gdbarch) || regnum == -1)
|
||||
regcache_raw_collect (regcache, gdbarch_pc_regnum (gdbarch),
|
||||
regs + (0 * 4));
|
||||
|
||||
if (regnum == SR_REGNUM || regnum == -1)
|
||||
regcache_raw_collect (regcache, SR_REGNUM, regs + (1 * 4));
|
||||
|
||||
if (regnum == PR_REGNUM || regnum == -1)
|
||||
regcache_raw_collect (regcache, PR_REGNUM, regs + (2 * 4));
|
||||
|
||||
if (regnum == MACH_REGNUM || regnum == -1)
|
||||
regcache_raw_collect (regcache, MACH_REGNUM, regs + (3 * 4));
|
||||
|
||||
if (regnum == MACL_REGNUM || regnum == -1)
|
||||
regcache_raw_collect (regcache, MACL_REGNUM, regs + (4 * 4));
|
||||
|
||||
for (i = R0_REGNUM; i <= (R0_REGNUM + 15); i++)
|
||||
{
|
||||
if (regnum == i || regnum == -1)
|
||||
regcache_raw_collect (regcache, i, regs + regmap[i - R0_REGNUM]);
|
||||
}
|
||||
}
|
||||
|
||||
/* SH register sets. */
|
||||
|
||||
static struct regset shnbsd_gregset =
|
||||
{
|
||||
NULL,
|
||||
shnbsd_supply_gregset,
|
||||
shnbsd_collect_gregset
|
||||
};
|
||||
|
||||
/* Return the appropriate register set for the core section identified
|
||||
by SECT_NAME and SECT_SIZE. */
|
||||
|
||||
static const struct regset *
|
||||
shnbsd_regset_from_core_section (struct gdbarch *gdbarch,
|
||||
const char *sect_name, size_t sect_size)
|
||||
{
|
||||
if (strcmp (sect_name, ".reg") == 0 && sect_size >= SHNBSD_SIZEOF_GREGS)
|
||||
return &shnbsd_gregset;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void
|
||||
shnbsd_supply_reg (struct regcache *regcache, const char *regs, int regnum)
|
||||
{
|
||||
shnbsd_supply_gregset (&shnbsd_gregset, regcache, regnum,
|
||||
regs, SHNBSD_SIZEOF_GREGS);
|
||||
}
|
||||
|
||||
void
|
||||
shnbsd_fill_reg (const struct regcache *regcache, char *regs, int regnum)
|
||||
{
|
||||
shnbsd_collect_gregset (&shnbsd_gregset, regcache, regnum,
|
||||
regs, SHNBSD_SIZEOF_GREGS);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
shnbsd_init_abi (struct gdbarch_info info,
|
||||
struct gdbarch *gdbarch)
|
||||
{
|
||||
set_gdbarch_regset_from_core_section
|
||||
(gdbarch, shnbsd_regset_from_core_section);
|
||||
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
|
||||
|
||||
tdep->core_gregmap = (struct sh_corefile_regmap *)regmap;
|
||||
|
||||
set_solib_svr4_fetch_link_map_offsets
|
||||
(gdbarch, svr4_ilp32_fetch_link_map_offsets);
|
||||
|
||||
Reference in New Issue
Block a user