X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcisco-core.c;h=1fcf024f4c1b692e0625d27c1f6b842f385d8737;hb=46a2d504dd875caf60f9be191a55c9ff676bcd5c;hp=f9878a2cf0a5a2caacb5608d50f62072273b576e;hpb=dc810e3900d47ab2eea86d50231ff2e70b596847;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/cisco-core.c b/bfd/cisco-core.c index f9878a2cf0..1fcf024f4c 100644 --- a/bfd/cisco-core.c +++ b/bfd/cisco-core.c @@ -1,24 +1,25 @@ /* BFD back-end for CISCO crash dumps. - Copyright 1994, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1994-2016 Free Software Foundation, Inc. -This file is part of BFD, the Binary File Descriptor library. + This file is part of BFD, the Binary File Descriptor library. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" /* core_file_failing_signal returns a host signal (this probably should be fixed). */ @@ -35,7 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ # define SIGBUS 10 #endif -int crash_info_locs[] = { +int crash_info_locs[] = +{ 0x0250, /* mips, ppc, x86, i960 */ 0x0400, /* m68k, mips, x86, i960 */ 0x0FFC, /* m68k, mips, ppc, x86, i960 */ @@ -47,13 +49,15 @@ int crash_info_locs[] = { #define CRASH_MAGIC 0xdead1234 #define MASK_ADDR(x) ((x) & 0x0fffffff) /* Mask crash info address */ -typedef enum { - CRASH_REASON_NOTCRASHED = 0, - CRASH_REASON_EXCEPTION = 1, - CRASH_REASON_CORRUPT = 2, +typedef enum +{ + CRASH_REASON_NOTCRASHED = 0, + CRASH_REASON_EXCEPTION = 1, + CRASH_REASON_CORRUPT = 2, } crashreason; -typedef struct { +typedef struct +{ char magic[4]; /* Magic number */ char version[4]; /* Version number */ char reason[4]; /* Crash reason */ @@ -70,30 +74,26 @@ struct cisco_core_struct int sig; }; -static const bfd_target *cisco_core_file_validate PARAMS ((bfd *, int)); -static const bfd_target *cisco_core_file_p PARAMS ((bfd *)); -char *cisco_core_file_failing_command PARAMS ((bfd *)); -int cisco_core_file_failing_signal PARAMS ((bfd *)); -boolean cisco_core_file_matches_executable_p PARAMS ((bfd *, bfd *)); +#define cisco_core_file_matches_executable_p generic_core_file_matches_executable_p +#define cisco_core_file_pid _bfd_nocore_core_file_pid /* Examine the file for a crash info struct at the offset given by CRASH_INFO_LOC. */ static const bfd_target * -cisco_core_file_validate (abfd, crash_info_loc) - bfd *abfd; - int crash_info_loc; +cisco_core_file_validate (bfd *abfd, int crash_info_loc) { char buf[4]; unsigned int crashinfo_offset; crashinfo_external crashinfo; - int nread; + bfd_size_type nread; unsigned int magic; unsigned int version; unsigned int rambase; sec_ptr asect; struct stat statbuf; bfd_size_type amt; + flagword flags; if (bfd_seek (abfd, (file_ptr) crash_info_loc, SEEK_SET) != 0) return NULL; @@ -237,58 +237,42 @@ cisco_core_file_validate (abfd, crash_info_loc) break; } - abfd->sections = NULL; - abfd->section_count = 0; - - /* Create a ".reg" section to allow access to the saved - registers. */ + /* Create a ".data" section that maps the entire file, which is + essentially a dump of the target system's RAM. */ - asect = (asection *) bfd_zmalloc ((bfd_size_type) sizeof (asection)); + flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS; + asect = bfd_make_section_anyway_with_flags (abfd, ".data", flags); if (asect == NULL) goto error_return; - asect->name = ".reg"; - asect->flags = SEC_HAS_CONTENTS; - asect->vma = 0; - asect->filepos = bfd_get_32 (abfd, crashinfo.registers) - rambase; - /* Since we don't know the exact size of the saved register info, - choose a register section size that is either the remaining part - of the file, or 1024, whichever is smaller. */ - nread = statbuf.st_size - asect->filepos; - asect->_raw_size = (nread < 1024) ? nread : 1024; - asect->next = abfd->sections; - abfd->sections = asect; - ++abfd->section_count; + /* The size of memory is the size of the core file itself. */ + asect->size = statbuf.st_size; + asect->vma = rambase; + asect->filepos = 0; /* Create a ".crash" section to allow access to the saved crash information. */ - asect = (asection *) bfd_zmalloc ((bfd_size_type) sizeof (asection)); + flags = SEC_HAS_CONTENTS; + asect = bfd_make_section_anyway_with_flags (abfd, ".crash", flags); if (asect == NULL) goto error_return; - asect->name = ".crash"; - asect->flags = SEC_HAS_CONTENTS; asect->vma = 0; asect->filepos = crashinfo_offset; - asect->_raw_size = sizeof (crashinfo); - asect->next = abfd->sections; - abfd->sections = asect; - ++abfd->section_count; + asect->size = sizeof (crashinfo); - /* Create a ".data" section that maps the entire file, which is - essentially a dump of the target system's RAM. */ + /* Create a ".reg" section to allow access to the saved + registers. */ - asect = (asection *) bfd_zmalloc ((bfd_size_type) sizeof (asection)); + asect = bfd_make_section_anyway_with_flags (abfd, ".reg", flags); if (asect == NULL) goto error_return; - asect->name = ".data"; - asect->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS; - /* The size of memory is the size of the core file itself. */ - asect->_raw_size = statbuf.st_size; - asect->vma = rambase; - asect->filepos = 0; - asect->next = abfd->sections; - abfd->sections = asect; - ++abfd->section_count; + asect->vma = 0; + asect->filepos = bfd_get_32 (abfd, crashinfo.registers) - rambase; + /* Since we don't know the exact size of the saved register info, + choose a register section size that is either the remaining part + of the file, or 1024, whichever is smaller. */ + nread = statbuf.st_size - asect->filepos; + asect->size = (nread < 1024) ? nread : 1024; return abfd->xvec; @@ -296,22 +280,14 @@ cisco_core_file_validate (abfd, crash_info_loc) and there is an error of some kind. */ error_return: - { - sec_ptr nextsect; - for (asect = abfd->sections; asect != NULL;) - { - nextsect = asect->next; - free (asect); - asect = nextsect; - } - free (abfd->tdata.cisco_core_data); - return NULL; - } + bfd_release (abfd, abfd->tdata.any); + abfd->tdata.any = NULL; + bfd_section_list_clear (abfd); + return NULL; } static const bfd_target * -cisco_core_file_p (abfd) - bfd *abfd; +cisco_core_file_p (bfd *abfd) { int *crash_info_locp; const bfd_target *target = NULL; @@ -325,32 +301,22 @@ cisco_core_file_p (abfd) return (target); } -char * -cisco_core_file_failing_command (abfd) - bfd *abfd ATTRIBUTE_UNUSED; +static char * +cisco_core_file_failing_command (bfd *abfd ATTRIBUTE_UNUSED) { return NULL; } -int -cisco_core_file_failing_signal (abfd) - bfd *abfd ATTRIBUTE_UNUSED; +static int +cisco_core_file_failing_signal (bfd *abfd ATTRIBUTE_UNUSED) { return abfd->tdata.cisco_core_data->sig; } - -boolean -cisco_core_file_matches_executable_p (core_bfd, exec_bfd) - bfd *core_bfd ATTRIBUTE_UNUSED; - bfd *exec_bfd ATTRIBUTE_UNUSED; -{ - return true; -} -extern const bfd_target cisco_core_little_vec; +extern const bfd_target core_cisco_le_vec; -const bfd_target cisco_core_big_vec = - { +const bfd_target core_cisco_be_vec = +{ "cisco-ios-core-big", bfd_target_unknown_flavour, BFD_ENDIAN_BIG, /* target byte order */ @@ -359,9 +325,10 @@ const bfd_target cisco_core_big_vec = HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED), (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - 0, /* symbol prefix */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ + 0, /* symbol prefix */ + ' ', /* ar_pad_char */ + 16, /* ar_max_namelen */ + 0, /* match priority. */ bfd_getb64, bfd_getb_signed_64, bfd_putb64, bfd_getb32, bfd_getb_signed_32, bfd_putb32, bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */ @@ -394,13 +361,13 @@ const bfd_target cisco_core_big_vec = BFD_JUMP_TABLE_LINK (_bfd_nolink), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), - & cisco_core_little_vec, + & core_cisco_le_vec, - (PTR) 0 /* backend_data */ + NULL /* backend_data */ }; -const bfd_target cisco_core_little_vec = - { +const bfd_target core_cisco_le_vec = +{ "cisco-ios-core-little", bfd_target_unknown_flavour, BFD_ENDIAN_LITTLE, /* target byte order */ @@ -412,6 +379,7 @@ const bfd_target cisco_core_little_vec = 0, /* symbol prefix */ ' ', /* ar_pad_char */ 16, /* ar_max_namelen */ + 0, /* match_priority */ bfd_getl64, bfd_getl_signed_64, bfd_putl64, bfd_getl32, bfd_getl_signed_32, bfd_putl32, bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */ @@ -444,7 +412,7 @@ const bfd_target cisco_core_little_vec = BFD_JUMP_TABLE_LINK (_bfd_nolink), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), - &cisco_core_big_vec, + &core_cisco_be_vec, - (PTR) 0 /* backend_data */ + NULL /* backend_data */ };