X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Felf32-m68hc11.c;h=116aa92e1cc152941f381560788076dd2a7f821d;hb=07adf1816db141e2cc9c0cd5d9a6aa1a712bc979;hp=038390745491e1209b5d66ebeab7ad4d75671f6b;hpb=1049f94e8e1a9eae86a694d2dca94a6194f763b1;p=binutils-gdb.git diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c index 03839074549..116aa92e1cc 100644 --- a/bfd/elf32-m68hc11.c +++ b/bfd/elf32-m68hc11.c @@ -1,5 +1,6 @@ /* Motorola 68HC11-specific support for 32-bit ELF - Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Contributed by Stephane Carrez (stcarrez@nerim.fr) (Heavily copied from the D10V port by Martin Hunt (hunt@cygnus.com)) @@ -17,7 +18,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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #include "bfd.h" #include "sysdep.h" @@ -30,27 +31,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Relocation functions. */ static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup - PARAMS ((bfd *, bfd_reloc_code_real_type)); + (bfd *, bfd_reloc_code_real_type); static void m68hc11_info_to_howto_rel - PARAMS ((bfd *, arelent *, Elf_Internal_Rela *)); + (bfd *, arelent *, Elf_Internal_Rela *); /* Trampoline generation. */ static bfd_boolean m68hc11_elf_size_one_stub - PARAMS((struct bfd_hash_entry *gen_entry, PTR in_arg)); + (struct bfd_hash_entry *gen_entry, void *in_arg); static bfd_boolean m68hc11_elf_build_one_stub - PARAMS((struct bfd_hash_entry *gen_entry, PTR in_arg)); + (struct bfd_hash_entry *gen_entry, void *in_arg); static struct bfd_link_hash_table* m68hc11_elf_bfd_link_hash_table_create - PARAMS ((bfd* abfd)); + (bfd* abfd); /* Linker relaxation. */ static bfd_boolean m68hc11_elf_relax_section - PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *)); + (bfd *, asection *, struct bfd_link_info *, bfd_boolean *); static void m68hc11_elf_relax_delete_bytes - PARAMS ((bfd *, asection *, bfd_vma, int)); + (bfd *, asection *, bfd_vma, int); static void m68hc11_relax_group - PARAMS ((bfd *, asection *, bfd_byte *, unsigned, - unsigned long, unsigned long)); -static int compare_reloc PARAMS ((const void *, const void *)); + (bfd *, asection *, bfd_byte *, unsigned, unsigned long, unsigned long); +static int compare_reloc (const void *, const void *); /* Use REL instead of RELA to save space */ #define USE_REL 1 @@ -342,9 +342,8 @@ static const struct m68hc11_reloc_map m68hc11_reloc_map[] = { }; static reloc_howto_type * -bfd_elf32_bfd_reloc_type_lookup (abfd, code) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_reloc_code_real_type code; +bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + bfd_reloc_code_real_type code) { unsigned int i; @@ -362,10 +361,8 @@ bfd_elf32_bfd_reloc_type_lookup (abfd, code) /* Set the howto pointer for an M68HC11 ELF reloc. */ static void -m68hc11_info_to_howto_rel (abfd, cache_ptr, dst) - bfd *abfd ATTRIBUTE_UNUSED; - arelent *cache_ptr; - Elf_Internal_Rela *dst; +m68hc11_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, + arelent *cache_ptr, Elf_Internal_Rela *dst) { unsigned int r_type; @@ -379,9 +376,7 @@ m68hc11_info_to_howto_rel (abfd, cache_ptr, dst) /* Build a 68HC11 trampoline stub. */ static bfd_boolean -m68hc11_elf_build_one_stub (gen_entry, in_arg) - struct bfd_hash_entry *gen_entry; - PTR in_arg; +m68hc11_elf_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) { struct elf32_m68hc11_stub_hash_entry *stub_entry; struct bfd_link_info *info; @@ -400,8 +395,8 @@ m68hc11_elf_build_one_stub (gen_entry, in_arg) stub_sec = stub_entry->stub_sec; /* Make a note of the offset within the stubs for this entry. */ - stub_entry->stub_offset = stub_sec->_raw_size; - stub_sec->_raw_size += 10; + stub_entry->stub_offset = stub_sec->size; + stub_sec->size += 10; loc = stub_sec->contents + stub_entry->stub_offset; stub_bfd = stub_sec->owner; @@ -443,24 +438,22 @@ m68hc11_elf_build_one_stub (gen_entry, in_arg) we know stub section sizes. */ static bfd_boolean -m68hc11_elf_size_one_stub (gen_entry, in_arg) - struct bfd_hash_entry *gen_entry; - PTR in_arg ATTRIBUTE_UNUSED; +m68hc11_elf_size_one_stub (struct bfd_hash_entry *gen_entry, + void *in_arg ATTRIBUTE_UNUSED) { struct elf32_m68hc11_stub_hash_entry *stub_entry; /* Massage our args to the form they really have. */ stub_entry = (struct elf32_m68hc11_stub_hash_entry *) gen_entry; - stub_entry->stub_sec->_raw_size += 10; + stub_entry->stub_sec->size += 10; return TRUE; } /* Create a 68HC11 ELF linker hash table. */ static struct bfd_link_hash_table * -m68hc11_elf_bfd_link_hash_table_create (abfd) - bfd *abfd; +m68hc11_elf_bfd_link_hash_table_create (bfd *abfd) { struct m68hc11_elf_link_hash_table *ret; @@ -533,9 +526,7 @@ find_relaxable_insn (unsigned char code) } static int -compare_reloc (e1, e2) - const void *e1; - const void *e2; +compare_reloc (const void *e1, const void *e2) { const Elf_Internal_Rela *i1 = (const Elf_Internal_Rela *) e1; const Elf_Internal_Rela *i2 = (const Elf_Internal_Rela *) e2; @@ -549,13 +540,9 @@ compare_reloc (e1, e2) #define M6811_OP_LDX_IMMEDIATE (0xCE) static void -m68hc11_relax_group (abfd, sec, contents, value, offset, end_group) - bfd *abfd; - asection *sec; - bfd_byte *contents; - unsigned value; - unsigned long offset; - unsigned long end_group; +m68hc11_relax_group (bfd *abfd, asection *sec, bfd_byte *contents, + unsigned value, unsigned long offset, + unsigned long end_group) { unsigned char code; unsigned long start_offset; @@ -665,11 +652,8 @@ m68hc11_relax_group (abfd, sec, contents, value, offset, end_group) and somewhat more difficult to support. */ static bfd_boolean -m68hc11_elf_relax_section (abfd, sec, link_info, again) - bfd *abfd; - asection *sec; - struct bfd_link_info *link_info; - bfd_boolean *again; +m68hc11_elf_relax_section (bfd *abfd, asection *sec, + struct bfd_link_info *link_info, bfd_boolean *again) { Elf_Internal_Shdr *symtab_hdr; Elf_Internal_Shdr *shndx_hdr; @@ -696,11 +680,6 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again) || (sec->flags & SEC_CODE) == 0) return TRUE; - /* If this is the first time we have been called for this section, - initialize the cooked size. */ - if (sec->_cooked_size == 0) - sec->_cooked_size = sec->_raw_size; - symtab_hdr = &elf_tdata (abfd)->symtab_hdr; shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr; @@ -748,13 +727,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again) else { /* Go get them off disk. */ - contents = (bfd_byte *) bfd_malloc (sec->_raw_size); - if (contents == NULL) - goto error_return; - free_contents = contents; - - if (! bfd_get_section_contents (abfd, sec, contents, - (file_ptr) 0, sec->_raw_size)) + if (!bfd_malloc_and_get_section (abfd, sec, &contents)) goto error_return; } } @@ -780,7 +753,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again) prev_insn_group = 0; /* Do nothing if this reloc is the last byte in the section. */ - if (irel->r_offset + 2 >= sec->_cooked_size) + if (irel->r_offset + 2 >= sec->size) continue; /* See if the next instruction is an unconditional pc-relative @@ -866,7 +839,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again) prev_insn_group = 0; /* Do nothing if this reloc is the last byte in the section. */ - if (irel->r_offset == sec->_cooked_size) + if (irel->r_offset == sec->size) continue; prev_insn_group = irel; @@ -969,9 +942,9 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again) if (prev_insn_group) { - unsigned long old_sec_size = sec->_cooked_size; + unsigned long old_sec_size = sec->size; - /* Note that we've changed the reldection contents, etc. */ + /* Note that we've changed the relocation contents, etc. */ elf_section_data (sec)->relocs = internal_relocs; free_relocs = NULL; @@ -988,7 +961,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again) prev_insn_group = 0; irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info), R_M68HC11_NONE); - if (sec->_cooked_size != old_sec_size) + if (sec->size != old_sec_size) *again = TRUE; continue; } @@ -1002,7 +975,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again) continue; } - /* Note that we've changed the reldection contents, etc. */ + /* Note that we've changed the relocation contents, etc. */ elf_section_data (sec)->relocs = internal_relocs; free_relocs = NULL; @@ -1047,7 +1020,7 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again) if ((offset & 0xff80) == 0 || (offset & 0xff80) == 0xff80) { - /* Note that we've changed the reldection contents, etc. */ + /* Note that we've changed the relocation contents, etc. */ elf_section_data (sec)->relocs = internal_relocs; free_relocs = NULL; @@ -1121,11 +1094,8 @@ m68hc11_elf_relax_section (abfd, sec, link_info, again) /* Delete some bytes from a section while relaxing. */ static void -m68hc11_elf_relax_delete_bytes (abfd, sec, addr, count) - bfd *abfd; - asection *sec; - bfd_vma addr; - int count; +m68hc11_elf_relax_delete_bytes (bfd *abfd, asection *sec, + bfd_vma addr, int count) { Elf_Internal_Shdr *symtab_hdr; unsigned int sec_shndx; @@ -1144,7 +1114,7 @@ m68hc11_elf_relax_delete_bytes (abfd, sec, addr, count) contents = elf_section_data (sec)->this_hdr.contents; - toaddr = sec->_cooked_size; + toaddr = sec->size; irel = elf_section_data (sec)->relocs; irelend = irel + sec->reloc_count; @@ -1153,7 +1123,7 @@ m68hc11_elf_relax_delete_bytes (abfd, sec, addr, count) memmove (contents + addr, contents + addr + count, (size_t) (toaddr - addr - count)); - sec->_cooked_size -= count; + sec->size -= count; /* Adjust all the relocs. */ for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++) @@ -1281,6 +1251,20 @@ m68hc11_elf_relax_delete_bytes (abfd, sec, addr, count) } } +/* Specific sections: + - The .page0 is a data section that is mapped in [0x0000..0x00FF]. + Page0 accesses are faster on the M68HC11. Soft registers used by GCC-m6811 + are located in .page0. + - The .vectors is the section that represents the interrupt + vectors. */ +static const struct bfd_elf_special_section elf32_m68hc11_special_sections[] = +{ + { STRING_COMMA_LEN (".eeprom"), 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, + { STRING_COMMA_LEN (".page0"), 0, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, + { STRING_COMMA_LEN (".softregs"), 0, SHT_NOBITS, SHF_ALLOC + SHF_WRITE }, + { STRING_COMMA_LEN (".vectors"), 0, SHT_PROGBITS, SHF_ALLOC }, + { NULL, 0, 0, 0, 0 } +}; #define ELF_ARCH bfd_arch_m68hc11 #define ELF_MACHINE_CODE EM_68HC11 @@ -1292,14 +1276,13 @@ m68hc11_elf_relax_delete_bytes (abfd, sec, addr, count) #define elf_info_to_howto 0 #define elf_info_to_howto_rel m68hc11_info_to_howto_rel #define bfd_elf32_bfd_relax_section m68hc11_elf_relax_section -#define elf_backend_gc_mark_hook elf32_m68hc11_gc_mark_hook -#define elf_backend_gc_sweep_hook elf32_m68hc11_gc_sweep_hook #define elf_backend_check_relocs elf32_m68hc11_check_relocs #define elf_backend_relocate_section elf32_m68hc11_relocate_section #define elf_backend_add_symbol_hook elf32_m68hc11_add_symbol_hook #define elf_backend_object_p 0 #define elf_backend_final_write_processing 0 #define elf_backend_can_gc_sections 1 +#define elf_backend_special_sections elf32_m68hc11_special_sections #define bfd_elf32_bfd_link_hash_table_create \ m68hc11_elf_bfd_link_hash_table_create