From 9e7b37b31f29ad3b8321d15e589ed5de550c56d3 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 5 Jan 2002 13:11:33 +0000 Subject: * section.c (bfd_section_init): Remove unnecessary initialisations. (bfd_section_list_clear): New function. (bfd_section_list_remove, bfd_section_list_insert): New macros. (_bfd_strip_section_from_output): Use them. * coffcode.h (coff_set_alignment_hook): Likewise. * elf32-mips.c (_bfd_mips_elf_final_link): Likewise. * elf64-mips.c (mips_elf64_final_link): Likewise. * elf64-mmix.c (mmix_elf_final_link): Likewise. * sunos.c (sunos_add_dynamic_symbols): Likewise. * xcofflink.c (_bfd_xcoff_bfd_final_link): Likewise. * bfd-in2.h: Regenerate. * netbsd-core.c (netbsd_core_file_p): Use bfd_make_section_anyway rather than doing our own section handling. Clean up after errors with bfd_release and bfd_section_list_clear. Handle unexpected flags. * aoutf1.h (sunos4_core_file_p): Likewise. * aix386-core.c (aix386_core_file_p): Likewise. * cisco-core.c (cisco_core_file_validate): Likewise. * ptrace-core.c (ptrace_unix_core_file_p): Likewise. * trad-core.c (trad_unix_core_file_p): Likewise. * hppabsd-core.c (hppabsd_core_core_file_p): Clean up after errors with bfd_release and bfd_section_list_clear. * hpux-core.c (hpux_core_core_file_p): Likewise. * irix-core.c (irix_core_core_file_p): Likewise. * lynx-core.c (lynx_core_file_p): Likewise. * osf-core.c (osf_core_core_file_p): Likewise. * rs6000-core.c (rs6000coff_core_p): Likewise. * sco5-core.c (sco5_core_file_p): Likewise. --- bfd/netbsd-core.c | 85 +++++++++++++++++++++++-------------------------------- 1 file changed, 35 insertions(+), 50 deletions(-) (limited to 'bfd/netbsd-core.c') diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c index 1c1a99ee048..2787c46eb89 100644 --- a/bfd/netbsd-core.c +++ b/bfd/netbsd-core.c @@ -1,5 +1,6 @@ /* BFD back end for NetBSD style core files - Copyright 1988, 1989, 1991, 1992, 1993, 1996, 1998, 1999, 2000, 2001 + Copyright 1988, 1989, 1991, 1992, 1993, 1996, 1998, 1999, 2000, 2001, + 2002 Free Software Foundation, Inc. Written by Paul Kranenburg, EUR @@ -78,10 +79,7 @@ netbsd_core_file_p (abfd) amt = sizeof (struct netbsd_core_struct); rawptr = (struct netbsd_core_struct *) bfd_zalloc (abfd, amt); if (rawptr == NULL) - { - bfd_set_error (bfd_error_no_memory); - return 0; - } + return 0; rawptr->core = core; abfd->tdata.netbsd_core_data = rawptr; @@ -89,6 +87,8 @@ netbsd_core_file_p (abfd) offset = core.c_hdrsize; for (i = 0; i < core.c_nseg; i++) { + const char *sname; + flagword flags; if (bfd_seek (abfd, offset, SEEK_SET) != 0) goto punt; @@ -107,78 +107,63 @@ netbsd_core_file_p (abfd) offset += core.c_seghdrsize; - amt = sizeof (asection); - asect = (asection *) bfd_zalloc (abfd, amt); - if (asect == NULL) + switch (CORE_GETFLAG (coreseg)) { - bfd_set_error (bfd_error_no_memory); - goto punt; + case CORE_CPU: + sname = ".reg"; + flags = SEC_ALLOC + SEC_HAS_CONTENTS; + break; + case CORE_DATA: + sname = ".data"; + flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS; + break; + case CORE_STACK: + sname = ".stack"; + flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS; + break; + default: + sname = ".unknown"; + flags = SEC_ALLOC + SEC_HAS_CONTENTS; + break; } + asect = bfd_make_section_anyway (abfd, sname); + if (asect == NULL) + goto punt; + asect->flags = flags; asect->_raw_size = coreseg.c_size; asect->vma = coreseg.c_addr; asect->filepos = offset; asect->alignment_power = 2; - asect->next = abfd->sections; - abfd->sections = asect; - abfd->section_count++; + offset += coreseg.c_size; - switch (CORE_GETFLAG(coreseg)) +#ifdef CORE_FPU_OFFSET + switch (CORE_GETFLAG (coreseg)) { case CORE_CPU: - asect->name = ".reg"; - asect->flags = SEC_ALLOC + SEC_HAS_CONTENTS; -#ifdef CORE_FPU_OFFSET /* Hackish... */ asect->_raw_size = CORE_FPU_OFFSET; - amt = sizeof (asection); - asect2 = (asection *) bfd_zalloc (abfd, amt); + asect2 = bfd_make_section_anyway (abfd, ".reg2"); if (asect2 == NULL) - { - bfd_set_error (bfd_error_no_memory); - goto punt; - } + goto punt; asect2->_raw_size = coreseg.c_size - CORE_FPU_OFFSET; asect2->vma = 0; asect2->filepos = asect->filepos + CORE_FPU_OFFSET; asect2->alignment_power = 2; - asect2->next = abfd->sections; - asect2->name = ".reg2"; asect2->flags = SEC_ALLOC + SEC_HAS_CONTENTS; - abfd->sections = asect2; - abfd->section_count++; -#endif - - break; - case CORE_DATA: - asect->name = ".data"; - asect->flags = SEC_ALLOC+SEC_LOAD+SEC_HAS_CONTENTS; - break; - case CORE_STACK: - asect->name = ".stack"; - asect->flags = SEC_ALLOC+SEC_LOAD+SEC_HAS_CONTENTS; break; } +#endif } /* OK, we believe you. You're a core file (sure, sure). */ return abfd->xvec; punt: - { - asection *anext; - for (asect = abfd->sections; asect; asect = anext) - { - anext = asect->next; - free ((void *) asect); - } - } - - free ((void *) rawptr); - abfd->tdata.netbsd_core_data = NULL; - abfd->sections = NULL; - abfd->section_count = 0; + bfd_release (abfd, abfd->tdata.any); + abfd->tdata.any = NULL; + bfd_section_list_clear (abfd); return 0; } -- cgit v1.2.3-65-gdbad