X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fi386os9k.c;h=0aadee52d73d4f590ce3a49192f839cd2394a650;hb=4e32685259347bae0453b62a1418395d7771ec25;hp=c6955fe22ba31dfc672cfaa5d21bb15bd9508f15;hpb=9deaaaf1b35a54f776957492c4300ea993a3961c;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/i386os9k.c b/bfd/i386os9k.c index c6955fe22b..0aadee52d7 100644 --- a/bfd/i386os9k.c +++ b/bfd/i386os9k.c @@ -1,5 +1,5 @@ /* BFD back-end for os9000 i386 binaries. - Copyright 1990, 1991, 1992, 1993 1994 Free Software Foundation, Inc. + Copyright 1990, 91, 92, 93, 94, 95, 98, 1999 Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -16,7 +16,7 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "bfd.h" @@ -26,11 +26,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "libaout.h" /* BFD a.out internal data structures */ #include "os9k.h" -static bfd_target *os9k_callback PARAMS ((bfd *)); +static const bfd_target *os9k_callback PARAMS ((bfd *)); /* Swaps the information in an executable header taken from a raw byte stream memory image, into the internal exec_header structure. */ -void +boolean os9k_swap_exec_header_in (abfd, raw_bytes, execp) bfd *abfd; mh_com *raw_bytes; @@ -50,9 +50,12 @@ os9k_swap_exec_header_in (abfd, raw_bytes, execp) dload = bfd_h_get_32 (abfd, bytes->m_idata); execp->a_data = dload + 8; - bfd_seek (abfd, (file_ptr) dload, SEEK_SET); - bfd_read (&dmemstart, sizeof (dmemstart), 1, abfd); - bfd_read (&dmemsize, sizeof (dmemsize), 1, abfd); + if (bfd_seek (abfd, (file_ptr) dload, SEEK_SET) != 0 + || (bfd_read (&dmemstart, sizeof (dmemstart), 1, abfd) + != sizeof (dmemstart)) + || (bfd_read (&dmemsize, sizeof (dmemsize), 1, abfd) + != sizeof (dmemsize))) + return false; execp->a_tload = 0; execp->a_dload = bfd_h_get_32 (abfd, (unsigned char *) &dmemstart); @@ -62,6 +65,8 @@ os9k_swap_exec_header_in (abfd, raw_bytes, execp) execp->a_trsize = 0; execp->a_drsize = 0; + + return true; } #if 0 @@ -99,7 +104,7 @@ os9k_swap_exec_header_out (abfd, execp, raw_bytes) #endif /* 0 */ -static bfd_target * +static const bfd_target * os9k_object_p (abfd) bfd *abfd; { @@ -109,7 +114,8 @@ os9k_object_p (abfd) if (bfd_read ((PTR) & exec_bytes, MHCOM_BYTES_SIZE, 1, abfd) != MHCOM_BYTES_SIZE) { - bfd_set_error (bfd_error_wrong_format); + if (bfd_get_error () != bfd_error_system_call) + bfd_set_error (bfd_error_wrong_format); return 0; } @@ -120,7 +126,12 @@ os9k_object_p (abfd) return 0; } - os9k_swap_exec_header_in (abfd, &exec_bytes, &anexec); + if (! os9k_swap_exec_header_in (abfd, &exec_bytes, &anexec)) + { + if (bfd_get_error () != bfd_error_system_call) + bfd_set_error (bfd_error_wrong_format); + return NULL; + } return aout_32_some_aout_object_p (abfd, &anexec, os9k_callback); } @@ -128,7 +139,7 @@ os9k_object_p (abfd) /* Finish up the opening of a b.out file for reading. Fill in all the fields that are not handled by common code. */ -static bfd_target * +static const bfd_target * os9k_callback (abfd) bfd *abfd; { @@ -188,23 +199,15 @@ os9k_mkobject (abfd) rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct)); if (rawptr == NULL) - { - bfd_set_error (bfd_error_no_memory); - return false; - } + return false; abfd->tdata.bout_data = rawptr; exec_hdr (abfd) = &rawptr->e; - /* For simplicity's sake we just make all the sections right here. */ obj_textsec (abfd) = (asection *) NULL; obj_datasec (abfd) = (asection *) NULL; obj_bsssec (abfd) = (asection *) NULL; - bfd_make_section (abfd, ".text"); - bfd_make_section (abfd, ".data"); - bfd_make_section (abfd, ".bss"); - return true; } @@ -214,6 +217,9 @@ os9k_write_object_contents (abfd) { struct external_exec swapped_hdr; + if (! aout_32_make_sections (abfd)) + return false; + exec_hdr (abfd)->a_info = BMAGIC; exec_hdr (abfd)->a_text = obj_textsec (abfd)->_raw_size; @@ -235,22 +241,30 @@ os9k_write_object_contents (abfd) bout_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr); - bfd_seek (abfd, (file_ptr) 0, SEEK_SET); - bfd_write ((PTR) & swapped_hdr, 1, EXEC_BYTES_SIZE, abfd); + if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0 + || (bfd_write ((PTR) & swapped_hdr, 1, EXEC_BYTES_SIZE, abfd) + != EXEC_BYTES_SIZE)) + return false; /* Now write out reloc info, followed by syms and strings */ if (bfd_get_symcount (abfd) != 0) { - bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET); + if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET) + != 0) + return false; if (!aout_32_write_syms (abfd)) return false; - bfd_seek (abfd, (file_ptr) (N_TROFF (*exec_hdr (abfd))), SEEK_SET); + if (bfd_seek (abfd, (file_ptr) (N_TROFF (*exec_hdr (abfd))), SEEK_SET) + != 0) + return false; if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd))) return false; - bfd_seek (abfd, (file_ptr) (N_DROFF (*exec_hdr (abfd))), SEEK_SET); + if (bfd_seek (abfd, (file_ptr) (N_DROFF (*exec_hdr (abfd))), SEEK_SET) + != 0) + return false; if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd))) return false; @@ -269,12 +283,8 @@ os9k_set_section_contents (abfd, section, location, offset, count) if (abfd->output_has_begun == false) { /* set by bfd.c handler */ - if ((obj_textsec (abfd) == NULL) || (obj_datasec (abfd) == NULL) /*|| - (obj_textsec (abfd)->_cooked_size == 0) || (obj_datasec (abfd)->_cooked_size == 0)*/ ) - { - bfd_set_error (bfd_error_invalid_operation); - return false; - } + if (! aout_32_make_sections (abfd)) + return false; obj_textsec (abfd)->filepos = sizeof (struct internal_exec); obj_datasec (abfd)->filepos = obj_textsec (abfd)->filepos @@ -282,7 +292,8 @@ os9k_set_section_contents (abfd, section, location, offset, count) } /* regardless, once we know what we're doing, we might as well get going */ - bfd_seek (abfd, section->filepos + offset, SEEK_SET); + if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0) + return false; if (count != 0) { @@ -294,8 +305,8 @@ os9k_set_section_contents (abfd, section, location, offset, count) static int os9k_sizeof_headers (ignore_abfd, ignore) - bfd *ignore_abfd; - boolean ignore; + bfd *ignore_abfd ATTRIBUTE_UNUSED; + boolean ignore ATTRIBUTE_UNUSED; { return sizeof (struct internal_exec); } @@ -303,55 +314,35 @@ os9k_sizeof_headers (ignore_abfd, ignore) /***********************************************************************/ -/* We don't have core files. */ -#define aout_32_core_file_failing_command _bfd_dummy_core_file_failing_command -#define aout_32_core_file_failing_signal _bfd_dummy_core_file_failing_signal -#define aout_32_core_file_matches_executable_p \ - _bfd_dummy_core_file_matches_executable_p - -/* We use BSD-Unix generic archive files. */ -#define aout_32_openr_next_archived_file bfd_generic_openr_next_archived_file -#define aout_32_generic_stat_arch_elt bfd_generic_stat_arch_elt -#define aout_32_slurp_armap bfd_slurp_bsd_armap -#define aout_32_slurp_extended_name_table _bfd_slurp_extended_name_table -#define aout_32_write_armap bsd_write_armap -#define aout_32_truncate_arname bfd_bsd_truncate_arname - -/* We override these routines from the usual a.out file routines. */ -#define aout_32_canonicalize_reloc bfd_canonicalize_reloc -#define aout_32_get_reloc_upper_bound bfd_get_reloc_upper_bound -#define aout_32_set_section_contents bfd_set_section_contents -#define aout_32_set_arch_mach bfd_default_set_arch_mach -#define aout_32_sizeof_headers os9k_sizeof_headers - -#define aout_32_bfd_debug_info_start bfd_void -#define aout_32_bfd_debug_info_end bfd_void -#define aout_32_bfd_debug_info_accumulate (PROTO(void,(*),(bfd*, struct sec *))) bfd_void - -#define aout_32_bfd_make_debug_symbol \ - ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr) -#define aout_32_bfd_link_hash_table_create _bfd_generic_link_hash_table_create -#define aout_32_bfd_link_add_symbols _bfd_generic_link_add_symbols -#define aout_32_bfd_final_link _bfd_generic_final_link -#define aout_32_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents -#define aout_32_bfd_relax_section bfd_generic_relax_section -#define aout_32_bfd_reloc_type_lookup \ - ((CONST struct reloc_howto_struct *(*) PARAMS \ -((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr) -#define aout_32_bfd_free_cached_info bfd_true - -bfd_target i386os9k_vec = +#define aout_32_close_and_cleanup aout_32_bfd_free_cached_info + +#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol + +#define aout_32_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup + +#define aout_32_get_section_contents_in_window \ + _bfd_generic_get_section_contents_in_window + +#define os9k_bfd_get_relocated_section_contents \ + bfd_generic_get_relocated_section_contents +#define os9k_bfd_relax_section bfd_generic_relax_section +#define os9k_bfd_gc_sections bfd_generic_gc_sections +#define os9k_bfd_link_hash_table_create _bfd_generic_link_hash_table_create +#define os9k_bfd_link_add_symbols _bfd_generic_link_add_symbols +#define os9k_bfd_final_link _bfd_generic_final_link +#define os9k_bfd_link_split_section _bfd_generic_link_split_section + +const bfd_target i386os9k_vec = { "i386os9k", /* name */ bfd_target_os9k_flavour, - false, /* data byte order is little */ - false, /* hdr byte order is big */ + BFD_ENDIAN_LITTLE, /* data byte order is little */ + BFD_ENDIAN_LITTLE, /* hdr byte order is little */ (HAS_RELOC | EXEC_P | WP_TEXT), /* object flags */ (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD), /* section flags */ 0, /* symbol leading char */ ' ', /* ar_pad_char */ 16, /* ar_max_namelen */ - 2, /* minumum alignment power */ bfd_getl64, bfd_getl_signed_64, bfd_putl64, bfd_getl32, bfd_getl_signed_32, bfd_putl32, @@ -366,6 +357,17 @@ bfd_target i386os9k_vec = {bfd_false, bfd_false, /* bfd_write_contents */ _bfd_write_archive_contents, bfd_false}, - JUMP_TABLE (aout_32), + BFD_JUMP_TABLE_GENERIC (aout_32), + BFD_JUMP_TABLE_COPY (_bfd_generic), + BFD_JUMP_TABLE_CORE (_bfd_nocore), + BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd), + BFD_JUMP_TABLE_SYMBOLS (aout_32), + BFD_JUMP_TABLE_RELOCS (aout_32), + BFD_JUMP_TABLE_WRITE (aout_32), + BFD_JUMP_TABLE_LINK (os9k), + BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + + NULL, + (PTR) 0, };