FRV Linux: Fill 'collect_regset' in regset structures.
This commit is contained in:
Andreas Arnez
Ulrich Weigand
parent
1d6e755515
commit
901e1b2377
|
|
@ -1,3 +1,19 @@
|
|||
2014-08-07 Andreas Arnez <arnez@linux.vnet.ibm.com>
|
||||
|
||||
* frv-linux-tdep.c (FRV_PT_PSR, FRV_PT_ISR, FRV_PT_CCR)
|
||||
(FRV_PT_CCCR, FRV_PT_LR, FRV_PT_LCR, FRV_PT_PC, FRV_PT_GNER0)
|
||||
(FRV_PT_GNER1, FRV_PT_IACC0H, FRV_PT_IACC0L, FRV_PT_GR)
|
||||
(FRV_PT_TBR, FRV_PT_GR, FRV_PT_EXEC_FDPIC_LOADMAP)
|
||||
(FRV_PT_INTERP_FDPIC_LOADMAP): Delete macros.
|
||||
(frv_linux_gregmap, frv_linux_fpregmap): New register maps.
|
||||
(frv_linux_supply_gregset): Replace main logic by call to
|
||||
regcache_supply_regset, but keep clearing gr32-gr63.
|
||||
(frv_linux_supply_fpregset): Delete function.
|
||||
(frv_linux_gregset): Refer to appropriate register map and add
|
||||
regcache_collect_regset as the collect method.
|
||||
(frv_linux_fpregset): Likewise. Also exchange the supply method
|
||||
by regcache_supply_regset.
|
||||
|
||||
2014-08-07 Andreas Arnez <arnez@linux.vnet.ibm.com>
|
||||
|
||||
* alpha-linux-tdep.c (alpha_linux_supply_gregset): Replace logic
|
||||
|
|
|
|||
|
|
@ -359,37 +359,52 @@ typedef struct
|
|||
frv_elf_fpreg_t fsr[1];
|
||||
} frv_elf_fpregset_t;
|
||||
|
||||
/* Constants for accessing elements of frv_elf_gregset_t. */
|
||||
/* Register maps. */
|
||||
|
||||
#define FRV_PT_PSR 0
|
||||
#define FRV_PT_ISR 1
|
||||
#define FRV_PT_CCR 2
|
||||
#define FRV_PT_CCCR 3
|
||||
#define FRV_PT_LR 4
|
||||
#define FRV_PT_LCR 5
|
||||
#define FRV_PT_PC 6
|
||||
#define FRV_PT_GNER0 10
|
||||
#define FRV_PT_GNER1 11
|
||||
#define FRV_PT_IACC0H 12
|
||||
#define FRV_PT_IACC0L 13
|
||||
static const struct regcache_map_entry frv_linux_gregmap[] =
|
||||
{
|
||||
{ 1, psr_regnum, 4 },
|
||||
{ 1, REGCACHE_MAP_SKIP, 4 }, /* isr */
|
||||
{ 1, ccr_regnum, 4 },
|
||||
{ 1, cccr_regnum, 4 },
|
||||
{ 1, lr_regnum, 4 },
|
||||
{ 1, lcr_regnum, 4 },
|
||||
{ 1, pc_regnum, 4 },
|
||||
{ 1, REGCACHE_MAP_SKIP, 4 }, /* __status */
|
||||
{ 1, REGCACHE_MAP_SKIP, 4 }, /* syscallno */
|
||||
{ 1, REGCACHE_MAP_SKIP, 4 }, /* orig_gr8 */
|
||||
{ 1, gner0_regnum, 4 },
|
||||
{ 1, gner1_regnum, 4 },
|
||||
{ 1, REGCACHE_MAP_SKIP, 8 }, /* iacc0 */
|
||||
{ 1, tbr_regnum, 4 },
|
||||
{ 31, first_gpr_regnum + 1, 4 }, /* gr1 ... gr31 */
|
||||
|
||||
/* Note: Only 32 of the GRs will be found in the corefile. */
|
||||
#define FRV_PT_GR(j) ( 14 + (j)) /* GRj for 0<=j<=63. */
|
||||
/* Technically, the loadmap addresses are not part of `pr_reg' as
|
||||
found in the elf_prstatus struct. The fields which communicate
|
||||
the loadmap address appear (by design) immediately after
|
||||
`pr_reg' though, and the BFD function elf32_frv_grok_prstatus()
|
||||
has been implemented to include these fields in the register
|
||||
section that it extracts from the core file. So, for our
|
||||
purposes, they may be viewed as registers. */
|
||||
|
||||
#define FRV_PT_TBR FRV_PT_GR(0) /* gr0 is always 0, so TBR is stuffed
|
||||
there. */
|
||||
|
||||
/* Technically, the loadmap addresses are not part of `pr_reg' as
|
||||
found in the elf_prstatus struct. The fields which communicate the
|
||||
loadmap address appear (by design) immediately after `pr_reg'
|
||||
though, and the BFD function elf32_frv_grok_prstatus() has been
|
||||
implemented to include these fields in the register section that it
|
||||
extracts from the core file. So, for our purposes, they may be
|
||||
viewed as registers. */
|
||||
|
||||
#define FRV_PT_EXEC_FDPIC_LOADMAP 46
|
||||
#define FRV_PT_INTERP_FDPIC_LOADMAP 47
|
||||
{ 1, fdpic_loadmap_exec_regnum, 4 },
|
||||
{ 1, fdpic_loadmap_interp_regnum, 4 },
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
static const struct regcache_map_entry frv_linux_fpregmap[] =
|
||||
{
|
||||
{ 64, first_fpr_regnum, 4 }, /* fr0 ... fr63 */
|
||||
{ 1, fner0_regnum, 4 },
|
||||
{ 1, fner1_regnum, 4 },
|
||||
{ 1, msr0_regnum, 4 },
|
||||
{ 1, msr1_regnum, 4 },
|
||||
{ 8, acc0_regnum, 4 }, /* acc0 ... acc7 */
|
||||
{ 1, accg0123_regnum, 4 },
|
||||
{ 1, accg4567_regnum, 4 },
|
||||
{ 1, fsr0_regnum, 4 },
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
/* Unpack an frv_elf_gregset_t into GDB's register cache. */
|
||||
|
||||
|
|
@ -400,7 +415,6 @@ frv_linux_supply_gregset (const struct regset *regset,
|
|||
{
|
||||
int regi;
|
||||
char zerobuf[MAX_REGISTER_SIZE];
|
||||
const frv_elf_gregset_t *gregsetp = gregs;
|
||||
|
||||
memset (zerobuf, 0, MAX_REGISTER_SIZE);
|
||||
|
||||
|
|
@ -408,72 +422,25 @@ frv_linux_supply_gregset (const struct regset *regset,
|
|||
this slot. */
|
||||
regcache_raw_supply (regcache, first_gpr_regnum, zerobuf);
|
||||
|
||||
for (regi = first_gpr_regnum + 1; regi <= last_gpr_regnum; regi++)
|
||||
{
|
||||
if (regi >= first_gpr_regnum + 32)
|
||||
regcache_raw_supply (regcache, regi, zerobuf);
|
||||
else
|
||||
regcache_raw_supply (regcache, regi,
|
||||
gregsetp->reg[FRV_PT_GR (regi
|
||||
- first_gpr_regnum)]);
|
||||
}
|
||||
/* Fill gr32, ..., gr63 with zeros. */
|
||||
for (regi = first_gpr_regnum + 32; regi <= last_gpr_regnum; regi++)
|
||||
regcache_raw_supply (regcache, regi, zerobuf);
|
||||
|
||||
regcache_raw_supply (regcache, pc_regnum, gregsetp->reg[FRV_PT_PC]);
|
||||
regcache_raw_supply (regcache, psr_regnum, gregsetp->reg[FRV_PT_PSR]);
|
||||
regcache_raw_supply (regcache, ccr_regnum, gregsetp->reg[FRV_PT_CCR]);
|
||||
regcache_raw_supply (regcache, cccr_regnum, gregsetp->reg[FRV_PT_CCCR]);
|
||||
regcache_raw_supply (regcache, lr_regnum, gregsetp->reg[FRV_PT_LR]);
|
||||
regcache_raw_supply (regcache, lcr_regnum, gregsetp->reg[FRV_PT_LCR]);
|
||||
regcache_raw_supply (regcache, gner0_regnum, gregsetp->reg[FRV_PT_GNER0]);
|
||||
regcache_raw_supply (regcache, gner1_regnum, gregsetp->reg[FRV_PT_GNER1]);
|
||||
regcache_raw_supply (regcache, tbr_regnum, gregsetp->reg[FRV_PT_TBR]);
|
||||
regcache_raw_supply (regcache, fdpic_loadmap_exec_regnum,
|
||||
gregsetp->reg[FRV_PT_EXEC_FDPIC_LOADMAP]);
|
||||
regcache_raw_supply (regcache, fdpic_loadmap_interp_regnum,
|
||||
gregsetp->reg[FRV_PT_INTERP_FDPIC_LOADMAP]);
|
||||
}
|
||||
|
||||
/* Unpack an frv_elf_fpregset_t into GDB's register cache. */
|
||||
|
||||
static void
|
||||
frv_linux_supply_fpregset (const struct regset *regset,
|
||||
struct regcache *regcache,
|
||||
int regnum, const void *gregs, size_t len)
|
||||
{
|
||||
int regi;
|
||||
const frv_elf_fpregset_t *fpregsetp = gregs;
|
||||
|
||||
for (regi = first_fpr_regnum; regi <= last_fpr_regnum; regi++)
|
||||
regcache_raw_supply (regcache, regi,
|
||||
fpregsetp->fr[regi - first_fpr_regnum]);
|
||||
|
||||
regcache_raw_supply (regcache, fner0_regnum, fpregsetp->fner[0]);
|
||||
regcache_raw_supply (regcache, fner1_regnum, fpregsetp->fner[1]);
|
||||
|
||||
regcache_raw_supply (regcache, msr0_regnum, fpregsetp->msr[0]);
|
||||
regcache_raw_supply (regcache, msr1_regnum, fpregsetp->msr[1]);
|
||||
|
||||
for (regi = acc0_regnum; regi <= acc7_regnum; regi++)
|
||||
regcache_raw_supply (regcache, regi, fpregsetp->acc[regi - acc0_regnum]);
|
||||
|
||||
regcache_raw_supply (regcache, accg0123_regnum, fpregsetp->accg);
|
||||
regcache_raw_supply (regcache, accg4567_regnum, fpregsetp->accg + 4);
|
||||
|
||||
regcache_raw_supply (regcache, fsr0_regnum, fpregsetp->fsr[0]);
|
||||
regcache_supply_regset (regset, regcache, regnum, gregs, len);
|
||||
}
|
||||
|
||||
/* FRV Linux kernel register sets. */
|
||||
|
||||
static const struct regset frv_linux_gregset =
|
||||
{
|
||||
NULL,
|
||||
frv_linux_supply_gregset
|
||||
frv_linux_gregmap,
|
||||
frv_linux_supply_gregset, regcache_collect_regset
|
||||
};
|
||||
|
||||
static const struct regset frv_linux_fpregset =
|
||||
{
|
||||
NULL,
|
||||
frv_linux_supply_fpregset
|
||||
frv_linux_fpregmap,
|
||||
regcache_supply_regset, regcache_collect_regset
|
||||
};
|
||||
|
||||
static const struct regset *
|
||||
|
|
|
|||
Loading…
Reference in New Issue