X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Faout-target.h;h=fd344a45d599333043aed3a0ed1f72a6def97fee;hb=80fccad2d4ce82a2ed9a5d8d081eb2daefa09f9d;hp=3813826c7a8ec9fb173c497aa48130d703ddce24;hpb=34e9ffbccc6dc8647f40b1f5468319b358337e48;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/aout-target.h b/bfd/aout-target.h index 3813826c7a..fd344a45d5 100644 --- a/bfd/aout-target.h +++ b/bfd/aout-target.h @@ -1,5 +1,7 @@ /* Define a target vector and some small routines for a variant of a.out. - Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -22,11 +24,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "aout/ar.h" /*#include "libaout.h"*/ -extern reloc_howto_type * NAME(aout,reloc_type_lookup) (); +#ifndef SEGMENT_SIZE +#define SEGMENT_SIZE TARGET_PAGE_SIZE +#endif + +extern reloc_howto_type * NAME(aout,reloc_type_lookup) + PARAMS ((bfd *, bfd_reloc_code_real_type)); /* Set parameters about this a.out file that are machine-dependent. This routine is called from some_aout_object_p just before it returns. */ #ifndef MY_callback + +static const bfd_target *MY(callback) PARAMS ((bfd *)); + static const bfd_target * MY(callback) (abfd) bfd *abfd; @@ -43,6 +53,27 @@ MY(callback) (abfd) obj_datasec (abfd)->vma = N_DATADDR(*execp); obj_bsssec (abfd)->vma = N_BSSADDR(*execp); + /* For some targets, if the entry point is not in the same page + as the start of the text, then adjust the VMA so that it is. + FIXME: Do this with a macro like SET_ARCH_MACH instead? */ + if (aout_backend_info (abfd)->entry_is_text_address + && execp->a_entry > obj_textsec (abfd)->vma) + { + bfd_vma adjust; + + adjust = execp->a_entry - obj_textsec (abfd)->vma; + /* Adjust only by whole pages. */ + adjust &= ~(TARGET_PAGE_SIZE - 1); + obj_textsec (abfd)->vma += adjust; + obj_datasec (abfd)->vma += adjust; + obj_bsssec (abfd)->vma += adjust; + } + + /* Set the load addresses to be the same as the virtual addresses. */ + obj_textsec (abfd)->lma = obj_textsec (abfd)->vma; + obj_datasec (abfd)->lma = obj_datasec (abfd)->vma; + obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma; + /* The file offsets of the sections */ obj_textsec (abfd)->filepos = N_TXTOFF (*execp); obj_datasec (abfd)->filepos = N_DATOFF (*execp); @@ -54,14 +85,23 @@ MY(callback) (abfd) /* The file offsets of the string table and symbol table. */ obj_sym_filepos (abfd) = N_SYMOFF (*execp); obj_str_filepos (abfd) = N_STROFF (*execp); - + /* Determine the architecture and machine type of the object file. */ #ifdef SET_ARCH_MACH - SET_ARCH_MACH(abfd, *execp); + SET_ARCH_MACH (abfd, *execp); #else - bfd_default_set_arch_mach(abfd, DEFAULT_ARCH, 0); + bfd_default_set_arch_mach (abfd, DEFAULT_ARCH, 0); #endif + /* The number of relocation records. This must be called after + SET_ARCH_MACH. It assumes that SET_ARCH_MACH will set + obj_reloc_entry_size correctly, if the reloc size is not + RELOC_STD_SIZE. */ + obj_textsec (abfd)->reloc_count = + execp->a_trsize / obj_reloc_entry_size (abfd); + obj_datasec (abfd)->reloc_count = + execp->a_drsize / obj_reloc_entry_size (abfd); + /* Now that we know the architecture, set the alignments of the sections. This is normally done by NAME(aout,new_section_hook), but when the initial sections were created the architecture had @@ -86,11 +126,7 @@ MY(callback) (abfd) Sizes get set in set_sizes callback, later. */ #if 0 adata(abfd).page_size = TARGET_PAGE_SIZE; -#ifdef SEGMENT_SIZE adata(abfd).segment_size = SEGMENT_SIZE; -#else - adata(abfd).segment_size = TARGET_PAGE_SIZE; -#endif adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE; #endif @@ -101,6 +137,8 @@ MY(callback) (abfd) #ifndef MY_object_p /* Finish up the reading of an a.out file header */ +static const bfd_target *MY(object_p) PARAMS ((bfd *)); + static const bfd_target * MY(object_p) (abfd) bfd *abfd; @@ -108,18 +146,19 @@ MY(object_p) (abfd) struct external_exec exec_bytes; /* Raw exec header from file */ struct internal_exec exec; /* Cleaned-up exec header */ const bfd_target *target; + bfd_size_type amt = EXEC_BYTES_SIZE; - if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd) - != EXEC_BYTES_SIZE) { - if (bfd_get_error () != bfd_error_system_call) - bfd_set_error (bfd_error_wrong_format); - return 0; - } + if (bfd_bread ((PTR) &exec_bytes, amt, abfd) != amt) + { + if (bfd_get_error () != bfd_error_system_call) + bfd_set_error (bfd_error_wrong_format); + return 0; + } #ifdef SWAP_MAGIC exec.a_info = SWAP_MAGIC (exec_bytes.e_info); #else - exec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info); + exec.a_info = GET_MAGIC (abfd, exec_bytes.e_info); #endif /* SWAP_MAGIC */ if (N_BADMAG (exec)) return 0; @@ -127,7 +166,7 @@ MY(object_p) (abfd) if (!(MACHTYPE_OK (N_MACHTYPE (exec)))) return 0; #endif - NAME(aout,swap_exec_header_in)(abfd, &exec_bytes, &exec); + NAME(aout,swap_exec_header_in) (abfd, &exec_bytes, &exec); #ifdef SWAP_MAGIC /* swap_exec_header_in read in a_info with the wrong byte order */ @@ -141,7 +180,7 @@ MY(object_p) (abfd) * means that it isn't obvious if EXEC_P should be set. * All of the following must be true for an executable: * There must be no relocations, the bfd can be neither an - * archive nor an archive element, and the file must be executable. */ + * archive nor an archive element, and the file must be executable. */ if (exec.a_trsize + exec.a_drsize == 0 && bfd_get_format(abfd) == bfd_object && abfd->my_archive == NULL) @@ -160,25 +199,23 @@ MY(object_p) (abfd) #define MY_object_p MY(object_p) #endif - #ifndef MY_mkobject -static boolean + +static bfd_boolean MY(mkobject) PARAMS ((bfd *)); + +static bfd_boolean MY(mkobject) (abfd) bfd *abfd; { - if (NAME(aout,mkobject)(abfd) == false) - return false; + if (! NAME(aout,mkobject) (abfd)) + return FALSE; #if 0 /* Sizes get set in set_sizes callback, later, after we know the architecture and machine. */ adata(abfd).page_size = TARGET_PAGE_SIZE; -#ifdef SEGMENT_SIZE adata(abfd).segment_size = SEGMENT_SIZE; -#else - adata(abfd).segment_size = TARGET_PAGE_SIZE; -#endif adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE; #endif - return true; + return TRUE; } #define MY_mkobject MY(mkobject) #endif @@ -191,17 +228,20 @@ MY(mkobject) (abfd) section contents, and copy_private_bfd_data is not called until after the section contents have been set. */ -/*ARGSUSED*/ -static boolean +static bfd_boolean MY_bfd_copy_private_section_data + PARAMS ((bfd *, asection *, bfd *, asection *)); + +static bfd_boolean MY_bfd_copy_private_section_data (ibfd, isec, obfd, osec) bfd *ibfd; - asection *isec; + asection *isec ATTRIBUTE_UNUSED; bfd *obfd; - asection *osec; + asection *osec ATTRIBUTE_UNUSED; { - if (bfd_get_flavour (obfd) == bfd_target_aout_flavour) + if (bfd_get_flavour (ibfd) == bfd_target_aout_flavour + && bfd_get_flavour (obfd) == bfd_target_aout_flavour) obj_aout_subformat (obfd) = obj_aout_subformat (ibfd); - return true; + return TRUE; } #endif @@ -211,38 +251,34 @@ MY_bfd_copy_private_section_data (ibfd, isec, obfd, osec) file header, symbols, and relocation. */ #ifndef MY_write_object_contents -static boolean +static bfd_boolean MY(write_object_contents) PARAMS ((bfd *)); + +static bfd_boolean MY(write_object_contents) (abfd) bfd *abfd; { struct external_exec exec_bytes; struct internal_exec *execp = exec_hdr (abfd); -#if CHOOSE_RELOC_SIZE - CHOOSE_RELOC_SIZE(abfd); -#else obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; -#endif WRITE_HEADERS(abfd, execp); - return true; + return TRUE; } #define MY_write_object_contents MY(write_object_contents) #endif #ifndef MY_set_sizes -static boolean + +static bfd_boolean MY(set_sizes) PARAMS ((bfd *)); + +static bfd_boolean MY(set_sizes) (abfd) bfd *abfd; { adata(abfd).page_size = TARGET_PAGE_SIZE; - -#ifdef SEGMENT_SIZE adata(abfd).segment_size = SEGMENT_SIZE; -#else - adata(abfd).segment_size = TARGET_PAGE_SIZE; -#endif #ifdef ZMAGIC_DISK_BLOCK_SIZE adata(abfd).zmagic_disk_block_size = ZMAGIC_DISK_BLOCK_SIZE; @@ -251,7 +287,7 @@ MY(set_sizes) (abfd) #endif adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE; - return true; + return TRUE; } #define MY_set_sizes MY(set_sizes) #endif @@ -268,6 +304,9 @@ MY(set_sizes) (abfd) #ifndef MY_text_includes_header #define MY_text_includes_header 0 #endif +#ifndef MY_entry_is_text_address +#define MY_entry_is_text_address 0 +#endif #ifndef MY_exec_header_not_counted #define MY_exec_header_not_counted 0 #endif @@ -290,9 +329,10 @@ MY(set_sizes) (abfd) #define MY_finish_dynamic_link 0 #endif -static CONST struct aout_backend_data MY(backend_data) = { +static const struct aout_backend_data MY(backend_data) = { MY_zmagic_contiguous, MY_text_includes_header, + MY_entry_is_text_address, MY_exec_hdr_flags, 0, /* text vma? */ MY_set_sizes, @@ -335,7 +375,9 @@ MY_final_link_callback (abfd, ptreloff, pdreloff, psymoff) /* Final link routine. We need to use a call back to get the correct offsets in the output file. */ -static boolean +static bfd_boolean MY_bfd_final_link PARAMS ((bfd *, struct bfd_link_info *)); + +static bfd_boolean MY_bfd_final_link (abfd, info) bfd *abfd; struct bfd_link_info *info; @@ -349,6 +391,9 @@ MY_bfd_final_link (abfd, info) #ifndef MY_openr_next_archived_file #define MY_openr_next_archived_file bfd_generic_openr_next_archived_file #endif +#ifndef MY_get_elt_at_index +#define MY_get_elt_at_index _bfd_generic_get_elt_at_index +#endif #ifndef MY_generic_stat_arch_elt #define MY_generic_stat_arch_elt bfd_generic_stat_arch_elt #endif @@ -398,7 +443,7 @@ MY_bfd_final_link (abfd, info) #endif #ifndef MY_bfd_debug_info_accumulate #define MY_bfd_debug_info_accumulate \ - (void (*) PARAMS ((bfd*, struct sec *))) bfd_void + (void (*) PARAMS ((bfd*, struct bfd_section *))) bfd_void #endif #ifndef MY_core_file_failing_command @@ -416,14 +461,17 @@ MY_bfd_final_link (abfd, info) #ifndef MY_get_section_contents #define MY_get_section_contents NAME(aout,get_section_contents) #endif +#ifndef MY_get_section_contents_in_window +#define MY_get_section_contents_in_window _bfd_generic_get_section_contents_in_window +#endif #ifndef MY_new_section_hook #define MY_new_section_hook NAME(aout,new_section_hook) #endif #ifndef MY_get_symtab_upper_bound #define MY_get_symtab_upper_bound NAME(aout,get_symtab_upper_bound) #endif -#ifndef MY_get_symtab -#define MY_get_symtab NAME(aout,get_symtab) +#ifndef MY_canonicalize_symtab +#define MY_canonicalize_symtab NAME(aout,canonicalize_symtab) #endif #ifndef MY_get_reloc_upper_bound #define MY_get_reloc_upper_bound NAME(aout,get_reloc_upper_bound) @@ -459,6 +507,18 @@ MY_bfd_final_link (abfd, info) #ifndef MY_bfd_relax_section #define MY_bfd_relax_section bfd_generic_relax_section #endif +#ifndef MY_bfd_gc_sections +#define MY_bfd_gc_sections bfd_generic_gc_sections +#endif +#ifndef MY_bfd_merge_sections +#define MY_bfd_merge_sections bfd_generic_merge_sections +#endif +#ifndef MY_bfd_is_group_section +#define MY_bfd_is_group_section bfd_generic_is_group_section +#endif +#ifndef MY_bfd_discard_group +#define MY_bfd_discard_group bfd_generic_discard_group +#endif #ifndef MY_bfd_reloc_type_lookup #define MY_bfd_reloc_type_lookup NAME(aout,reloc_type_lookup) #endif @@ -474,14 +534,19 @@ MY_bfd_final_link (abfd, info) #ifndef MY_bfd_link_hash_table_create #define MY_bfd_link_hash_table_create NAME(aout,link_hash_table_create) #endif +#ifndef MY_bfd_link_hash_table_free +#define MY_bfd_link_hash_table_free _bfd_generic_link_hash_table_free +#endif #ifndef MY_bfd_link_add_symbols #define MY_bfd_link_add_symbols NAME(aout,link_add_symbols) #endif +#ifndef MY_bfd_link_just_syms +#define MY_bfd_link_just_syms _bfd_generic_link_just_syms +#endif #ifndef MY_bfd_link_split_section #define MY_bfd_link_split_section _bfd_generic_link_split_section #endif - #ifndef MY_bfd_copy_private_bfd_data #define MY_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data #endif @@ -494,6 +559,10 @@ MY_bfd_final_link (abfd, info) #define MY_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data #endif +#ifndef MY_bfd_copy_private_header_data +#define MY_bfd_copy_private_header_data _bfd_generic_bfd_copy_private_header_data +#endif + #ifndef MY_bfd_print_private_bfd_data #define MY_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data #endif @@ -502,8 +571,8 @@ MY_bfd_final_link (abfd, info) #define MY_bfd_set_private_flags _bfd_generic_bfd_set_private_flags #endif -#ifndef MY_bfd_is_local_label -#define MY_bfd_is_local_label bfd_generic_is_local_label +#ifndef MY_bfd_is_local_label_name +#define MY_bfd_is_local_label_name bfd_generic_is_local_label_name #endif #ifndef MY_bfd_free_cached_info @@ -522,6 +591,10 @@ MY_bfd_final_link (abfd, info) #define MY_canonicalize_dynamic_symtab \ _bfd_nodynamic_canonicalize_dynamic_symtab #endif +#ifndef MY_get_synthetic_symtab +#define MY_get_synthetic_symtab \ + _bfd_nodynamic_get_synthetic_symtab +#endif #ifndef MY_get_dynamic_reloc_upper_bound #define MY_get_dynamic_reloc_upper_bound \ _bfd_nodynamic_get_dynamic_reloc_upper_bound @@ -532,7 +605,7 @@ MY_bfd_final_link (abfd, info) #endif /* Aout symbols normally have leading underscores */ -#ifndef MY_symbol_leading_char +#ifndef MY_symbol_leading_char #define MY_symbol_leading_char '_' #endif @@ -547,16 +620,16 @@ const bfd_target MY(vec) = TARGETNAME, /* name */ bfd_target_aout_flavour, #ifdef TARGET_IS_BIG_ENDIAN_P - true, /* target byte order (big) */ - true, /* target headers byte order (big) */ + BFD_ENDIAN_BIG, /* target byte order (big) */ + BFD_ENDIAN_BIG, /* target headers byte order (big) */ #else - false, /* target byte order (little) */ - false, /* target headers byte order (little) */ + BFD_ENDIAN_LITTLE, /* target byte order (little) */ + BFD_ENDIAN_LITTLE, /* target headers byte order (little) */ #endif (HAS_RELOC | EXEC_P | /* object flags */ HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED), - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ + (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA), MY_symbol_leading_char, AR_PAD_CHAR, /* ar_pad_char */ 15, /* ar_max_namelen */ @@ -592,6 +665,9 @@ const bfd_target MY(vec) = BFD_JUMP_TABLE_LINK (MY), BFD_JUMP_TABLE_DYNAMIC (MY), - (PTR) MY_backend_data, + /* Alternative_target */ + NULL, + + (PTR) MY_backend_data }; #endif /* MY_BFD_TARGET */