From 18b3c2f515f3b759b43b4b147f368c238694e883 Mon Sep 17 00:00:00 2001 From: Ricard Wanderlof Date: Fri, 6 Sep 2013 08:23:46 +0000 Subject: [PATCH] Cosmetic clean up of names of *elf_greg_t types for CRIS/CRISv32. 2013-09-06 Ricard Wanderlof * cris-tdep.c (cris_elf_greg_t): Rename from elf_greg_t. (cris_elf_gregset_t): Rename from elf_gregset_t. (crisv32_elf_gregset_t): Adjust. (cris_supply_gregset, fetch_core_registers): Adjust. --- gdb/ChangeLog | 7 +++++++ gdb/cris-tdep.c | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 88474baf4cd..eb023b1265f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2013-09-06 Ricard Wanderlof + + * cris-tdep.c (cris_elf_greg_t): Rename from elf_greg_t. + (cris_elf_gregset_t): Rename from elf_gregset_t. + (crisv32_elf_gregset_t): Adjust. + (cris_supply_gregset, fetch_core_registers): Adjust. + 2013-09-06 Ricard Wanderlof * cris-tdep.c (elf_greg_t): Change typedef to unsigned char[4] diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 80ab1b88e2c..1b0e3cdec07 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -3819,25 +3819,25 @@ cris_delayed_get_disassembler (bfd_vma addr, struct disassemble_info *info) return print_insn (addr, info); } -/* Copied from . */ -typedef unsigned char elf_greg_t[4]; +/* Originally from . */ +typedef unsigned char cris_elf_greg_t[4]; /* Same as user_regs_struct struct in . */ #define CRISV10_ELF_NGREG 35 -typedef elf_greg_t elf_gregset_t[CRISV10_ELF_NGREG]; +typedef cris_elf_greg_t cris_elf_gregset_t[CRISV10_ELF_NGREG]; #define CRISV32_ELF_NGREG 32 -typedef elf_greg_t crisv32_elf_gregset_t[CRISV32_ELF_NGREG]; +typedef cris_elf_greg_t crisv32_elf_gregset_t[CRISV32_ELF_NGREG]; -/* Unpack an elf_gregset_t into GDB's register cache. */ +/* Unpack a cris_elf_gregset_t into GDB's register cache. */ static void -cris_supply_gregset (struct regcache *regcache, elf_gregset_t *gregsetp) +cris_supply_gregset (struct regcache *regcache, cris_elf_gregset_t *gregsetp) { struct gdbarch *gdbarch = get_regcache_arch (regcache); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); int i; - elf_greg_t *regp = *gregsetp; + cris_elf_greg_t *regp = *gregsetp; static char zerobuf[4] = {0}; /* The kernel dumps all 32 registers as unsigned longs, but supply_register @@ -3868,12 +3868,12 @@ fetch_core_registers (struct regcache *regcache, char *core_reg_sect, unsigned core_reg_size, int which, CORE_ADDR reg_addr) { - elf_gregset_t gregset; + cris_elf_gregset_t gregset; switch (which) { case 0: - if (core_reg_size != sizeof (elf_gregset_t) + if (core_reg_size != sizeof (cris_elf_gregset_t) && core_reg_size != sizeof (crisv32_elf_gregset_t)) { warning (_("wrong size gregset struct in core file")); -- 2.30.2