Fred Fish <fnf@cygnus.com>
* targets.c (cisco_core_vec): Replaced with two new vecs ...
(cisco_core_big_vec): Add new bigendian vec.
(cisco_core_little_vec): Add new little endian vec.
* cisco-core.c (CRASH_INFO): Fixed offset replaced with ...
(crash_info_locs): Add array of possible offsets.
(MASK_ADDR): Mask to apply to crash info offset.
(crashinfo_external): Add textbase, database, bssbase and
turn into a typedef.
(cisco_core_file_validate): Renamed from cisco_core_file_p.
Many small changes to account for additional hardware versions.
Pick a reasonable size for ".reg" section. Add a ".crash"
section to allow access to crashinfo_external struct.
(cisco_core_file_p): New version of this function that
iterates over crash_info_locs, calling cisco_core_file_validate.
(cisco_core_vec): Old big endian only vec replaced with ...
(cisco_core_big_vec): Add big endian version.
(cisco_core_little_vec): Add little endian version.
* configure.in (cisco_core_vec): Split to two new vectors ...
(cisco_core_big_vec): New target vector.
(cisco_core_little_vec): New target vector.
* configure: Regenerate.
* config.bfd (targ): For m68*-*-aout* targ, change cisco_core_vec
to cisco_core_big_vec in targ_selvecs.
This commit is contained in:
Richard Henderson
parent
7c9e78f8e4
commit
f4bda9848f
6 changed files with 181 additions and 34 deletions
|
|
@ -1,3 +1,31 @@
|
|||
1999-09-28 Fred Fish <fnf@cygnus.com>
|
||||
|
||||
* targets.c (cisco_core_vec): Replaced with two new vecs ...
|
||||
(cisco_core_big_vec): Add new bigendian vec.
|
||||
(cisco_core_little_vec): Add new little endian vec.
|
||||
|
||||
* cisco-core.c (CRASH_INFO): Fixed offset replaced with ...
|
||||
(crash_info_locs): Add array of possible offsets.
|
||||
(MASK_ADDR): Mask to apply to crash info offset.
|
||||
(crashinfo_external): Add textbase, database, bssbase and
|
||||
turn into a typedef.
|
||||
(cisco_core_file_validate): Renamed from cisco_core_file_p.
|
||||
Many small changes to account for additional hardware versions.
|
||||
Pick a reasonable size for ".reg" section. Add a ".crash"
|
||||
section to allow access to crashinfo_external struct.
|
||||
(cisco_core_file_p): New version of this function that
|
||||
iterates over crash_info_locs, calling cisco_core_file_validate.
|
||||
(cisco_core_vec): Old big endian only vec replaced with ...
|
||||
(cisco_core_big_vec): Add big endian version.
|
||||
(cisco_core_little_vec): Add little endian version.
|
||||
|
||||
* configure.in (cisco_core_vec): Split to two new vectors ...
|
||||
(cisco_core_big_vec): New target vector.
|
||||
(cisco_core_little_vec): New target vector.
|
||||
* configure: Regenerate.
|
||||
* config.bfd (targ): For m68*-*-aout* targ, change cisco_core_vec
|
||||
to cisco_core_big_vec in targ_selvecs.
|
||||
|
||||
1999-09-28 Geoffrey Keating <geoffk@cygnus.com>
|
||||
|
||||
* elf32-mips.c (mips_elf_relocate_hi16): Unused, delete.
|
||||
|
|
|
|||
172
bfd/cisco-core.c
172
bfd/cisco-core.c
|
|
@ -36,43 +36,60 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|||
# define SIGBUS 10
|
||||
#endif
|
||||
|
||||
#define CRASH_INFO (0xffc)
|
||||
#define CRASH_MAGIC 0xdead1234
|
||||
int crash_info_locs[] = {
|
||||
0x0250, /* mips, ppc, x86, i960 */
|
||||
0x0400, /* m68k, mips, x86, i960 */
|
||||
0x0FFC, /* m68k, mips, ppc, x86, i960 */
|
||||
0x3000, /* ppc */
|
||||
0x4FFC, /* m68k */
|
||||
-1
|
||||
};
|
||||
|
||||
#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,
|
||||
} crashreason;
|
||||
} crashreason;
|
||||
|
||||
struct crashinfo_external
|
||||
{
|
||||
char magic[4]; /* Magic number */
|
||||
typedef struct {
|
||||
char magic[4]; /* Magic number */
|
||||
char version[4]; /* Version number */
|
||||
char reason[4]; /* Crash reason */
|
||||
char cpu_vector[4]; /* CPU vector for exceptions */
|
||||
char registers[4]; /* Pointer to saved registers */
|
||||
char rambase[4]; /* Base of RAM (not in V1 crash info) */
|
||||
};
|
||||
char textbase[4]; /* Base of .text section (not in V3 crash info) */
|
||||
char database[4]; /* Base of .data section (not in V3 crash info) */
|
||||
char bssbase[4]; /* Base of .bss section (not in V3 crash info) */
|
||||
} crashinfo_external;
|
||||
|
||||
struct cisco_core_struct
|
||||
{
|
||||
int sig;
|
||||
};
|
||||
|
||||
/* Examine the file for a crash info struct at the offset given by
|
||||
CRASH_INFO_LOC. */
|
||||
|
||||
static const bfd_target *
|
||||
cisco_core_file_p (abfd)
|
||||
cisco_core_file_validate (abfd, crash_info_loc)
|
||||
bfd *abfd;
|
||||
int crash_info_loc;
|
||||
{
|
||||
char buf[4];
|
||||
unsigned int crashinfo_offset;
|
||||
struct crashinfo_external crashinfo;
|
||||
crashinfo_external crashinfo;
|
||||
int nread;
|
||||
unsigned int magic;
|
||||
unsigned int version;
|
||||
unsigned int rambase;
|
||||
sec_ptr asect;
|
||||
struct stat statbuf;
|
||||
|
||||
if (bfd_seek (abfd, CRASH_INFO, SEEK_SET) != 0)
|
||||
if (bfd_seek (abfd, crash_info_loc, SEEK_SET) != 0)
|
||||
return NULL;
|
||||
|
||||
nread = bfd_read (buf, 1, 4, abfd);
|
||||
|
|
@ -82,10 +99,14 @@ cisco_core_file_p (abfd)
|
|||
bfd_set_error (bfd_error_wrong_format);
|
||||
return NULL;
|
||||
}
|
||||
crashinfo_offset = bfd_get_32 (abfd, buf);
|
||||
crashinfo_offset = MASK_ADDR (bfd_get_32 (abfd, buf));
|
||||
|
||||
if (bfd_seek (abfd, crashinfo_offset, SEEK_SET) != 0)
|
||||
return NULL;
|
||||
{
|
||||
/* Most likely we failed because of a bogus (huge) offset */
|
||||
bfd_set_error (bfd_error_wrong_format);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
nread = bfd_read (&crashinfo, 1, sizeof (crashinfo), abfd);
|
||||
if (nread != sizeof (crashinfo))
|
||||
|
|
@ -101,24 +122,27 @@ cisco_core_file_p (abfd)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (bfd_get_32 (abfd, crashinfo.magic) != CRASH_MAGIC)
|
||||
magic = bfd_get_32 (abfd, crashinfo.magic);
|
||||
if (magic != CRASH_MAGIC)
|
||||
{
|
||||
bfd_set_error (bfd_error_wrong_format);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
switch (bfd_get_32 (abfd, crashinfo.version))
|
||||
version = bfd_get_32 (abfd, crashinfo.version);
|
||||
if (version == 0)
|
||||
{
|
||||
case 0:
|
||||
bfd_set_error (bfd_error_wrong_format);
|
||||
return NULL;
|
||||
case 1:
|
||||
}
|
||||
else if (version == 1)
|
||||
{
|
||||
/* V1 core dumps don't specify the dump base, assume 0 */
|
||||
rambase = 0;
|
||||
break;
|
||||
default:
|
||||
case 2:
|
||||
}
|
||||
else
|
||||
{
|
||||
rambase = bfd_get_32 (abfd, crashinfo.rambase);
|
||||
break;
|
||||
}
|
||||
|
||||
/* OK, we believe you. You're a core file. */
|
||||
|
|
@ -211,22 +235,43 @@ cisco_core_file_p (abfd)
|
|||
abfd->sections = NULL;
|
||||
abfd->section_count = 0;
|
||||
|
||||
/* Create a ".reg" section to allow access to the saved
|
||||
registers. */
|
||||
|
||||
asect = (asection *) bfd_zmalloc (sizeof (asection));
|
||||
if (asect == NULL)
|
||||
goto error_return;
|
||||
asect->name = ".reg";
|
||||
asect->flags = SEC_HAS_CONTENTS;
|
||||
/* This can be bigger than the real size. Set it to the size of the whole
|
||||
core file. */
|
||||
asect->_raw_size = statbuf.st_size;
|
||||
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;
|
||||
|
||||
/* There is only one section containing data from the target system's RAM.
|
||||
We call it .data. */
|
||||
/* Create a ".crash" section to allow access to the saved
|
||||
crash information. */
|
||||
|
||||
asect = (asection *) bfd_zmalloc (sizeof (asection));
|
||||
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;
|
||||
|
||||
/* Create a ".data" section that maps the entire file, which is
|
||||
essentially a dump of the target system's RAM. */
|
||||
|
||||
asect = (asection *) bfd_zmalloc (sizeof (asection));
|
||||
if (asect == NULL)
|
||||
goto error_return;
|
||||
|
|
@ -242,6 +287,9 @@ cisco_core_file_p (abfd)
|
|||
|
||||
return abfd->xvec;
|
||||
|
||||
/* Get here if we have already started filling out the BFD
|
||||
and there is an error of some kind. */
|
||||
|
||||
error_return:
|
||||
{
|
||||
sec_ptr nextsect;
|
||||
|
|
@ -256,6 +304,22 @@ cisco_core_file_p (abfd)
|
|||
}
|
||||
}
|
||||
|
||||
static const bfd_target *
|
||||
cisco_core_file_p (abfd)
|
||||
bfd *abfd;
|
||||
{
|
||||
int *crash_info_locp;
|
||||
const bfd_target *target = NULL;
|
||||
|
||||
for (crash_info_locp = crash_info_locs;
|
||||
*crash_info_locp != -1 && target == NULL;
|
||||
crash_info_locp++)
|
||||
{
|
||||
target = cisco_core_file_validate (abfd, *crash_info_locp);
|
||||
}
|
||||
return (target);
|
||||
}
|
||||
|
||||
char *
|
||||
cisco_core_file_failing_command (abfd)
|
||||
bfd *abfd;
|
||||
|
|
@ -278,9 +342,11 @@ cisco_core_file_matches_executable_p (core_bfd, exec_bfd)
|
|||
return true;
|
||||
}
|
||||
|
||||
const bfd_target cisco_core_vec =
|
||||
extern const bfd_target cisco_core_little_vec;
|
||||
|
||||
const bfd_target cisco_core_big_vec =
|
||||
{
|
||||
"trad-core",
|
||||
"cisco-ios-core-big",
|
||||
bfd_target_unknown_flavour,
|
||||
BFD_ENDIAN_BIG, /* target byte order */
|
||||
BFD_ENDIAN_BIG, /* target headers byte order */
|
||||
|
|
@ -323,7 +389,57 @@ const bfd_target cisco_core_vec =
|
|||
BFD_JUMP_TABLE_LINK (_bfd_nolink),
|
||||
BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
|
||||
|
||||
NULL,
|
||||
& cisco_core_little_vec,
|
||||
|
||||
(PTR) 0 /* backend_data */
|
||||
};
|
||||
|
||||
const bfd_target cisco_core_little_vec =
|
||||
{
|
||||
"cisco-ios-core-little",
|
||||
bfd_target_unknown_flavour,
|
||||
BFD_ENDIAN_LITTLE, /* target byte order */
|
||||
BFD_ENDIAN_LITTLE, /* target headers byte order */
|
||||
(HAS_RELOC | EXEC_P | /* object flags */
|
||||
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 */
|
||||
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 */
|
||||
bfd_getl64, bfd_getl_signed_64, bfd_putl64,
|
||||
bfd_getl32, bfd_getl_signed_32, bfd_putl32,
|
||||
bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
|
||||
|
||||
{ /* bfd_check_format */
|
||||
_bfd_dummy_target, /* unknown format */
|
||||
_bfd_dummy_target, /* object file */
|
||||
_bfd_dummy_target, /* archive */
|
||||
cisco_core_file_p /* a core file */
|
||||
},
|
||||
{ /* bfd_set_format */
|
||||
bfd_false, bfd_false,
|
||||
bfd_false, bfd_false
|
||||
},
|
||||
{ /* bfd_write_contents */
|
||||
bfd_false, bfd_false,
|
||||
bfd_false, bfd_false
|
||||
},
|
||||
|
||||
BFD_JUMP_TABLE_GENERIC (_bfd_generic),
|
||||
BFD_JUMP_TABLE_COPY (_bfd_generic),
|
||||
BFD_JUMP_TABLE_CORE (cisco),
|
||||
BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
|
||||
BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
|
||||
BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
|
||||
BFD_JUMP_TABLE_WRITE (_bfd_generic),
|
||||
BFD_JUMP_TABLE_LINK (_bfd_nolink),
|
||||
BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
|
||||
|
||||
&cisco_core_big_vec,
|
||||
|
||||
(PTR) 0 /* backend_data */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -376,10 +376,10 @@ case "${targ}" in
|
|||
;;
|
||||
m68*-*-aout*)
|
||||
targ_defvec=aout0_big_vec
|
||||
# We include cisco_core_vec here, rather than making a separate cisco
|
||||
# We include cisco_core_big_vec here, rather than making a separate cisco
|
||||
# configuration, so that cisco-core.c gets routinely tested at
|
||||
# least for compilation.
|
||||
targ_selvecs="cisco_core_vec ieee_vec"
|
||||
targ_selvecs="cisco_core_big_vec ieee_vec"
|
||||
targ_underscore=yes
|
||||
;;
|
||||
m68*-*-elf* | m68*-*-sysv4*)
|
||||
|
|
|
|||
3
bfd/configure
vendored
3
bfd/configure
vendored
|
|
@ -5427,7 +5427,8 @@ do
|
|||
target64=true ;;
|
||||
bfd_elf64_sparc_vec) tb="$tb elf64-sparc.lo elf64.lo $elf"
|
||||
target64=true ;;
|
||||
cisco_core_vec) tb="$tb cisco-core.lo" ;;
|
||||
cisco_core_big_vec) tb="$tb cisco-core.lo" ;;
|
||||
cisco_core_little_vec) tb="$tb cisco-core.lo" ;;
|
||||
demo_64_vec) tb="$tb demo64.lo aout64.lo"
|
||||
target64=true ;;
|
||||
ecoff_big_vec) tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
|
||||
|
|
|
|||
|
|
@ -475,7 +475,8 @@ do
|
|||
target64=true ;;
|
||||
bfd_elf64_sparc_vec) tb="$tb elf64-sparc.lo elf64.lo $elf"
|
||||
target64=true ;;
|
||||
cisco_core_vec) tb="$tb cisco-core.lo" ;;
|
||||
cisco_core_big_vec) tb="$tb cisco-core.lo" ;;
|
||||
cisco_core_little_vec) tb="$tb cisco-core.lo" ;;
|
||||
demo_64_vec) tb="$tb demo64.lo aout64.lo"
|
||||
target64=true ;;
|
||||
ecoff_big_vec) tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
|
||||
|
|
|
|||
|
|
@ -640,7 +640,8 @@ extern const bfd_target ihex_vec;
|
|||
|
||||
/* All of the xvecs for core files. */
|
||||
extern const bfd_target aix386_core_vec;
|
||||
extern const bfd_target cisco_core_vec;
|
||||
extern const bfd_target cisco_core_big_vec;
|
||||
extern const bfd_target cisco_core_little_vec;
|
||||
extern const bfd_target hpux_core_vec;
|
||||
extern const bfd_target hppabsd_core_vec;
|
||||
extern const bfd_target irix_core_vec;
|
||||
|
|
@ -726,7 +727,7 @@ const bfd_target * const bfd_target_vector[] = {
|
|||
#if 0
|
||||
&bfd_elf64_sparc_vec,
|
||||
#endif
|
||||
/* We don't include cisco_core_vec. Although it has a magic number,
|
||||
/* We don't include cisco_core_*_vec. Although it has a magic number,
|
||||
the magic number isn't at the beginning of the file, and thus
|
||||
might spuriously match other kinds of files. */
|
||||
#ifdef BFD64
|
||||
|
|
|
|||
Loading…
Reference in a new issue