diff options
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/Makefile.in | 8 | ||||
| -rw-r--r-- | bfd/cache.c | 8 | ||||
| -rw-r--r-- | bfd/i386os9k.c | 361 | ||||
| -rw-r--r-- | bfd/targets.c | 5 |
5 files changed, 382 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 18558d6..732ba8e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 28 15:41:01 1994 Kung Hsu (kung@mexican.cygnus.com) + + * i386os9k.c : new file to handle os9k format bfd. + * Makefile.in : Handle new file i386os9k.c + * bfd-in2.h : Add bfd_target_os9k_flavour. + * targets.c : Add bfd_target_os9k_flavour and i386os9k_vec. + * cache.c : Initialize cache_sentinel to 0. + Sun Feb 27 16:30:55 1994 Jeffrey A. Law (law@snake.cs.utah.edu) * elf32-hppa.c (mismatches, retval_mismatches): Fix mismatch diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 6caeba9..93f21b8 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -150,6 +150,7 @@ BFD32_BACKENDS = \ i386lynx.o \ netbsd386.o \ i386mach3.o \ + i386os9k.o \ ieee.o \ m68klynx.o \ mipsbsd.o \ @@ -224,7 +225,8 @@ CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c \ coff-a29k.c coff-rs6000.c coff-sparc.c coffgen.c format.c \ section.c core.c syms.c stab-syms.c reloc.c init.c ctor.c \ coff-m88k.c coff-mips.c coff-sh.c trad-core.c newsos3.c \ - i386aout.c i386linux.c netbsd386.c i386mach3.c bout.c aout-adobe.c coff-we32k.c \ + i386aout.c i386linux.c netbsd386.c i386mach3.c i386os9k.c \ + bout.c aout-adobe.c coff-we32k.c \ i386bsd.c cpu-h8300.c cpu-i960.c cpu-sparc.c cpu-m68k.c \ cpu-m88k.c cpu-vax.c cpu-mips.c cpu-a29k.c cpu-i386.c cpu-powerpc.c \ cpu-rs6000.c coff-h8300.c som.c cpu-hppa.c cpu-we32k.c reloc16.c \ @@ -301,10 +303,10 @@ $(TARGETLIB): $(OFILES) ofiles targets.o: targets.c Makefile - $(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $(TDEFAULTS) $< + $(CC) -c $(ALL_CFLAGS) $(TDEFAULTS) $< archures.o: archures.c Makefile - $(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $(TDEFAULTS) $< + $(CC) -c $(ALL_CFLAGS) $(TDEFAULTS) $< subdir_do: force @for i in $(DODIRS); do \ diff --git a/bfd/cache.c b/bfd/cache.c index cefae72..c6b968a 100644 --- a/bfd/cache.c +++ b/bfd/cache.c @@ -60,7 +60,7 @@ bfd_cache_delete PARAMS ((bfd *)); static int open_files; -static bfd *cache_sentinel; /* Chain of BFDs with active fds we've +static bfd *cache_sentinel = 0; /* Chain of BFDs with active fds we've opened */ /* @@ -135,7 +135,7 @@ DEFUN(bfd_cache_delete,(abfd), else { ret = false; - bfd_error = system_call_error; + bfd_set_error (bfd_error_system_call); } snip (abfd); abfd->iostream = NULL; @@ -216,9 +216,9 @@ SYNOPSIS DESCRIPTION Call the OS to open a file for @var{abfd}. Return the <<FILE *>> - (possibly NULL) that results from this operation. Set up the + (possibly <<NULL>>) that results from this operation. Set up the BFD so that future accesses know the file is open. If the <<FILE *>> - returned is NULL, then it won't have been put in the + returned is <<NULL>>, then it won't have been put in the cache, so it won't have to be removed from it. */ diff --git a/bfd/i386os9k.c b/bfd/i386os9k.c new file mode 100644 index 0000000..ba3e5b1 --- /dev/null +++ b/bfd/i386os9k.c @@ -0,0 +1,361 @@ +/* BFD back-end for os9000 i386 binaries. + Copyright 1990, 1991, 1992, 1993 1994 Free Software Foundation, Inc. + Written by Cygnus Support. + +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 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + + +#include "bfd.h" +#include "sysdep.h" +#include "libbfd.h" +#include "bfdlink.h" +#include "libaout.h" /* BFD a.out internal data structures */ +#include "os9k.h" + +static 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 +DEFUN(os9k_swap_exec_header_in,(abfd, raw_bytes, execp), + bfd *abfd AND + mh_com *raw_bytes AND + struct internal_exec *execp) +{ + mh_com *bytes = (mh_com *)raw_bytes; + unsigned int dload, dmemsize, dmemstart; + + /* Now fill in fields in the execp, from the bytes in the raw data. */ + execp->a_info = bfd_h_get_16 (abfd, bytes->m_sync); + execp->a_syms = 0; + execp->a_entry = bfd_h_get_32 (abfd, bytes->m_exec); + execp->a_talign = 2; + execp->a_dalign = 2; + execp->a_balign = 2; + + 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); + + execp->a_tload = 0; + execp->a_dload = bfd_h_get_32 (abfd, (unsigned char *)&dmemstart); + execp->a_text = dload - execp->a_tload; + execp->a_data = bfd_h_get_32 (abfd, (unsigned char *)&dmemsize); + execp->a_bss = bfd_h_get_32 (abfd, bytes->m_data) - execp->a_data; + + execp->a_trsize = 0; + execp->a_drsize = 0; +} + +#if 0 +/* Swaps the information in an internal exec header structure into the + supplied buffer ready for writing to disk. */ + +PROTO(void, os9k_swap_exec_header_out, + (bfd *abfd, + struct internal_exec *execp, + struct mh_com *raw_bytes)); +void +DEFUN(os9k_swap_exec_header_out,(abfd, execp, raw_bytes), + bfd *abfd AND + struct internal_exec *execp AND + mh_com *raw_bytes) +{ + mh_com *bytes = (mh_com *)raw_bytes; + + /* Now fill in fields in the raw data, from the fields in the exec struct. */ + bfd_h_put_32 (abfd, execp->a_info , bytes->e_info); + bfd_h_put_32 (abfd, execp->a_text , bytes->e_text); + bfd_h_put_32 (abfd, execp->a_data , bytes->e_data); + bfd_h_put_32 (abfd, execp->a_bss , bytes->e_bss); + bfd_h_put_32 (abfd, execp->a_syms , bytes->e_syms); + bfd_h_put_32 (abfd, execp->a_entry , bytes->e_entry); + bfd_h_put_32 (abfd, execp->a_trsize, bytes->e_trsize); + bfd_h_put_32 (abfd, execp->a_drsize, bytes->e_drsize); + bfd_h_put_32 (abfd, execp->a_tload , bytes->e_tload); + bfd_h_put_32 (abfd, execp->a_dload , bytes->e_dload); + bytes->e_talign[0] = execp->a_talign; + bytes->e_dalign[0] = execp->a_dalign; + bytes->e_balign[0] = execp->a_balign; + bytes->e_relaxable[0] = execp->a_relaxable; +} +#endif 0 + +static bfd_target * +os9k_object_p (abfd) + bfd *abfd; +{ + struct internal_exec anexec; + mh_com exec_bytes; + + if (bfd_read ((PTR) &exec_bytes, MHCOM_BYTES_SIZE, 1, abfd) + != MHCOM_BYTES_SIZE) { + bfd_error = wrong_format; + return 0; + } + + anexec.a_info = bfd_h_get_16 (abfd, exec_bytes.m_sync); + if (N_BADMAG (anexec)) { + bfd_error = wrong_format; + return 0; + } + + os9k_swap_exec_header_in (abfd, &exec_bytes, &anexec); + return aout_32_some_aout_object_p (abfd, &anexec, os9k_callback); +} + + +/* 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 * +os9k_callback (abfd) + bfd *abfd; +{ + struct internal_exec *execp = exec_hdr (abfd); + unsigned long bss_start; + + /* Architecture and machine type */ + bfd_set_arch_mach(abfd, bfd_arch_i386, 0); + + /* The positions of the string table and symbol table. */ + obj_str_filepos (abfd) = 0; + obj_sym_filepos (abfd) = 0; + + /* The alignments of the sections */ + obj_textsec (abfd)->alignment_power = execp->a_talign; + obj_datasec (abfd)->alignment_power = execp->a_dalign; + obj_bsssec (abfd)->alignment_power = execp->a_balign; + + /* The starting addresses of the sections. */ + obj_textsec (abfd)->vma = execp->a_tload; + obj_datasec (abfd)->vma = execp->a_dload; + + /* And reload the sizes, since the aout module zaps them */ + obj_textsec (abfd)->_raw_size = execp->a_text; + + bss_start = execp->a_dload + execp->a_data; /* BSS = end of data section */ + obj_bsssec (abfd)->vma = align_power (bss_start, execp->a_balign); + + /* The file positions of the sections */ + obj_textsec (abfd)->filepos = execp->a_entry; + obj_datasec (abfd)->filepos = execp->a_dload; + + /* The file positions of the relocation info *** + obj_textsec (abfd)->rel_filepos = N_TROFF(*execp); + obj_datasec (abfd)->rel_filepos = N_DROFF(*execp); + */ + + adata(abfd).page_size = 1; /* Not applicable. */ + adata(abfd).segment_size = 1; /* Not applicable. */ + adata(abfd).exec_bytes_size = MHCOM_BYTES_SIZE; + + return abfd->xvec; +} + +#if 0 +struct bout_data_struct { + struct aoutdata a; + struct internal_exec e; +}; + +static boolean +os9k_mkobject (abfd) + bfd *abfd; +{ + struct bout_data_struct *rawptr; + + rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct)); + if (rawptr == NULL) { + bfd_error = no_memory; + 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; +} + +static boolean +os9k_write_object_contents (abfd) + bfd *abfd; +{ + struct external_exec swapped_hdr; + + exec_hdr (abfd)->a_info = BMAGIC; + + exec_hdr (abfd)->a_text = obj_textsec (abfd)->_raw_size; + exec_hdr (abfd)->a_data = obj_datasec (abfd)->_raw_size; + exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->_raw_size; + exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * sizeof (struct nlist); + exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd); + exec_hdr (abfd)->a_trsize = ((obj_textsec (abfd)->reloc_count) * + sizeof (struct relocation_info)); + exec_hdr (abfd)->a_drsize = ((obj_datasec (abfd)->reloc_count) * + sizeof (struct relocation_info)); + + exec_hdr (abfd)->a_talign = obj_textsec (abfd)->alignment_power; + exec_hdr (abfd)->a_dalign = obj_datasec (abfd)->alignment_power; + exec_hdr (abfd)->a_balign = obj_bsssec (abfd)->alignment_power; + + exec_hdr (abfd)->a_tload = obj_textsec (abfd)->vma; + exec_hdr (abfd)->a_dload = obj_datasec (abfd)->vma; + + 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); + + /* 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 (! aout_32_write_syms (abfd)) + return false; + + bfd_seek (abfd, (file_ptr)(N_TROFF(*exec_hdr(abfd))), SEEK_SET); + + 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 (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd))) return false; + } + return true; +} + +static boolean +os9k_set_section_contents (abfd, section, location, offset, count) + bfd *abfd; + sec_ptr section; + unsigned char *location; + file_ptr offset; + int 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_error = invalid_operation; + return false; + } + + obj_textsec (abfd)->filepos = sizeof(struct internal_exec); + obj_datasec(abfd)->filepos = obj_textsec(abfd)->filepos + + obj_textsec (abfd)->_raw_size; + + } + /* regardless, once we know what we're doing, we might as well get going */ + bfd_seek (abfd, section->filepos + offset, SEEK_SET); + + if (count != 0) { + return (bfd_write ((PTR)location, 1, count, abfd) == count) ?true:false; + } + return true; +} +#endif 0 + +static int +DEFUN(os9k_sizeof_headers,(ignore_abfd, ignore), + bfd *ignore_abfd AND + boolean ignore) +{ + return sizeof(struct internal_exec); +} + + +/***********************************************************************/ + +/* 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) + +bfd_target i386os9k_vec = +{ + "i386os9k", /* name */ + bfd_target_os9k_flavour, + false, /* data byte order is little */ + false, /* hdr byte order is big */ + (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, + 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_dummy_target, os9k_object_p, /* bfd_check_format */ + bfd_generic_archive_p, _bfd_dummy_target}, + {bfd_false, bfd_false, /* bfd_set_format */ + _bfd_generic_mkarchive, bfd_false}, + {bfd_false, bfd_false, /* bfd_write_contents */ + _bfd_write_archive_contents, bfd_false}, + + JUMP_TABLE(aout_32), + (PTR) 0, +}; + diff --git a/bfd/targets.c b/bfd/targets.c index 20d66bf..c52a3e6 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -145,7 +145,8 @@ DESCRIPTION . bfd_target_oasys_flavour, . bfd_target_tekhex_flavour, . bfd_target_srec_flavour, -. bfd_target_som_flavour}; +. bfd_target_som_flavour, +. bfd_target_os9k_flavour}; . .{* Forward declaration. *} .typedef struct bfd_link_info _bfd_link_info; @@ -388,6 +389,7 @@ extern bfd_target hp300hpux_vec; extern bfd_target som_vec; extern bfd_target i386aout_vec; extern bfd_target i386bsd_vec; +extern bfd_target i386os9k_vec; extern bfd_target netbsd386_vec; extern bfd_target i386coff_vec; extern bfd_target i386linux_vec; @@ -516,6 +518,7 @@ bfd_target *bfd_target_vector[] = { #endif &i386lynx_aout_vec, &i386lynx_coff_vec, + &i386os9k_vec, &icoff_big_vec, &icoff_little_vec, &ieee_vec, |