HPPA Linux: Fill 'collect_regset' in regset structures.

This commit is contained in:
Andreas Arnez 2014-04-01 07:04:53 +00:00 committed by Ulrich Weigand
parent 901e1b2377
commit 0006a9dadf
2 changed files with 48 additions and 67 deletions

View File

@ -1,3 +1,15 @@
2014-08-07 Andreas Arnez <arnez@linux.vnet.ibm.com>
* hppa-linux-tdep.c (greg_map): Rename to...
(hppa_linux_gregmap): ... this. Also convert to
regcache_map_entry format.
(hppa_linux_supply_regset): Delete function.
(hppa_linux_supply_fpregset): Delete function. Move logic to...
(hppa_linux_fpregmap): ... this new register map.
(hppa_linux_regset, hppa_linux_fpregset): Refer to appropriate
register map, replace supply method by regcache_supply_regset, and
add collect method regcache_collect_regset.
2014-08-07 Andreas Arnez <arnez@linux.vnet.ibm.com> 2014-08-07 Andreas Arnez <arnez@linux.vnet.ibm.com>
* frv-linux-tdep.c (FRV_PT_PSR, FRV_PT_ISR, FRV_PT_CCR) * frv-linux-tdep.c (FRV_PT_PSR, FRV_PT_ISR, FRV_PT_CCR)

View File

@ -423,84 +423,53 @@ hppa_linux_find_global_pointer (struct gdbarch *gdbarch,
* cr10, cr15 * cr10, cr15
*/ */
#define GR_REGNUM(_n) (HPPA_R0_REGNUM+_n) static const struct regcache_map_entry hppa_linux_gregmap[] =
#define TR_REGNUM(_n) (HPPA_TR0_REGNUM+_n)
static const int greg_map[] =
{ {
GR_REGNUM(0), GR_REGNUM(1), GR_REGNUM(2), GR_REGNUM(3), { 32, HPPA_R0_REGNUM },
GR_REGNUM(4), GR_REGNUM(5), GR_REGNUM(6), GR_REGNUM(7), { 1, HPPA_SR4_REGNUM+1 },
GR_REGNUM(8), GR_REGNUM(9), GR_REGNUM(10), GR_REGNUM(11), { 1, HPPA_SR4_REGNUM+2 },
GR_REGNUM(12), GR_REGNUM(13), GR_REGNUM(14), GR_REGNUM(15), { 1, HPPA_SR4_REGNUM+3 },
GR_REGNUM(16), GR_REGNUM(17), GR_REGNUM(18), GR_REGNUM(19), { 1, HPPA_SR4_REGNUM+4 },
GR_REGNUM(20), GR_REGNUM(21), GR_REGNUM(22), GR_REGNUM(23), { 1, HPPA_SR4_REGNUM },
GR_REGNUM(24), GR_REGNUM(25), GR_REGNUM(26), GR_REGNUM(27), { 1, HPPA_SR4_REGNUM+5 },
GR_REGNUM(28), GR_REGNUM(29), GR_REGNUM(30), GR_REGNUM(31), { 1, HPPA_SR4_REGNUM+6 },
{ 1, HPPA_SR4_REGNUM+7 },
HPPA_SR4_REGNUM+1, HPPA_SR4_REGNUM+2, HPPA_SR4_REGNUM+3, HPPA_SR4_REGNUM+4, { 1, HPPA_PCOQ_HEAD_REGNUM },
HPPA_SR4_REGNUM, HPPA_SR4_REGNUM+5, HPPA_SR4_REGNUM+6, HPPA_SR4_REGNUM+7, { 1, HPPA_PCOQ_TAIL_REGNUM },
{ 1, HPPA_PCSQ_HEAD_REGNUM },
HPPA_PCOQ_HEAD_REGNUM, HPPA_PCOQ_TAIL_REGNUM, { 1, HPPA_PCSQ_TAIL_REGNUM },
HPPA_PCSQ_HEAD_REGNUM, HPPA_PCSQ_TAIL_REGNUM, { 1, HPPA_SAR_REGNUM },
{ 1, HPPA_IIR_REGNUM },
HPPA_SAR_REGNUM, HPPA_IIR_REGNUM, HPPA_ISR_REGNUM, HPPA_IOR_REGNUM, { 1, HPPA_ISR_REGNUM },
HPPA_IPSW_REGNUM, HPPA_RCR_REGNUM, { 1, HPPA_IOR_REGNUM },
{ 1, HPPA_IPSW_REGNUM },
TR_REGNUM(0), TR_REGNUM(1), TR_REGNUM(2), TR_REGNUM(3), { 1, HPPA_RCR_REGNUM },
TR_REGNUM(4), TR_REGNUM(5), TR_REGNUM(6), TR_REGNUM(7), { 8, HPPA_TR0_REGNUM },
{ 4, HPPA_PID0_REGNUM },
HPPA_PID0_REGNUM, HPPA_PID1_REGNUM, HPPA_PID2_REGNUM, HPPA_PID3_REGNUM, { 1, HPPA_CCR_REGNUM },
HPPA_CCR_REGNUM, HPPA_EIEM_REGNUM, { 1, HPPA_EIEM_REGNUM },
{ 0 }
}; };
static void static const struct regcache_map_entry hppa_linux_fpregmap[] =
hppa_linux_supply_regset (const struct regset *regset, {
struct regcache *regcache, /* FIXME: Only works for 32-bit mode. In 64-bit mode there should
int regnum, const void *regs, size_t len) be 32 fpregs, 8 bytes each. */
{ { 64, HPPA_FP0_REGNUM, 4 },
struct gdbarch *arch = get_regcache_arch (regcache); { 0 }
struct gdbarch_tdep *tdep = gdbarch_tdep (arch); };
const char *buf = regs;
int i, offset;
offset = 0;
for (i = 0; i < ARRAY_SIZE (greg_map); i++)
{
if (regnum == greg_map[i] || regnum == -1)
regcache_raw_supply (regcache, greg_map[i], buf + offset);
offset += tdep->bytes_per_address;
}
}
static void
hppa_linux_supply_fpregset (const struct regset *regset,
struct regcache *regcache,
int regnum, const void *regs, size_t len)
{
const char *buf = regs;
int i, offset;
offset = 0;
for (i = 0; i < 64; i++)
{
if (regnum == HPPA_FP0_REGNUM + i || regnum == -1)
regcache_raw_supply (regcache, HPPA_FP0_REGNUM + i,
buf + offset);
offset += 4;
}
}
/* HPPA Linux kernel register set. */ /* HPPA Linux kernel register set. */
static const struct regset hppa_linux_regset = static const struct regset hppa_linux_regset =
{ {
NULL, hppa_linux_gregmap,
hppa_linux_supply_regset regcache_supply_regset, regcache_collect_regset
}; };
static const struct regset hppa_linux_fpregset = static const struct regset hppa_linux_fpregset =
{ {
NULL, hppa_linux_fpregmap,
hppa_linux_supply_fpregset regcache_supply_regset, regcache_collect_regset
}; };
static const struct regset * static const struct regset *