X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fi386lynx.c;h=f74854334b409f6de0bc05721e076797cefe2b90;hb=de4112fa387b662c7c7a1dd3e334a1274ca54d28;hp=7ed7c7e3b7e5ad5e0255f57a979d3f06c8993727;hpb=2f3508ad05b193386e250bee0cb8b30d23928af1;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/i386lynx.c b/bfd/i386lynx.c index 7ed7c7e3b7..f74854334b 100644 --- a/bfd/i386lynx.c +++ b/bfd/i386lynx.c @@ -1,5 +1,6 @@ /* BFD back-end for i386 a.out binaries under LynxOS. - Copyright (C) 1990, 1991, 1992 Free Software Foundation, Inc. + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2001 + Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -15,18 +16,20 @@ 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. */ #define BYTES_IN_WORD 4 -#define ARCH 32 #define N_SHARED_LIB(x) 0 #define TEXT_START_ADDR 0 -#define PAGE_SIZE 4096 -#define SEGMENT_SIZE PAGE_SIZE +#define TARGET_PAGE_SIZE 4096 +#define SEGMENT_SIZE TARGET_PAGE_SIZE #define DEFAULT_ARCH bfd_arch_i386 -#define MY(OP) CAT(i386lynx_aout_,OP) +/* Do not "beautify" the CONCAT* macro args. Traditional C will not + remove whitespace added here, and thus will fail to concatenate + the tokens. */ +#define MY(OP) CONCAT2 (i386lynx_aout_,OP) #define TARGETNAME "a.out-i386-lynx" #include "bfd.h" @@ -50,31 +53,31 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ obj_reloc_entry_size (abfd)); \ NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes); \ \ - if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return false; \ - if (bfd_write ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd) \ - != EXEC_BYTES_SIZE) \ + if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0 \ + || bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) 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) \ { \ - if (bfd_seek (abfd, (file_ptr)(N_SYMOFF(*execp)), SEEK_SET) \ + if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) \ != 0) \ return false; \ \ - if (! NAME(aout,write_syms)(abfd)) return false; \ + if (! NAME(aout,write_syms) (abfd)) return false; \ \ - if (bfd_seek (abfd, (file_ptr)(N_TRELOFF(*execp)), SEEK_SET) \ + if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET) \ != 0) \ return false; \ \ if (!NAME(lynx,squirt_out_relocs) (abfd, obj_textsec (abfd))) \ return false; \ - if (bfd_seek (abfd, (file_ptr)(N_DRELOFF(*execp)), SEEK_SET) \ + if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET) \ != 0) \ return 0; \ \ - if (!NAME(lynx,squirt_out_relocs)(abfd, obj_datasec (abfd))) \ + if (!NAME(lynx,squirt_out_relocs) (abfd, obj_datasec (abfd))) \ return false; \ } \ } @@ -83,7 +86,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "libaout.h" #include "aout/aout64.h" -#ifdef HOST_LYNX +void NAME (lynx,swap_std_reloc_out) PARAMS ((bfd *, arelent *, struct reloc_std_external *)); +void NAME (lynx,swap_ext_reloc_out) PARAMS ((bfd *, arelent *, struct reloc_ext_external *)); +void NAME (lynx,swap_ext_reloc_in) PARAMS ((bfd *, struct reloc_ext_external *, arelent *, asymbol **, bfd_size_type)); +void NAME (lynx,swap_std_reloc_in) PARAMS ((bfd *, struct reloc_std_external *, arelent *, asymbol **, bfd_size_type)); +boolean NAME (lynx,slurp_reloc_table) PARAMS ((bfd *, sec_ptr, asymbol **)); +boolean NAME (lynx,squirt_out_relocs) PARAMS ((bfd *, asection *)); +long NAME (lynx,canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **, asymbol **)); + +#ifdef LYNX_CORE char *lynx_core_file_failing_command (); int lynx_core_file_failing_signal (); @@ -95,10 +106,10 @@ const bfd_target *lynx_core_file_p (); #define MY_core_file_matches_executable_p lynx_core_file_matches_executable_p #define MY_core_file_p lynx_core_file_p -#endif /* HOST_LYNX */ +#endif /* LYNX_CORE */ -#define KEEPIT flags +#define KEEPIT udata.i extern reloc_howto_type aout_32_ext_howto_table[]; extern reloc_howto_type aout_32_std_howto_table[]; @@ -144,10 +155,10 @@ NAME(lynx,swap_std_reloc_out) (abfd, g, natptr) if (bfd_is_com_section (output_section) - || output_section == &bfd_abs_section - || output_section == &bfd_und_section) + || bfd_is_abs_section (output_section) + || bfd_is_und_section (output_section)) { - if (bfd_abs_section.symbol == sym) + if (bfd_abs_section_ptr->symbol == sym) { /* Whoops, looked like an abs symbol, but is really an offset from the abs section */ @@ -158,8 +169,7 @@ NAME(lynx,swap_std_reloc_out) (abfd, g, natptr) { /* Fill in symbol */ r_extern = 1; - r_index = stoi ((*(g->sym_ptr_ptr))->KEEPIT); - + r_index = (*g->sym_ptr_ptr)->KEEPIT; } } else @@ -170,7 +180,7 @@ NAME(lynx,swap_std_reloc_out) (abfd, g, natptr) } /* now the fun stuff */ - if (abfd->xvec->header_byteorder_big_p != false) + if (bfd_header_big_endian (abfd)) { natptr->r_index[0] = r_index >> 16; natptr->r_index[1] = r_index >> 8; @@ -231,10 +241,10 @@ NAME(lynx,swap_ext_reloc_out) (abfd, g, natptr) */ if (bfd_is_com_section (output_section) - || output_section == &bfd_abs_section - || output_section == &bfd_und_section) + || bfd_is_abs_section (output_section) + || bfd_is_und_section (output_section)) { - if (bfd_abs_section.symbol == sym) + if (bfd_abs_section_ptr->symbol == sym) { /* Whoops, looked like an abs symbol, but is really an offset from the abs section */ @@ -244,7 +254,7 @@ NAME(lynx,swap_ext_reloc_out) (abfd, g, natptr) else { r_extern = 1; - r_index = stoi ((*(g->sym_ptr_ptr))->KEEPIT); + r_index = (*g->sym_ptr_ptr)->KEEPIT; } } else @@ -256,7 +266,7 @@ NAME(lynx,swap_ext_reloc_out) (abfd, g, natptr) /* now the fun stuff */ - if (abfd->xvec->header_byteorder_big_p != false) + if (bfd_header_big_endian (abfd)) { natptr->r_index[0] = r_index >> 16; natptr->r_index[1] = r_index >> 8; @@ -314,18 +324,19 @@ NAME(lynx,swap_ext_reloc_out) (abfd, g, natptr) default: \ case N_ABS: \ case N_ABS | N_EXT: \ - cache_ptr->sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr; \ + cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; \ cache_ptr->addend = ad; \ break; \ } \ } \ void -NAME(lynx,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols) +NAME(lynx,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount) bfd *abfd; struct reloc_ext_external *bytes; arelent *cache_ptr; asymbol **symbols; + bfd_size_type symcount ATTRIBUTE_UNUSED; { int r_index; int r_extern; @@ -344,11 +355,12 @@ NAME(lynx,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols) } void -NAME(lynx,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols) +NAME(lynx,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount) bfd *abfd; struct reloc_std_external *bytes; arelent *cache_ptr; asymbol **symbols; + bfd_size_type symcount ATTRIBUTE_UNUSED; { int r_index; int r_extern; @@ -357,7 +369,7 @@ NAME(lynx,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols) int r_baserel, r_jmptable, r_relative; struct aoutdata *su = &(abfd->tdata.aout_data->a); - cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address); + cache_ptr->address = H_GET_32 (abfd, bytes->r_address); r_index = bytes->r_index[1]; r_extern = (0 != (bytes->r_index[0] & RELOC_STD_BITS_EXTERN_BIG)); @@ -382,7 +394,7 @@ NAME(lynx,slurp_reloc_table) (abfd, asect, symbols) sec_ptr asect; asymbol **symbols; { - unsigned int count; + bfd_size_type count; bfd_size_type reloc_size; PTR relocs; arelent *reloc_cache; @@ -417,23 +429,19 @@ doit: count = reloc_size / each_size; - reloc_cache = (arelent *) malloc (count * sizeof (arelent)); + reloc_cache = (arelent *) bfd_malloc (count * sizeof (arelent)); if (!reloc_cache && count != 0) - { - nomem: - bfd_set_error (bfd_error_no_memory); - return false; - } - memset (reloc_cache, 0, count * sizeof (arelent)); + return false; + memset (reloc_cache, 0, (size_t) count * sizeof (arelent)); relocs = (PTR) bfd_alloc (abfd, reloc_size); if (!relocs && reloc_size != 0) { free (reloc_cache); - goto nomem; + return false; } - if (bfd_read (relocs, 1, reloc_size, abfd) != reloc_size) + if (bfd_bread (relocs, reloc_size, abfd) != reloc_size) { bfd_release (abfd, relocs); free (reloc_cache); @@ -448,7 +456,8 @@ doit: for (; counter < count; counter++, rptr++, cache_ptr++) { - NAME(lynx,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols); + NAME(lynx,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols, + (bfd_size_type) bfd_get_symcount (abfd)); } } else @@ -459,7 +468,8 @@ doit: for (; counter < count; counter++, rptr++, cache_ptr++) { - NAME(lynx,swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols); + NAME(lynx,swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols, + (bfd_size_type) bfd_get_symcount (abfd)); } } @@ -484,19 +494,17 @@ NAME(lynx,squirt_out_relocs) (abfd, section) size_t each_size; unsigned int count = section->reloc_count; - size_t natsize; + bfd_size_type natsize; if (count == 0) return true; each_size = obj_reloc_entry_size (abfd); - natsize = each_size * count; + natsize = count; + natsize *= each_size; native = (unsigned char *) bfd_zalloc (abfd, natsize); if (!native) - { - bfd_set_error (bfd_error_no_memory); - return false; - } + return false; generic = section->orelocation; @@ -515,7 +523,7 @@ NAME(lynx,squirt_out_relocs) (abfd, section) NAME(lynx,swap_std_reloc_out) (abfd, *generic, (struct reloc_std_external *) natptr); } - if (bfd_write ((PTR) native, 1, natsize, abfd) != natsize) + if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize) { bfd_release (abfd, native); return false;