X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ffrv-linux-tdep.c;h=cee2d0c5e24fdb9e06fefdcdf74b45bcc7743007;hb=7cac64af7bc6a7f7a86f90a1465f7c3d2b6f07e8;hp=4c0c0df6231dbe3425e1f03602f0e53088efe570;hpb=137a83b9f9fb6da863136923fec8c4b24c7ec5a6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/frv-linux-tdep.c b/gdb/frv-linux-tdep.c index 4c0c0df623..cee2d0c5e2 100644 --- a/gdb/frv-linux-tdep.c +++ b/gdb/frv-linux-tdep.c @@ -1,7 +1,7 @@ /* Target-dependent code for GNU/Linux running on the Fujitsu FR-V, for GDB. - Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc. + Copyright (C) 2004-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -30,8 +30,8 @@ #include "trad-frame.h" #include "frame-unwind.h" #include "regset.h" -#include "gdb_string.h" #include "linux-tdep.h" +#include "gdbarch.h" /* Define the size (in bytes) of an FR-V instruction. */ static const int frv_instr_size = 4; @@ -46,7 +46,7 @@ frv_linux_pc_in_sigtramp (struct gdbarch *gdbarch, CORE_ADDR pc, const char *name) { enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); - char buf[frv_instr_size]; + gdb_byte buf[frv_instr_size]; LONGEST instr; int retval = 0; @@ -182,7 +182,7 @@ frv_linux_sigcontext_reg_addr (struct frame_info *this_frame, int regno, else { CORE_ADDR pc, sp; - char buf[4]; + gdb_byte buf[4]; int tramp_type; pc = get_frame_pc (this_frame); @@ -262,17 +262,16 @@ frv_linux_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) { struct gdbarch *gdbarch = get_frame_arch (this_frame); - struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); struct trad_frame_cache *cache; CORE_ADDR addr; - char buf[4]; + gdb_byte buf[4]; int regnum; CORE_ADDR sc_addr_cache_val = 0; struct frame_id this_id; if (*this_cache) - return *this_cache; + return (struct trad_frame_cache *) *this_cache; cache = trad_frame_cache_zalloc (this_frame); @@ -360,37 +359,52 @@ typedef struct frv_elf_fpreg_t fsr[1]; } frv_elf_fpregset_t; -/* Constants for accessing elements of frv_elf_gregset_t. */ - -#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 - -/* Note: Only 32 of the GRs will be found in the corefile. */ -#define FRV_PT_GR(j) ( 14 + (j)) /* GRj for 0<=j<=63. */ - -#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 - +/* Register maps. */ + +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 */ + + /* 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. */ + + { 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,96 +414,42 @@ frv_linux_supply_gregset (const struct regset *regset, int regnum, const void *gregs, size_t len) { int regi; - char zerobuf[MAX_REGISTER_SIZE]; - const frv_elf_gregset_t *gregsetp = gregs; - - memset (zerobuf, 0, MAX_REGISTER_SIZE); /* gr0 always contains 0. Also, the kernel passes the TBR value in 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)]); - } - - 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. */ + regcache->raw_supply_zeroed (first_gpr_regnum); -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]); + /* Fill gr32, ..., gr63 with zeros. */ + for (regi = first_gpr_regnum + 32; regi <= last_gpr_regnum; regi++) + regcache->raw_supply_zeroed (regi); - 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 struct regset frv_linux_gregset = +static const struct regset frv_linux_gregset = { - NULL, - frv_linux_supply_gregset + frv_linux_gregmap, + frv_linux_supply_gregset, regcache_collect_regset }; -static struct regset frv_linux_fpregset = +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 * -frv_linux_regset_from_core_section (struct gdbarch *gdbarch, - const char *sect_name, size_t sect_size) +static void +frv_linux_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 >= sizeof (frv_elf_gregset_t)) - return &frv_linux_gregset; - - if (strcmp (sect_name, ".reg2") == 0 - && sect_size >= sizeof (frv_elf_fpregset_t)) - return &frv_linux_fpregset; - - return NULL; + cb (".reg", sizeof (frv_elf_gregset_t), sizeof (frv_elf_gregset_t), + &frv_linux_gregset, NULL, cb_data); + cb (".reg2", sizeof (frv_elf_fpregset_t), sizeof (frv_elf_fpregset_t), + &frv_linux_fpregset, NULL, cb_data); } @@ -501,8 +461,8 @@ frv_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* Set the sigtramp frame sniffer. */ frame_unwind_append_unwinder (gdbarch, &frv_linux_sigtramp_frame_unwind); - set_gdbarch_regset_from_core_section (gdbarch, - frv_linux_regset_from_core_section); + set_gdbarch_iterate_over_regset_sections + (gdbarch, frv_linux_iterate_over_regset_sections); } static enum gdb_osabi @@ -521,9 +481,6 @@ frv_linux_elf_osabi_sniffer (bfd *abfd) return GDB_OSABI_UNKNOWN; } -/* Provide a prototype to silence -Wmissing-prototypes. */ -void _initialize_frv_linux_tdep (void); - void _initialize_frv_linux_tdep (void) {