X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Flynx-core.c;h=08d088386114195c4b41cedd340ddb46e50abfcf;hb=30ce8e47fad9b057b6d7af9e1d43061126d34d20;hp=2358177dbc62c5ff63ea09087fe1a8372a173d5b;hpb=dc9e099fc0eced486ae2b49455c9da113c11f4ff;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/lynx-core.c b/bfd/lynx-core.c index 2358177dbc..08d0883861 100644 --- a/bfd/lynx-core.c +++ b/bfd/lynx-core.c @@ -1,32 +1,33 @@ /* BFD back end for Lynx core files - Copyright 1993 Free Software Foundation, Inc. + Copyright (C) 1993-2020 Free Software Foundation, Inc. Written by Stu Grossman of Cygnus Support. -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" #ifdef LYNX_CORE #include #include -/* sys/kernel.h should define this, but doesn't always, sigh. */ +/* sys/kernel.h should define this, but doesn't always, sigh. */ #ifndef __LYNXOS #define __LYNXOS #endif @@ -40,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* These are stored in the bfd's tdata */ -struct lynx_core_struct +struct lynx_core_struct { int sig; char cmd[PNMLEN + 1]; @@ -50,32 +51,33 @@ struct lynx_core_struct #define core_signal(bfd) (core_hdr(bfd)->sig) #define core_command(bfd) (core_hdr(bfd)->cmd) +#define lynx_core_file_matches_executable_p generic_core_file_matches_executable_p +#define lynx_core_file_pid _bfd_nocore_core_file_pid + /* Handle Lynx core dump file. */ static asection * -make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos) - bfd *abfd; - CONST char *name; - flagword flags; - bfd_size_type _raw_size; - bfd_vma vma; - file_ptr filepos; +make_bfd_asection (bfd *abfd, + const char *name, + flagword flags, + bfd_size_type size, + bfd_vma vma, + file_ptr filepos) { asection *asect; char *newname; - newname = bfd_alloc (abfd, strlen (name) + 1); + newname = bfd_alloc (abfd, (bfd_size_type) strlen (name) + 1); if (!newname) return NULL; strcpy (newname, name); - asect = bfd_make_section (abfd, newname); + asect = bfd_make_section_with_flags (abfd, newname, flags); if (!asect) return NULL; - asect->flags = flags; - asect->_raw_size = _raw_size; + asect->size = size; asect->vma = vma; asect->filepos = filepos; asect->alignment_power = 2; @@ -83,18 +85,16 @@ make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos) return asect; } -/* ARGSUSED */ -const bfd_target * -lynx_core_file_p (abfd) - bfd *abfd; +bfd_cleanup +lynx_core_file_p (bfd *abfd) { - int val; int secnum; struct pssentry pss; - size_t tcontext_size; + bfd_size_type tcontext_size; core_st_t *threadp; int pagesize; asection *newsect; + size_t amt; pagesize = getpagesize (); /* Serious cross-target issue here... This really needs to come from a system-specific @@ -102,11 +102,11 @@ lynx_core_file_p (abfd) /* Get the pss entry from the core file */ - if (bfd_seek (abfd, 0, SEEK_SET) != 0) + if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return NULL; - val = bfd_read ((void *)&pss, 1, sizeof pss, abfd); - if (val != sizeof pss) + amt = sizeof pss; + if (bfd_bread ((void *) &pss, amt, abfd) != amt) { /* Too small to be a core file */ if (bfd_get_error () != bfd_error_system_call) @@ -114,8 +114,8 @@ lynx_core_file_p (abfd) return NULL; } - core_hdr (abfd) = (struct lynx_core_struct *) - bfd_zalloc (abfd, sizeof (struct lynx_core_struct)); + amt = sizeof (struct lynx_core_struct); + core_hdr (abfd) = (struct lynx_core_struct *) bfd_zalloc (abfd, amt); if (!core_hdr (abfd)) return NULL; @@ -126,27 +126,14 @@ lynx_core_file_p (abfd) tcontext_size = pss.threadcnt * sizeof (core_st_t); - /* Allocate space for the thread contexts */ - - threadp = (core_st_t *)bfd_alloc (abfd, tcontext_size); - if (!threadp) - return NULL; - /* Save thread contexts */ - if (bfd_seek (abfd, pagesize, SEEK_SET) != 0) - return NULL; - - val = bfd_read ((void *)threadp, pss.threadcnt, sizeof (core_st_t), abfd); + goto fail; + threadp = (core_st_t *) _bfd_alloc_and_read (abfd, tcontext_size, + tcontext_size); + if (!threadp) + goto fail; - if (val != tcontext_size) - { - /* Probably too small to be a core file */ - if (bfd_get_error () != bfd_error_system_call) - bfd_set_error (bfd_error_wrong_format); - return NULL; - } - core_signal (abfd) = threadp->currsig; newsect = make_bfd_asection (abfd, ".stack", @@ -155,7 +142,7 @@ lynx_core_file_p (abfd) pss.slimit, pagesize + tcontext_size); if (!newsect) - return NULL; + goto fail; newsect = make_bfd_asection (abfd, ".data", SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS, @@ -164,16 +151,16 @@ lynx_core_file_p (abfd) pagesize + tcontext_size + pss.ssize #if defined (SPARC) || defined (__SPARC__) /* SPARC Lynx seems to start dumping - the .data section at a page - boundary. It's OK to check a - #define like SPARC here because this - file can only be compiled on a Lynx - host. */ + the .data section at a page + boundary. It's OK to check a + #define like SPARC here because this + file can only be compiled on a Lynx + host. */ + pss.data_start % pagesize #endif ); if (!newsect) - return NULL; + goto fail; /* And, now for the .reg/XXX pseudo sections. Each thread has it's own .reg/XXX section, where XXX is the thread id (without leading zeros). The @@ -188,7 +175,7 @@ lynx_core_file_p (abfd) 0, pagesize); if (!newsect) - return NULL; + goto fail; for (secnum = 0; secnum < pss.threadcnt; secnum++) { @@ -201,33 +188,28 @@ lynx_core_file_p (abfd) 0, pagesize + secnum * sizeof (core_st_t)); if (!newsect) - return NULL; + goto fail; } - return abfd->xvec; + return _bfd_no_cleanup; + + fail: + bfd_release (abfd, core_hdr (abfd)); + core_hdr (abfd) = NULL; + bfd_section_list_clear (abfd); + return NULL; } char * -lynx_core_file_failing_command (abfd) - bfd *abfd; +lynx_core_file_failing_command (bfd *abfd) { return core_command (abfd); } -/* ARGSUSED */ int -lynx_core_file_failing_signal (abfd) - bfd *abfd; +lynx_core_file_failing_signal (bfd *abfd) { return core_signal (abfd); } -/* ARGSUSED */ -boolean -lynx_core_file_matches_executable_p (core_bfd, exec_bfd) - bfd *core_bfd, *exec_bfd; -{ - return true; /* FIXME, We have no way of telling at this point */ -} - #endif /* LYNX_CORE */