diff options
| -rw-r--r-- | bfd/ChangeLog | 31 | ||||
| -rw-r--r-- | bfd/elf-hppa.h | 772 | ||||
| -rw-r--r-- | bfd/elf32-hppa.c | 532 | ||||
| -rw-r--r-- | gas/ChangeLog | 16 | ||||
| -rw-r--r-- | gas/config/tc-hppa.c | 5033 | ||||
| -rw-r--r-- | gas/config/tc-hppa.h | 32 | ||||
| -rw-r--r-- | include/elf/ChangeLog | 11 | ||||
| -rw-r--r-- | include/elf/hppa.h | 50 |
8 files changed, 3505 insertions, 2972 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b1e5b3b..aac4165 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,34 @@ +2006-05-24 Carlos O'Donell <carlos@systemhalted.org> + Randolph Chung <tausq@debian.org> + + * elf-hppa.h (reloc_hppa_howto_table): Check bitfield for + TPREL21L/TPREL14R relocations. Handle LTOFF_TP14R relocations. + Add handling for TLS relocations. + (elf_hpp_reloc_final_type): Handle TLS relocs. + * elf32-hppa.c: Add authors for cleanup and TLS support. + (hppa_elf_local_got_tls_type, hh_name, eh_name): Define. + (elf32_hppa_link_hash_entry): Add tls_type. + (elf32_hppa_link_hash_table): Add tld_ldm_got. + (hppa_link_has_newfunc): Set tls_type. + (elf32_hppa_link_hash_table_create): Set tls_ldm_got refcount. + (hppa_stub_name): Use hh_name macro. + (elf32_hppa_copy_indirect_symbol): Copy TLS information. + (elf32_hppa_check_relocs): Call elf32_hppa_optimized_tls_reloc. + Handle TLS relocs. + (elf32_hppa_gc_sweep_hook): Likewise. + (allocate_dynrelocs): Handle TLS relocs. + (elf32_hppa_size_dynamic_sections): Count space required by TLS + relocs. Use hh_name macro. + (dtpoff_base): New function. + (tpoff): Likewise. + (elf32_hppa_optimized_tls_reloc): Likewise. + (final_link_relocate): Handle TLS relocs. + (elf32_hppa_relocate_section): Handle TLS relocs. Use eh_name + and hh_name macros. + (elf32_hppa_finish_dynamic_symbol): Setup TLS got entries. Use + hh_name and eh_name macros. + (elf32_hppa_reloc_type_clas): Handle TLS relocs. + 2006-05-24 Bjoern Haase <bjoern.m.haase@web.de> * archures.c: Add bfd_mach_avr6. diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h index c4ad5ad..35363b5 100644 --- a/bfd/elf-hppa.h +++ b/bfd/elf-hppa.h @@ -1,22 +1,22 @@ /* Common code for PA ELF implementations. - Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This file is part of BFD, the Binary File Descriptor library. + 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 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. + 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #define ELF_HOWTO_TABLE_SIZE R_PARISC_UNIMPLEMENTED + 1 @@ -27,30 +27,20 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. external constraints require 32 or 64 bit specific code. We remap the definitions/functions as necessary here. */ #if ARCH_SIZE == 64 -#define ELF_R_TYPE(X) ELF64_R_TYPE(X) -#define ELF_R_SYM(X) ELF64_R_SYM(X) -#define elf_hppa_reloc_final_type elf64_hppa_reloc_final_type -#define _bfd_elf_hppa_gen_reloc_type _bfd_elf64_hppa_gen_reloc_type -#define elf_hppa_relocate_section elf64_hppa_relocate_section -#define elf_hppa_final_link elf64_hppa_final_link +#define ELF_R_TYPE(X) ELF64_R_TYPE(X) +#define ELF_R_SYM(X) ELF64_R_SYM(X) +#define elf_hppa_reloc_final_type elf64_hppa_reloc_final_type +#define _bfd_elf_hppa_gen_reloc_type _bfd_elf64_hppa_gen_reloc_type +#define elf_hppa_relocate_section elf64_hppa_relocate_section +#define elf_hppa_final_link elf64_hppa_final_link #endif #if ARCH_SIZE == 32 -#define ELF_R_TYPE(X) ELF32_R_TYPE(X) -#define ELF_R_SYM(X) ELF32_R_SYM(X) -#define elf_hppa_reloc_final_type elf32_hppa_reloc_final_type -#define _bfd_elf_hppa_gen_reloc_type _bfd_elf32_hppa_gen_reloc_type -#define elf_hppa_relocate_section elf32_hppa_relocate_section -#define elf_hppa_final_link elf32_hppa_final_link -#endif - -#if ARCH_SIZE == 64 -static bfd_reloc_status_type elf_hppa_final_link_relocate - (Elf_Internal_Rela *, bfd *, bfd *, asection *, bfd_byte *, bfd_vma, - struct bfd_link_info *, asection *, struct elf_link_hash_entry *, - struct elf64_hppa_dyn_hash_entry *); - -static int elf_hppa_relocate_insn - (int, int, unsigned int); +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) +#define elf_hppa_reloc_final_type elf32_hppa_reloc_final_type +#define _bfd_elf_hppa_gen_reloc_type _bfd_elf32_hppa_gen_reloc_type +#define elf_hppa_relocate_section elf32_hppa_relocate_section +#define elf_hppa_final_link elf32_hppa_final_link #endif /* ELF/PA relocation howto entries. */ @@ -387,7 +377,7 @@ static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] = bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE }, { R_PARISC_TPREL32, 0, 0, 32, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_PARISC_TPREL32", FALSE, 0, 0, FALSE }, - { R_PARISC_TPREL21L, 0, 0, 21, FALSE, 0, complain_overflow_dont, + { R_PARISC_TPREL21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_PARISC_TPREL21L", FALSE, 0, 0, FALSE }, { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE }, @@ -395,7 +385,7 @@ static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] = bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE }, { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE }, - { R_PARISC_TPREL14R, 0, 0, 14, FALSE, 0, complain_overflow_dont, + { R_PARISC_TPREL14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_PARISC_TPREL14R", FALSE, 0, 0, FALSE }, { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE }, @@ -413,7 +403,7 @@ static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] = { R_PARISC_UNIMPLEMENTED, 0, 0, 0, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE }, { R_PARISC_LTOFF_TP14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield, - bfd_elf_generic_reloc, "R_PARISC_UNIMPLEMENTED", FALSE, 0, 0, FALSE }, + bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14R", FALSE, 0, 0, FALSE }, { R_PARISC_LTOFF_TP14F, 0, 0, 14, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_PARISC_LTOFF_TP14F", FALSE, 0, 0, FALSE }, /* 168 */ @@ -557,6 +547,31 @@ static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] = bfd_elf_generic_reloc, "R_PARISC_GNU_VTENTRY", FALSE, 0, 0, FALSE }, { R_PARISC_GNU_VTINHERIT, 0, 0, 0, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_PARISC_GNU_VTINHERIT", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_GD21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_GD21L", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_GD14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_GD14R", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_GDCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont, + bfd_elf_generic_reloc, "R_PARISC_TLS_GDCALL", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_LDM21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_LDM21L", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_LDM14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_LDM14R", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_LDMCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont, + bfd_elf_generic_reloc, "R_PARISC_TLS_LDMCALL", FALSE, 0, 0, FALSE }, + /* 240 */ + { R_PARISC_TLS_LDO21L, 0, 0, 21, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_LDO21L", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_LDO14R, 0, 0, 14, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_LDO14R", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_DTPMOD32, 0, 0, 32, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_DTPMOD32", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_DTPMOD64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_DTPMOD64", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_DTPOFF32, 0, 0, 32, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_DTPOFF32", FALSE, 0, 0, FALSE }, + { R_PARISC_TLS_DTPOFF64, 0, 0, 64, FALSE, 0, complain_overflow_bitfield, + bfd_elf_generic_reloc, "R_PARISC_TLS_DTPOFF64", FALSE, 0, 0, FALSE }, }; #define OFFSET_14R_FROM_21L 4 @@ -578,9 +593,9 @@ elf_hppa_reloc_final_type (bfd *abfd, for PA ELF. */ switch (base_type) { - /* We have been using generic relocation types. However, that may not - really make sense. Anyway, we need to support both R_PARISC_DIR64 - and R_PARISC_DIR32 here. */ + /* We have been using generic relocation types. However, that may not + really make sense. Anyway, we need to support both R_PARISC_DIR64 + and R_PARISC_DIR32 here. */ case R_PARISC_DIR32: case R_PARISC_DIR64: case R_HPPA_ABS_CALL: @@ -701,11 +716,11 @@ elf_hppa_reloc_final_type (bfd *abfd, case e_rsel: case e_rrsel: case e_rdsel: - /* R_PARISC_DLTREL14R for elf64, R_PARISC_DPREL14R for elf32 */ + /* R_PARISC_DLTREL14R for elf64, R_PARISC_DPREL14R for elf32. */ final_type = base_type + OFFSET_14R_FROM_21L; break; case e_fsel: - /* R_PARISC_DLTREL14F for elf64, R_PARISC_DPREL14F for elf32 */ + /* R_PARISC_DLTREL14F for elf64, R_PARISC_DPREL14F for elf32. */ final_type = base_type + OFFSET_14F_FROM_21L; break; default: @@ -721,7 +736,7 @@ elf_hppa_reloc_final_type (bfd *abfd, case e_ldsel: case e_nlsel: case e_nlrsel: - /* R_PARISC_DLTREL21L for elf64, R_PARISC_DPREL21L for elf32 */ + /* R_PARISC_DLTREL21L for elf64, R_PARISC_DPREL21L for elf32. */ final_type = base_type; break; default: @@ -838,6 +853,82 @@ elf_hppa_reloc_final_type (bfd *abfd, } break; + case R_PARISC_TLS_GD21L: + switch (field) + { + case e_ltsel: + case e_lrsel: + final_type = R_PARISC_TLS_GD21L; + break; + case e_rtsel: + case e_rrsel: + final_type = R_PARISC_TLS_GD14R; + break; + default: + return R_PARISC_NONE; + } + break; + + case R_PARISC_TLS_LDM21L: + switch (field) + { + case e_ltsel: + case e_lrsel: + final_type = R_PARISC_TLS_LDM21L; + break; + case e_rtsel: + case e_rrsel: + final_type = R_PARISC_TLS_LDM14R; + break; + default: + return R_PARISC_NONE; + } + break; + + case R_PARISC_TLS_LDO21L: + switch (field) + { + case e_lrsel: + final_type = R_PARISC_TLS_LDO21L; + break; + case e_rrsel: + final_type = R_PARISC_TLS_LDO14R; + break; + default: + return R_PARISC_NONE; + } + break; + + case R_PARISC_TLS_IE21L: + switch (field) + { + case e_ltsel: + case e_lrsel: + final_type = R_PARISC_TLS_IE21L; + break; + case e_rtsel: + case e_rrsel: + final_type = R_PARISC_TLS_IE14R; + break; + default: + return R_PARISC_NONE; + } + break; + + case R_PARISC_TLS_LE21L: + switch (field) + { + case e_lrsel: + final_type = R_PARISC_TLS_LE21L; + break; + case e_rrsel: + final_type = R_PARISC_TLS_LE14R; + break; + default: + return R_PARISC_NONE; + } + break; + case R_PARISC_GNU_VTENTRY: case R_PARISC_GNU_VTINHERIT: case R_PARISC_SEGREL32: @@ -906,7 +997,7 @@ elf_hppa_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc, Elf_Internal_Rela *elf_reloc) { - BFD_ASSERT (ELF_R_TYPE(elf_reloc->r_info) + BFD_ASSERT (ELF_R_TYPE (elf_reloc->r_info) < (unsigned int) R_PARISC_UNIMPLEMENTED); bfd_reloc->howto = &elf_hppa_howto_table[ELF_R_TYPE (elf_reloc->r_info)]; } @@ -932,7 +1023,7 @@ static bfd_boolean elf_hppa_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name) { if (name[0] == 'L' && name[1] == '$') - return 1; + return TRUE; return _bfd_elf_is_local_label_name (abfd, name); } @@ -950,6 +1041,7 @@ elf_hppa_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec) { int indx; asection *asec; + #if ARCH_SIZE == 64 hdr->sh_type = SHT_LOPROC + 1; #else @@ -1030,7 +1122,8 @@ hppa_unwind_entry_compare (const void *a, const void *b) return av < bv ? -1 : av > bv ? 1 : 0; } -static bfd_boolean elf_hppa_sort_unwind (bfd *abfd) +static bfd_boolean +elf_hppa_sort_unwind (bfd *abfd) { asection *s; @@ -1315,208 +1408,116 @@ elf_hppa_final_link (bfd *abfd, struct bfd_link_info *info) return retval; } -/* Relocate an HPPA ELF section. */ +/* Relocate the given INSN. VALUE should be the actual value we want + to insert into the instruction, ie by this point we should not be + concerned with computing an offset relative to the DLT, PC, etc. + Instead this routine is meant to handle the bit manipulations needed + to insert the relocation into the given instruction. */ -static bfd_boolean -elf_hppa_relocate_section (bfd *output_bfd, - struct bfd_link_info *info, - bfd *input_bfd, - asection *input_section, - bfd_byte *contents, - Elf_Internal_Rela *relocs, - Elf_Internal_Sym *local_syms, - asection **local_sections) +static int +elf_hppa_relocate_insn (int insn, int sym_value, unsigned int r_type) { - Elf_Internal_Shdr *symtab_hdr; - Elf_Internal_Rela *rel; - Elf_Internal_Rela *relend; - struct elf64_hppa_link_hash_table *hppa_info; - - if (info->relocatable) - return TRUE; - - hppa_info = elf64_hppa_hash_table (info); - symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; - - rel = relocs; - relend = relocs + input_section->reloc_count; - for (; rel < relend; rel++) + switch (r_type) { - int r_type; - reloc_howto_type *howto = elf_hppa_howto_table + ELF_R_TYPE (rel->r_info); - unsigned long r_symndx; - struct elf_link_hash_entry *h; - Elf_Internal_Sym *sym; - asection *sym_sec; - bfd_vma relocation; - bfd_reloc_status_type r; - const char *dyn_name; - char *dynh_buf = NULL; - size_t dynh_buflen = 0; - struct elf64_hppa_dyn_hash_entry *dyn_h = NULL; - - r_type = ELF_R_TYPE (rel->r_info); - if (r_type < 0 || r_type >= (int) R_PARISC_UNIMPLEMENTED) - { - bfd_set_error (bfd_error_bad_value); - return FALSE; - } - - /* This is a final link. */ - r_symndx = ELF_R_SYM (rel->r_info); - h = NULL; - sym = NULL; - sym_sec = NULL; - if (r_symndx < symtab_hdr->sh_info) - { - /* This is a local symbol. */ - sym = local_syms + r_symndx; - sym_sec = local_sections[r_symndx]; - relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sym_sec, rel); - - /* If this symbol has an entry in the PA64 dynamic hash - table, then get it. */ - dyn_name = get_dyn_name (input_bfd, h, rel, - &dynh_buf, &dynh_buflen); - dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table, - dyn_name, FALSE, FALSE); - - } - else - { - /* This is not a local symbol. */ - long indx; + /* This is any 22 bit branch. In PA2.0 syntax it corresponds to + the "B" instruction. */ + case R_PARISC_PCREL22F: + case R_PARISC_PCREL22C: + return (insn & ~0x3ff1ffd) | re_assemble_22 (sym_value); - indx = r_symndx - symtab_hdr->sh_info; - h = elf_sym_hashes (input_bfd)[indx]; - while (h->root.type == bfd_link_hash_indirect - || h->root.type == bfd_link_hash_warning) - h = (struct elf_link_hash_entry *) h->root.u.i.link; - if (h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak) - { - sym_sec = h->root.u.def.section; + /* This is any 12 bit branch. */ + case R_PARISC_PCREL12F: + return (insn & ~0x1ffd) | re_assemble_12 (sym_value); - /* If this symbol has an entry in the PA64 dynamic hash - table, then get it. */ - dyn_name = get_dyn_name (input_bfd, h, rel, - &dynh_buf, &dynh_buflen); - dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table, - dyn_name, FALSE, FALSE); + /* This is any 17 bit branch. In PA2.0 syntax it also corresponds + to the "B" instruction as well as BE. */ + case R_PARISC_PCREL17F: + case R_PARISC_DIR17F: + case R_PARISC_DIR17R: + case R_PARISC_PCREL17C: + case R_PARISC_PCREL17R: + return (insn & ~0x1f1ffd) | re_assemble_17 (sym_value); - /* If we have a relocation against a symbol defined in a - shared library and we have not created an entry in the - PA64 dynamic symbol hash table for it, then we lose. */ - if (sym_sec->output_section == NULL && dyn_h == NULL) - { - (*_bfd_error_handler) - (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), - input_bfd, - input_section, - (long) rel->r_offset, - howto->name, - h->root.root.string); - relocation = 0; - } - else if (sym_sec->output_section) - relocation = (h->root.u.def.value - + sym_sec->output_offset - + sym_sec->output_section->vma); - /* Value will be provided via one of the offsets in the - dyn_h hash table entry. */ - else - relocation = 0; - } - else if (info->unresolved_syms_in_objects == RM_IGNORE - && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) - { - /* If this symbol has an entry in the PA64 dynamic hash - table, then get it. */ - dyn_name = get_dyn_name (input_bfd, h, rel, - &dynh_buf, &dynh_buflen); - dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table, - dyn_name, FALSE, FALSE); + /* ADDIL or LDIL instructions. */ + case R_PARISC_DLTREL21L: + case R_PARISC_DLTIND21L: + case R_PARISC_LTOFF_FPTR21L: + case R_PARISC_PCREL21L: + case R_PARISC_LTOFF_TP21L: + case R_PARISC_DPREL21L: + case R_PARISC_PLTOFF21L: + case R_PARISC_DIR21L: + return (insn & ~0x1fffff) | re_assemble_21 (sym_value); - if (dyn_h == NULL) - { - (*_bfd_error_handler) - (_("%B(%A): warning: unresolvable relocation against symbol `%s'"), - input_bfd, input_section, h->root.root.string); - } - relocation = 0; - } - else if (h->root.type == bfd_link_hash_undefweak) - { - dyn_name = get_dyn_name (input_bfd, h, rel, - &dynh_buf, &dynh_buflen); - dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table, - dyn_name, FALSE, FALSE); + /* LDO and integer loads/stores with 14 bit displacements. */ + case R_PARISC_DLTREL14R: + case R_PARISC_DLTREL14F: + case R_PARISC_DLTIND14R: + case R_PARISC_DLTIND14F: + case R_PARISC_LTOFF_FPTR14R: + case R_PARISC_PCREL14R: + case R_PARISC_PCREL14F: + case R_PARISC_LTOFF_TP14R: + case R_PARISC_LTOFF_TP14F: + case R_PARISC_DPREL14R: + case R_PARISC_DPREL14F: + case R_PARISC_PLTOFF14R: + case R_PARISC_PLTOFF14F: + case R_PARISC_DIR14R: + case R_PARISC_DIR14F: + return (insn & ~0x3fff) | low_sign_unext (sym_value, 14); - if (dyn_h == NULL) - { - (*_bfd_error_handler) - (_("%B(%A): warning: unresolvable relocation against symbol `%s'"), - input_bfd, input_section, h->root.root.string); - } - relocation = 0; - } - else - { - /* Ignore dynamic loader defined symbols. */ - if (elf_hppa_is_dynamic_loader_symbol (h->root.root.string)) - relocation = 0; - else - { - if (!((*info->callbacks->undefined_symbol) - (info, h->root.root.string, input_bfd, - input_section, rel->r_offset, - (info->unresolved_syms_in_objects == RM_GENERATE_ERROR - || ELF_ST_VISIBILITY (h->other))))) - return FALSE; - break; - } - } - } + /* PA2.0W LDO and integer loads/stores with 16 bit displacements. */ + case R_PARISC_LTOFF_FPTR16F: + case R_PARISC_PCREL16F: + case R_PARISC_LTOFF_TP16F: + case R_PARISC_GPREL16F: + case R_PARISC_PLTOFF16F: + case R_PARISC_DIR16F: + case R_PARISC_LTOFF16F: + return (insn & ~0xffff) | re_assemble_16 (sym_value); - r = elf_hppa_final_link_relocate (rel, input_bfd, output_bfd, - input_section, contents, - relocation, info, sym_sec, - h, dyn_h); + /* Doubleword loads and stores with a 14 bit displacement. */ + case R_PARISC_DLTREL14DR: + case R_PARISC_DLTIND14DR: + case R_PARISC_LTOFF_FPTR14DR: + case R_PARISC_LTOFF_FPTR16DF: + case R_PARISC_PCREL14DR: + case R_PARISC_PCREL16DF: + case R_PARISC_LTOFF_TP14DR: + case R_PARISC_LTOFF_TP16DF: + case R_PARISC_DPREL14DR: + case R_PARISC_GPREL16DF: + case R_PARISC_PLTOFF14DR: + case R_PARISC_PLTOFF16DF: + case R_PARISC_DIR14DR: + case R_PARISC_DIR16DF: + case R_PARISC_LTOFF16DF: + return (insn & ~0x3ff1) | (((sym_value & 0x2000) >> 13) + | ((sym_value & 0x1ff8) << 1)); - if (r != bfd_reloc_ok) - { - switch (r) - { - default: - abort (); - case bfd_reloc_overflow: - { - const char *sym_name; - - if (h != NULL) - sym_name = NULL; - else - { - sym_name = bfd_elf_string_from_elf_section (input_bfd, - symtab_hdr->sh_link, - sym->st_name); - if (sym_name == NULL) - return FALSE; - if (*sym_name == '\0') - sym_name = bfd_section_name (input_bfd, sym_sec); - } + /* Floating point single word load/store instructions. */ + case R_PARISC_DLTREL14WR: + case R_PARISC_DLTIND14WR: + case R_PARISC_LTOFF_FPTR14WR: + case R_PARISC_LTOFF_FPTR16WF: + case R_PARISC_PCREL14WR: + case R_PARISC_PCREL16WF: + case R_PARISC_LTOFF_TP14WR: + case R_PARISC_LTOFF_TP16WF: + case R_PARISC_DPREL14WR: + case R_PARISC_GPREL16WF: + case R_PARISC_PLTOFF14WR: + case R_PARISC_PLTOFF16WF: + case R_PARISC_DIR16WF: + case R_PARISC_DIR14WR: + case R_PARISC_LTOFF16WF: + return (insn & ~0x3ff9) | (((sym_value & 0x2000) >> 13) + | ((sym_value & 0x1ffc) << 1)); - if (!((*info->callbacks->reloc_overflow) - (info, (h ? &h->root : NULL), sym_name, - howto->name, (bfd_vma) 0, input_bfd, - input_section, rel->r_offset))) - return FALSE; - } - break; - } - } + default: + return insn; } - return TRUE; } /* Compute the value for a relocation (REL) during a final link stage, @@ -1806,10 +1807,8 @@ elf_hppa_final_link_relocate (Elf_Internal_Rela *rel, value = hppa_field_adjust (value, addend, e_rrsel); if (r_type == R_PARISC_DIR17R || r_type == R_PARISC_DIR17F) - { - /* All branches are implicitly shifted by 2 places. */ - value >>= 2; - } + /* All branches are implicitly shifted by 2 places. */ + value >>= 2; insn = elf_hppa_relocate_insn (insn, (int) value, r_type); break; @@ -2081,115 +2080,208 @@ elf_hppa_final_link_relocate (Elf_Internal_Rela *rel, return bfd_reloc_ok; } -/* Relocate the given INSN. VALUE should be the actual value we want - to insert into the instruction, ie by this point we should not be - concerned with computing an offset relative to the DLT, PC, etc. - Instead this routine is meant to handle the bit manipulations needed - to insert the relocation into the given instruction. */ +/* Relocate an HPPA ELF section. */ -static int -elf_hppa_relocate_insn (int insn, int sym_value, unsigned int r_type) +static bfd_boolean +elf_hppa_relocate_section (bfd *output_bfd, + struct bfd_link_info *info, + bfd *input_bfd, + asection *input_section, + bfd_byte *contents, + Elf_Internal_Rela *relocs, + Elf_Internal_Sym *local_syms, + asection **local_sections) { - switch (r_type) + Elf_Internal_Shdr *symtab_hdr; + Elf_Internal_Rela *rel; + Elf_Internal_Rela *relend; + struct elf64_hppa_link_hash_table *hppa_info; + + if (info->relocatable) + return TRUE; + + hppa_info = elf64_hppa_hash_table (info); + symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; + + rel = relocs; + relend = relocs + input_section->reloc_count; + for (; rel < relend; rel++) { - /* This is any 22 bit branch. In PA2.0 syntax it corresponds to - the "B" instruction. */ - case R_PARISC_PCREL22F: - case R_PARISC_PCREL22C: - return (insn & ~0x3ff1ffd) | re_assemble_22 (sym_value); + int r_type; + reloc_howto_type *howto = elf_hppa_howto_table + ELF_R_TYPE (rel->r_info); + unsigned long r_symndx; + struct elf_link_hash_entry *h; + Elf_Internal_Sym *sym; + asection *sym_sec; + bfd_vma relocation; + bfd_reloc_status_type r; + const char *dyn_name; + char *dynh_buf = NULL; + size_t dynh_buflen = 0; + struct elf64_hppa_dyn_hash_entry *dyn_h = NULL; - /* This is any 12 bit branch. */ - case R_PARISC_PCREL12F: - return (insn & ~0x1ffd) | re_assemble_12 (sym_value); + r_type = ELF_R_TYPE (rel->r_info); + if (r_type < 0 || r_type >= (int) R_PARISC_UNIMPLEMENTED) + { + bfd_set_error (bfd_error_bad_value); + return FALSE; + } - /* This is any 17 bit branch. In PA2.0 syntax it also corresponds - to the "B" instruction as well as BE. */ - case R_PARISC_PCREL17F: - case R_PARISC_DIR17F: - case R_PARISC_DIR17R: - case R_PARISC_PCREL17C: - case R_PARISC_PCREL17R: - return (insn & ~0x1f1ffd) | re_assemble_17 (sym_value); + /* This is a final link. */ + r_symndx = ELF_R_SYM (rel->r_info); + h = NULL; + sym = NULL; + sym_sec = NULL; + if (r_symndx < symtab_hdr->sh_info) + { + /* This is a local symbol. */ + sym = local_syms + r_symndx; + sym_sec = local_sections[r_symndx]; + relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sym_sec, rel); - /* ADDIL or LDIL instructions. */ - case R_PARISC_DLTREL21L: - case R_PARISC_DLTIND21L: - case R_PARISC_LTOFF_FPTR21L: - case R_PARISC_PCREL21L: - case R_PARISC_LTOFF_TP21L: - case R_PARISC_DPREL21L: - case R_PARISC_PLTOFF21L: - case R_PARISC_DIR21L: - return (insn & ~0x1fffff) | re_assemble_21 (sym_value); + /* If this symbol has an entry in the PA64 dynamic hash + table, then get it. */ + dyn_name = get_dyn_name (input_bfd, h, rel, + &dynh_buf, &dynh_buflen); + dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table, + dyn_name, FALSE, FALSE); - /* LDO and integer loads/stores with 14 bit displacements. */ - case R_PARISC_DLTREL14R: - case R_PARISC_DLTREL14F: - case R_PARISC_DLTIND14R: - case R_PARISC_DLTIND14F: - case R_PARISC_LTOFF_FPTR14R: - case R_PARISC_PCREL14R: - case R_PARISC_PCREL14F: - case R_PARISC_LTOFF_TP14R: - case R_PARISC_LTOFF_TP14F: - case R_PARISC_DPREL14R: - case R_PARISC_DPREL14F: - case R_PARISC_PLTOFF14R: - case R_PARISC_PLTOFF14F: - case R_PARISC_DIR14R: - case R_PARISC_DIR14F: - return (insn & ~0x3fff) | low_sign_unext (sym_value, 14); + } + else + { + /* This is not a local symbol. */ + long indx; - /* PA2.0W LDO and integer loads/stores with 16 bit displacements. */ - case R_PARISC_LTOFF_FPTR16F: - case R_PARISC_PCREL16F: - case R_PARISC_LTOFF_TP16F: - case R_PARISC_GPREL16F: - case R_PARISC_PLTOFF16F: - case R_PARISC_DIR16F: - case R_PARISC_LTOFF16F: - return (insn & ~0xffff) | re_assemble_16 (sym_value); + indx = r_symndx - symtab_hdr->sh_info; + h = elf_sym_hashes (input_bfd)[indx]; + while (h->root.type == bfd_link_hash_indirect + || h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + if (h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak) + { + sym_sec = h->root.u.def.section; - /* Doubleword loads and stores with a 14 bit displacement. */ - case R_PARISC_DLTREL14DR: - case R_PARISC_DLTIND14DR: - case R_PARISC_LTOFF_FPTR14DR: - case R_PARISC_LTOFF_FPTR16DF: - case R_PARISC_PCREL14DR: - case R_PARISC_PCREL16DF: - case R_PARISC_LTOFF_TP14DR: - case R_PARISC_LTOFF_TP16DF: - case R_PARISC_DPREL14DR: - case R_PARISC_GPREL16DF: - case R_PARISC_PLTOFF14DR: - case R_PARISC_PLTOFF16DF: - case R_PARISC_DIR14DR: - case R_PARISC_DIR16DF: - case R_PARISC_LTOFF16DF: - return (insn & ~0x3ff1) | (((sym_value & 0x2000) >> 13) - | ((sym_value & 0x1ff8) << 1)); + /* If this symbol has an entry in the PA64 dynamic hash + table, then get it. */ + dyn_name = get_dyn_name (input_bfd, h, rel, + &dynh_buf, &dynh_buflen); + dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table, + dyn_name, FALSE, FALSE); - /* Floating point single word load/store instructions. */ - case R_PARISC_DLTREL14WR: - case R_PARISC_DLTIND14WR: - case R_PARISC_LTOFF_FPTR14WR: - case R_PARISC_LTOFF_FPTR16WF: - case R_PARISC_PCREL14WR: - case R_PARISC_PCREL16WF: - case R_PARISC_LTOFF_TP14WR: - case R_PARISC_LTOFF_TP16WF: - case R_PARISC_DPREL14WR: - case R_PARISC_GPREL16WF: - case R_PARISC_PLTOFF14WR: - case R_PARISC_PLTOFF16WF: - case R_PARISC_DIR16WF: - case R_PARISC_DIR14WR: - case R_PARISC_LTOFF16WF: - return (insn & ~0x3ff9) | (((sym_value & 0x2000) >> 13) - | ((sym_value & 0x1ffc) << 1)); + /* If we have a relocation against a symbol defined in a + shared library and we have not created an entry in the + PA64 dynamic symbol hash table for it, then we lose. */ + if (sym_sec->output_section == NULL && dyn_h == NULL) + { + (*_bfd_error_handler) + (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), + input_bfd, + input_section, + (long) rel->r_offset, + howto->name, + h->root.root.string); + relocation = 0; + } + else if (sym_sec->output_section) + relocation = (h->root.u.def.value + + sym_sec->output_offset + + sym_sec->output_section->vma); + /* Value will be provided via one of the offsets in the + dyn_h hash table entry. */ + else + relocation = 0; + } + else if (info->unresolved_syms_in_objects == RM_IGNORE + && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT) + { + /* If this symbol has an entry in the PA64 dynamic hash + table, then get it. */ + dyn_name = get_dyn_name (input_bfd, h, rel, + &dynh_buf, &dynh_buflen); + dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table, + dyn_name, FALSE, FALSE); - default: - return insn; + if (dyn_h == NULL) + { + (*_bfd_error_handler) + (_("%B(%A): warning: unresolvable relocation against symbol `%s'"), + input_bfd, input_section, h->root.root.string); + } + relocation = 0; + } + else if (h->root.type == bfd_link_hash_undefweak) + { + dyn_name = get_dyn_name (input_bfd, h, rel, + &dynh_buf, &dynh_buflen); + dyn_h = elf64_hppa_dyn_hash_lookup (&hppa_info->dyn_hash_table, + dyn_name, FALSE, FALSE); + + if (dyn_h == NULL) + { + (*_bfd_error_handler) + (_("%B(%A): warning: unresolvable relocation against symbol `%s'"), + input_bfd, input_section, h->root.root.string); + } + relocation = 0; + } + else + { + /* Ignore dynamic loader defined symbols. */ + if (elf_hppa_is_dynamic_loader_symbol (h->root.root.string)) + relocation = 0; + else + { + if (!((*info->callbacks->undefined_symbol) + (info, h->root.root.string, input_bfd, + input_section, rel->r_offset, + (info->unresolved_syms_in_objects == RM_GENERATE_ERROR + || ELF_ST_VISIBILITY (h->other))))) + return FALSE; + break; + } + } + } + + r = elf_hppa_final_link_relocate (rel, input_bfd, output_bfd, + input_section, contents, + relocation, info, sym_sec, + h, dyn_h); + + if (r != bfd_reloc_ok) + { + switch (r) + { + default: + abort (); + case bfd_reloc_overflow: + { + const char *sym_name; + + if (h != NULL) + sym_name = NULL; + else + { + sym_name = bfd_elf_string_from_elf_section (input_bfd, + symtab_hdr->sh_link, + sym->st_name); + if (sym_name == NULL) + return FALSE; + if (*sym_name == '\0') + sym_name = bfd_section_name (input_bfd, sym_sec); + } + + if (!((*info->callbacks->reloc_overflow) + (info, (h ? &h->root : NULL), sym_name, + howto->name, (bfd_vma) 0, input_bfd, + input_section, rel->r_offset))) + return FALSE; + } + break; + } + } } + return TRUE; } -#endif + +#endif /* ARCH_SIZE == 64 */ diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c index 51c210e..10a1183 100644 --- a/bfd/elf32-hppa.c +++ b/bfd/elf32-hppa.c @@ -7,7 +7,9 @@ Department of Computer Science University of Utah Largely rewritten by Alan Modra <alan@linuxcare.com.au> - + Naming cleanup by Carlos O'Donell <carlos@systemhalted.org> + TLS support written by Randolph Chung <tausq@debian.org> + This file is part of BFD, the Binary File Descriptor library. This program is free software; you can redistribute it and/or modify @@ -168,7 +170,8 @@ static const bfd_byte plt_stub[] = shared lib. */ #define ELIMINATE_COPY_RELOCS 1 -enum elf32_hppa_stub_type { +enum elf32_hppa_stub_type +{ hppa_stub_long_branch, hppa_stub_long_branch_shared, hppa_stub_import, @@ -177,8 +180,8 @@ enum elf32_hppa_stub_type { hppa_stub_none }; -struct elf32_hppa_stub_hash_entry { - +struct elf32_hppa_stub_hash_entry +{ /* Base hash table entry structure. */ struct bfd_hash_entry bh_root; @@ -203,8 +206,8 @@ struct elf32_hppa_stub_hash_entry { asection *id_sec; }; -struct elf32_hppa_link_hash_entry { - +struct elf32_hppa_link_hash_entry +{ struct elf_link_hash_entry eh; /* A pointer to the most recently used stub hash entry against this @@ -213,8 +216,8 @@ struct elf32_hppa_link_hash_entry { /* Used to count relocations for delayed sizing of relocation sections. */ - struct elf32_hppa_dyn_reloc_entry { - + struct elf32_hppa_dyn_reloc_entry + { /* Next relocation in the chain. */ struct elf32_hppa_dyn_reloc_entry *hdh_next; @@ -230,12 +233,17 @@ struct elf32_hppa_link_hash_entry { #endif } *dyn_relocs; + enum + { + GOT_UNKNOWN = 0, GOT_NORMAL = 1, GOT_TLS_GD = 2, GOT_TLS_LDM = 4, GOT_TLS_IE = 8 + } tls_type; + /* Set if this symbol is used by a plabel reloc. */ unsigned int plabel:1; }; -struct elf32_hppa_link_hash_table { - +struct elf32_hppa_link_hash_table +{ /* The main hash table. */ struct elf_link_hash_table etab; @@ -251,7 +259,8 @@ struct elf32_hppa_link_hash_table { /* Array to keep track of which stub sections have been created, and information on stub grouping. */ - struct map_stub { + struct map_stub + { /* This is the section to which stubs in the group will be attached. */ asection *link_sec; @@ -292,6 +301,13 @@ struct elf32_hppa_link_hash_table { /* Small local sym to section mapping cache. */ struct sym_sec_cache sym_sec; + + /* Data for LDM relocations. */ + union + { + bfd_signed_vma refcount; + bfd_vma offset; + } tls_ldm_got; }; /* Various hash macros and functions. */ @@ -308,6 +324,15 @@ struct elf32_hppa_link_hash_table { ((struct elf32_hppa_stub_hash_entry *) \ bfd_hash_lookup ((table), (string), (create), (copy))) +#define hppa_elf_local_got_tls_type(abfd) \ + ((char *)(elf_local_got_offsets (abfd) + (elf_tdata (abfd)->symtab_hdr.sh_info * 2))) + +#define hh_name(hh) \ + (hh ? hh->eh.root.root.string : "<undef>") + +#define eh_name(eh) \ + (eh ? eh->root.root.string : "<undef>") + /* Assorted hash table functions. */ /* Initialize an entry in the stub hash table. */ @@ -375,6 +400,7 @@ hppa_link_hash_newfunc (struct bfd_hash_entry *entry, hh->hsh_cache = NULL; hh->dyn_relocs = NULL; hh->plabel = 0; + hh->tls_type = GOT_UNKNOWN; } return entry; @@ -390,7 +416,7 @@ elf32_hppa_link_hash_table_create (bfd *abfd) struct elf32_hppa_link_hash_table *htab; bfd_size_type amt = sizeof (*htab); - htab = (struct elf32_hppa_link_hash_table *) bfd_malloc (amt); + htab = bfd_malloc (amt); if (htab == NULL) return NULL; @@ -424,6 +450,7 @@ elf32_hppa_link_hash_table_create (bfd *abfd) htab->has_22bit_branch = 0; htab->need_plt_stub = 0; htab->sym_sec.abfd = NULL; + htab->tls_ldm_got.refcount = 0; return &htab->etab.root; } @@ -453,28 +480,24 @@ hppa_stub_name (const asection *input_section, if (hh) { - len = 8 + 1 + strlen (hh->eh.root.root.string) + 1 + 8 + 1; + len = 8 + 1 + strlen (hh_name (hh)) + 1 + 8 + 1; stub_name = bfd_malloc (len); if (stub_name != NULL) - { - sprintf (stub_name, "%08x_%s+%x", - input_section->id & 0xffffffff, - hh->eh.root.root.string, - (int) rela->r_addend & 0xffffffff); - } + sprintf (stub_name, "%08x_%s+%x", + input_section->id & 0xffffffff, + hh_name (hh), + (int) rela->r_addend & 0xffffffff); } else { len = 8 + 1 + 8 + 1 + 8 + 1 + 8 + 1; stub_name = bfd_malloc (len); if (stub_name != NULL) - { - sprintf (stub_name, "%08x_%x:%x+%x", - input_section->id & 0xffffffff, - sym_sec->id & 0xffffffff, - (int) ELF32_R_SYM (rela->r_info) & 0xffffffff, - (int) rela->r_addend & 0xffffffff); - } + sprintf (stub_name, "%08x_%x:%x+%x", + input_section->id & 0xffffffff, + sym_sec->id & 0xffffffff, + (int) ELF32_R_SYM (rela->r_info) & 0xffffffff, + (int) rela->r_addend & 0xffffffff); } return stub_name; } @@ -620,17 +643,13 @@ hppa_type_of_stub (asection *input_sec, bytes on from the branch instruction location. The offset is signed and counts in units of 4 bytes. */ if (r_type == (unsigned int) R_PARISC_PCREL17F) - { - max_branch_offset = (1 << (17-1)) << 2; - } + max_branch_offset = (1 << (17 - 1)) << 2; + else if (r_type == (unsigned int) R_PARISC_PCREL12F) - { - max_branch_offset = (1 << (12-1)) << 2; - } + max_branch_offset = (1 << (12 - 1)) << 2; + else /* R_PARISC_PCREL22F. */ - { - max_branch_offset = (1 << (22-1)) << 2; - } + max_branch_offset = (1 << (22 - 1)) << 2; if (branch_offset + max_branch_offset >= 2*max_branch_offset) return hppa_stub_long_branch; @@ -1063,7 +1082,24 @@ elf32_hppa_copy_indirect_symbol (struct bfd_link_info *info, eh_dir->needs_plt |= eh_ind->needs_plt; } else - _bfd_elf_link_hash_copy_indirect (info, eh_dir, eh_ind); + { + if (eh_ind->root.type == bfd_link_hash_indirect + && eh_dir->got.refcount <= 0) + { + hh_dir->tls_type = hh_ind->tls_type; + hh_ind->tls_type = GOT_UNKNOWN; + } + + _bfd_elf_link_hash_copy_indirect (info, eh_dir, eh_ind); + } +} + +static int +elf32_hppa_optimized_tls_reloc (struct bfd_link_info *info ATTRIBUTE_UNUSED, + int r_type, int is_local ATTRIBUTE_UNUSED) +{ + /* For now we don't support linker optimizations. */ + return r_type; } /* Look through the relocs for a section during the first phase, and @@ -1084,6 +1120,7 @@ elf32_hppa_check_relocs (bfd *abfd, struct elf32_hppa_link_hash_table *htab; asection *sreloc; asection *stubreloc; + int tls_type = GOT_UNKNOWN, old_tls_type = GOT_UNKNOWN; if (info->relocatable) return TRUE; @@ -1121,6 +1158,7 @@ elf32_hppa_check_relocs (bfd *abfd, } r_type = ELF32_R_TYPE (rela->r_info); + r_type = elf32_hppa_optimized_tls_reloc (info, r_type, hh == NULL); switch (r_type) { @@ -1243,6 +1281,20 @@ elf32_hppa_check_relocs (bfd *abfd, return FALSE; continue; + case R_PARISC_TLS_GD21L: + case R_PARISC_TLS_GD14R: + case R_PARISC_TLS_LDM21L: + case R_PARISC_TLS_LDM14R: + need_entry = NEED_GOT; + break; + + case R_PARISC_TLS_IE21L: + case R_PARISC_TLS_IE14R: + if (info->shared) + info->flags |= DF_STATIC_TLS; + need_entry = NEED_GOT; + break; + default: continue; } @@ -1250,6 +1302,25 @@ elf32_hppa_check_relocs (bfd *abfd, /* Now carry out our orders. */ if (need_entry & NEED_GOT) { + switch (r_type) + { + default: + tls_type = GOT_NORMAL; + break; + case R_PARISC_TLS_GD21L: + case R_PARISC_TLS_GD14R: + tls_type |= GOT_TLS_GD; + break; + case R_PARISC_TLS_LDM21L: + case R_PARISC_TLS_LDM14R: + tls_type |= GOT_TLS_LDM; + break; + case R_PARISC_TLS_IE21L: + case R_PARISC_TLS_IE14R: + tls_type |= GOT_TLS_IE; + break; + } + /* Allocate space for a GOT entry, as well as a dynamic relocation for this entry. */ if (htab->sgot == NULL) @@ -1260,31 +1331,56 @@ elf32_hppa_check_relocs (bfd *abfd, return FALSE; } - if (hh != NULL) - { - hh->eh.got.refcount += 1; - } + if (r_type == R_PARISC_TLS_LDM21L + || r_type == R_PARISC_TLS_LDM14R) + hppa_link_hash_table (info)->tls_ldm_got.refcount += 1; else { - bfd_signed_vma *local_got_refcounts; - /* This is a global offset table entry for a local symbol. */ - local_got_refcounts = elf_local_got_refcounts (abfd); - if (local_got_refcounts == NULL) - { - bfd_size_type size; - - /* Allocate space for local got offsets and local - plt offsets. Done this way to save polluting - elf_obj_tdata with another target specific - pointer. */ - size = symtab_hdr->sh_info; - size *= 2 * sizeof (bfd_signed_vma); - local_got_refcounts = bfd_zalloc (abfd, size); - if (local_got_refcounts == NULL) - return FALSE; - elf_local_got_refcounts (abfd) = local_got_refcounts; - } - local_got_refcounts[r_symndx] += 1; + if (hh != NULL) + { + hh->eh.got.refcount += 1; + old_tls_type = hh->tls_type; + } + else + { + bfd_signed_vma *local_got_refcounts; + + /* This is a global offset table entry for a local symbol. */ + local_got_refcounts = elf_local_got_refcounts (abfd); + if (local_got_refcounts == NULL) + { + bfd_size_type size; + + /* Allocate space for local got offsets and local + plt offsets. Done this way to save polluting + elf_obj_tdata with another target specific + pointer. */ + size = symtab_hdr->sh_info; + size *= 2 * sizeof (bfd_signed_vma); + /* Add in space to store the local GOT TLS types. */ + size += symtab_hdr->sh_info; + local_got_refcounts = bfd_zalloc (abfd, size); + if (local_got_refcounts == NULL) + return FALSE; + elf_local_got_refcounts (abfd) = local_got_refcounts; + memset (hppa_elf_local_got_tls_type (abfd), + GOT_UNKNOWN, symtab_hdr->sh_info); + } + local_got_refcounts[r_symndx] += 1; + + old_tls_type = hppa_elf_local_got_tls_type (abfd) [r_symndx]; + } + + tls_type |= old_tls_type; + + if (old_tls_type != tls_type) + { + if (hh != NULL) + hh->tls_type = tls_type; + else + hppa_elf_local_got_tls_type (abfd) [r_symndx] = tls_type; + } + } } @@ -1325,6 +1421,8 @@ elf32_hppa_check_relocs (bfd *abfd, plt offsets. */ size = symtab_hdr->sh_info; size *= 2 * sizeof (bfd_signed_vma); + /* Add in space to store the local GOT TLS types. */ + size += symtab_hdr->sh_info; local_got_refcounts = bfd_zalloc (abfd, size); if (local_got_refcounts == NULL) return FALSE; @@ -1578,11 +1676,17 @@ elf32_hppa_gc_sweep_hook (bfd *abfd, } r_type = ELF32_R_TYPE (rela->r_info); + r_type = elf32_hppa_optimized_tls_reloc (info, r_type, eh != NULL); + switch (r_type) { case R_PARISC_DLTIND14F: case R_PARISC_DLTIND14R: case R_PARISC_DLTIND21L: + case R_PARISC_TLS_GD21L: + case R_PARISC_TLS_GD14R: + case R_PARISC_TLS_IE21L: + case R_PARISC_TLS_IE14R: if (eh != NULL) { if (eh->got.refcount > 0) @@ -1595,6 +1699,11 @@ elf32_hppa_gc_sweep_hook (bfd *abfd, } break; + case R_PARISC_TLS_LDM21L: + case R_PARISC_TLS_LDM14R: + hppa_link_hash_table (info)->tls_ldm_got.refcount -= 1; + break; + case R_PARISC_PCREL12F: case R_PARISC_PCREL17C: case R_PARISC_PCREL17F: @@ -1709,7 +1818,7 @@ elf32_hppa_hide_symbol (struct bfd_link_info *info, } } - if (! hppa_elf_hash_entry(eh)->plabel) + if (! hppa_elf_hash_entry (eh)->plabel) { eh->needs_plt = 0; eh->plt = elf_hash_table (info)->init_plt_refcount; @@ -1882,7 +1991,7 @@ allocate_plt_static (struct elf_link_hash_entry *eh, void *inf) eh = (struct elf_link_hash_entry *) eh->root.u.i.link; info = (struct bfd_link_info *) inf; - hh = hppa_elf_hash_entry(eh); + hh = hppa_elf_hash_entry (eh); htab = hppa_link_hash_table (info); if (htab->etab.dynamic_sections_created && eh->plt.refcount > 0) @@ -1982,12 +2091,21 @@ allocate_dynrelocs (struct elf_link_hash_entry *eh, void *inf) sec = htab->sgot; eh->got.offset = sec->size; sec->size += GOT_ENTRY_SIZE; + /* R_PARISC_TLS_GD* needs two GOT entries */ + if ((hh->tls_type & (GOT_TLS_GD | GOT_TLS_IE)) == (GOT_TLS_GD | GOT_TLS_IE)) + sec->size += GOT_ENTRY_SIZE * 2; + else if ((hh->tls_type & GOT_TLS_GD) == GOT_TLS_GD) + sec->size += GOT_ENTRY_SIZE; if (htab->etab.dynamic_sections_created && (info->shared || (eh->dynindx != -1 && !eh->forced_local))) { htab->srelgot->size += sizeof (Elf32_External_Rela); + if ((hh->tls_type & (GOT_TLS_GD | GOT_TLS_IE)) == (GOT_TLS_GD | GOT_TLS_IE)) + htab->srelgot->size += 2 * sizeof (Elf32_External_Rela); + else if ((hh->tls_type & GOT_TLS_GD) == GOT_TLS_GD) + htab->srelgot->size += sizeof (Elf32_External_Rela); } } else @@ -2181,6 +2299,7 @@ elf32_hppa_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, bfd_size_type locsymcount; Elf_Internal_Shdr *symtab_hdr; asection *srel; + char *local_tls_type; if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour) continue; @@ -2219,6 +2338,7 @@ elf32_hppa_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, symtab_hdr = &elf_tdata (ibfd)->symtab_hdr; locsymcount = symtab_hdr->sh_info; end_local_got = local_got + locsymcount; + local_tls_type = hppa_elf_local_got_tls_type (ibfd); sec = htab->sgot; srel = htab->srelgot; for (; local_got < end_local_got; ++local_got) @@ -2227,11 +2347,23 @@ elf32_hppa_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, { *local_got = sec->size; sec->size += GOT_ENTRY_SIZE; + if ((*local_tls_type & (GOT_TLS_GD | GOT_TLS_IE)) == (GOT_TLS_GD | GOT_TLS_IE)) + sec->size += 2 * GOT_ENTRY_SIZE; + else if ((*local_tls_type & GOT_TLS_GD) == GOT_TLS_GD) + sec->size += GOT_ENTRY_SIZE; if (info->shared) - srel->size += sizeof (Elf32_External_Rela); + { + srel->size += sizeof (Elf32_External_Rela); + if ((*local_tls_type & (GOT_TLS_GD | GOT_TLS_IE)) == (GOT_TLS_GD | GOT_TLS_IE)) + srel->size += 2 * sizeof (Elf32_External_Rela); + else if ((*local_tls_type & GOT_TLS_GD) == GOT_TLS_GD) + srel->size += sizeof (Elf32_External_Rela); + } } else *local_got = (bfd_vma) -1; + + ++local_tls_type; } local_plt = end_local_got; @@ -2260,6 +2392,17 @@ elf32_hppa_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, } } } + + if (htab->tls_ldm_got.refcount > 0) + { + /* Allocate 2 got entries and 1 dynamic reloc for + R_PARISC_TLS_DTPMOD32 relocs. */ + htab->tls_ldm_got.offset = htab->sgot->size; + htab->sgot->size += (GOT_ENTRY_SIZE * 2); + htab->srelgot->size += sizeof (Elf32_External_Rela); + } + else + htab->tls_ldm_got.offset = -1; /* Do all the .plt entries without relocs first. The dynamic linker uses the last .plt reloc to find the end of the .plt (and hence @@ -2670,7 +2813,7 @@ get_local_syms (bfd *output_bfd, bfd *input_bfd, struct bfd_link_info *info) struct elf32_hppa_stub_hash_entry *hsh; sec = hh->eh.root.u.def.section; - stub_name = hh->eh.root.root.string; + stub_name = hh_name (hh); hsh = hppa_stub_hash_lookup (&htab->bstab, stub_name, FALSE, FALSE); @@ -3104,6 +3247,35 @@ elf32_hppa_build_stubs (struct bfd_link_info *info) return TRUE; } +/* Return the base vma address which should be subtracted from the real + address when resolving a dtpoff relocation. + This is PT_TLS segment p_vaddr. */ + +static bfd_vma +dtpoff_base (struct bfd_link_info *info) +{ + /* If tls_sec is NULL, we should have signalled an error already. */ + if (elf_hash_table (info)->tls_sec == NULL) + return 0; + return elf_hash_table (info)->tls_sec->vma; +} + +/* Return the relocation value for R_PARISC_TLS_TPOFF*.. */ + +static bfd_vma +tpoff (struct bfd_link_info *info, bfd_vma address) +{ + struct elf_link_hash_table *htab = elf_hash_table (info); + + /* If tls_sec is NULL, we should have signalled an error already. */ + if (htab->tls_sec == NULL) + return 0; + /* hppa TLS ABI is variant I and static TLS block start just after + tcbhead structure which has 2 pointer fields. */ + return (address - htab->tls_sec->vma + + align_power ((bfd_vma) 8, htab->tls_sec->alignment_power)); +} + /* Perform a final link. */ static bfd_boolean @@ -3315,6 +3487,12 @@ final_link_relocate (asection *input_section, case R_PARISC_DLTIND21L: case R_PARISC_DLTIND14R: case R_PARISC_DLTIND14F: + case R_PARISC_TLS_GD21L: + case R_PARISC_TLS_GD14R: + case R_PARISC_TLS_LDM21L: + case R_PARISC_TLS_LDM14R: + case R_PARISC_TLS_IE21L: + case R_PARISC_TLS_IE14R: value -= elf_gp (input_section->output_section->owner); break; @@ -3342,6 +3520,9 @@ final_link_relocate (asection *input_section, case R_PARISC_DLTIND14F: case R_PARISC_SEGBASE: case R_PARISC_SEGREL32: + case R_PARISC_TLS_DTPMOD32: + case R_PARISC_TLS_DTPOFF32: + case R_PARISC_TLS_TPREL32: r_field = e_fsel; break; @@ -3353,6 +3534,11 @@ final_link_relocate (asection *input_section, case R_PARISC_DIR21L: case R_PARISC_DPREL21L: + case R_PARISC_TLS_GD21L: + case R_PARISC_TLS_LDM21L: + case R_PARISC_TLS_LDO21L: + case R_PARISC_TLS_IE21L: + case R_PARISC_TLS_LE21L: r_field = e_lrsel; break; @@ -3366,6 +3552,11 @@ final_link_relocate (asection *input_section, case R_PARISC_DIR17R: case R_PARISC_DIR14R: case R_PARISC_DPREL14R: + case R_PARISC_TLS_GD14R: + case R_PARISC_TLS_LDM14R: + case R_PARISC_TLS_LDO14R: + case R_PARISC_TLS_IE14R: + case R_PARISC_TLS_LE14R: r_field = e_rrsel; break; @@ -3546,7 +3737,7 @@ elf32_hppa_relocate_section (bfd *output_bfd, && eh->type == STT_PARISC_MILLI) { if (! info->callbacks->undefined_symbol - (info, eh->root.root.string, input_bfd, + (info, eh_name (eh), input_bfd, input_section, rela->r_offset, FALSE)) return FALSE; warned_undef = TRUE; @@ -3875,6 +4066,198 @@ elf32_hppa_relocate_section (bfd *output_bfd, bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc); } break; + + case R_PARISC_TLS_LDM21L: + case R_PARISC_TLS_LDM14R: + { + bfd_vma off; + + off = htab->tls_ldm_got.offset; + if (off & 1) + off &= ~1; + else + { + Elf_Internal_Rela outrel; + bfd_byte *loc; + + outrel.r_offset = (off + + htab->sgot->output_section->vma + + htab->sgot->output_offset); + outrel.r_addend = 0; + outrel.r_info = ELF32_R_INFO (0, R_PARISC_TLS_DTPMOD32); + loc = htab->srelgot->contents; + loc += htab->srelgot->reloc_count++ * sizeof (Elf32_External_Rela); + + bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc); + htab->tls_ldm_got.offset |= 1; + } + + /* Add the base of the GOT to the relocation value. */ + relocation = (off + + htab->sgot->output_offset + + htab->sgot->output_section->vma); + + break; + } + + case R_PARISC_TLS_LDO21L: + case R_PARISC_TLS_LDO14R: + relocation -= dtpoff_base (info); + break; + + case R_PARISC_TLS_GD21L: + case R_PARISC_TLS_GD14R: + case R_PARISC_TLS_IE21L: + case R_PARISC_TLS_IE14R: + { + bfd_vma off; + int indx; + char tls_type; + + indx = 0; + if (hh != NULL) + { + bfd_boolean dyn; + dyn = htab->etab.dynamic_sections_created; + + if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, &hh->eh) + && (!info->shared + || !SYMBOL_REFERENCES_LOCAL (info, &hh->eh))) + { + indx = hh->eh.dynindx; + } + off = hh->eh.got.offset; + tls_type = hh->tls_type; + } + else + { + off = local_got_offsets[r_symndx]; + tls_type = hppa_elf_local_got_tls_type (input_bfd)[r_symndx]; + } + + if (tls_type == GOT_UNKNOWN) + abort (); + + if ((off & 1) != 0) + off &= ~1; + else + { + bfd_boolean need_relocs = FALSE; + Elf_Internal_Rela outrel; + bfd_byte *loc = NULL; + int cur_off = off; + + /* The GOT entries have not been initialized yet. Do it + now, and emit any relocations. If both an IE GOT and a + GD GOT are necessary, we emit the GD first. */ + + if ((info->shared || indx != 0) + && (hh == NULL + || ELF_ST_VISIBILITY (hh->eh.other) == STV_DEFAULT + || hh->eh.root.type != bfd_link_hash_undefweak)) + { + need_relocs = TRUE; + loc = htab->srelgot->contents; + /* FIXME (CAO): Should this be reloc_count++ ? */ + loc += htab->srelgot->reloc_count * sizeof (Elf32_External_Rela); + } + + if (tls_type & GOT_TLS_GD) + { + if (need_relocs) + { + outrel.r_offset = (cur_off + + htab->sgot->output_section->vma + + htab->sgot->output_offset); + outrel.r_info = ELF32_R_INFO (indx,R_PARISC_TLS_DTPMOD32); + outrel.r_addend = 0; + bfd_put_32 (output_bfd, 0, htab->sgot->contents + cur_off); + bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc); + htab->srelgot->reloc_count++; + loc += sizeof (Elf32_External_Rela); + + if (indx == 0) + bfd_put_32 (output_bfd, relocation - dtpoff_base (info), + htab->sgot->contents + cur_off + 4); + else + { + bfd_put_32 (output_bfd, 0, + htab->sgot->contents + cur_off + 4); + outrel.r_info = ELF32_R_INFO (indx, R_PARISC_TLS_DTPOFF32); + outrel.r_offset += 4; + bfd_elf32_swap_reloca_out (output_bfd, &outrel,loc); + htab->srelgot->reloc_count++; + loc += sizeof (Elf32_External_Rela); + } + } + else + { + /* If we are not emitting relocations for a + general dynamic reference, then we must be in a + static link or an executable link with the + symbol binding locally. Mark it as belonging + to module 1, the executable. */ + bfd_put_32 (output_bfd, 1, + htab->sgot->contents + cur_off); + bfd_put_32 (output_bfd, relocation - dtpoff_base (info), + htab->sgot->contents + cur_off + 4); + } + + + cur_off += 8; + } + + if (tls_type & GOT_TLS_IE) + { + if (need_relocs) + { + outrel.r_offset = (cur_off + + htab->sgot->output_section->vma + + htab->sgot->output_offset); + outrel.r_info = ELF32_R_INFO (indx, R_PARISC_TLS_TPREL32); + + if (indx == 0) + outrel.r_addend = relocation - dtpoff_base (info); + else + outrel.r_addend = 0; + + bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc); + htab->srelgot->reloc_count++; + loc += sizeof (Elf32_External_Rela); + } + else + bfd_put_32 (output_bfd, tpoff (info, relocation), + htab->sgot->contents + cur_off); + + cur_off += 4; + } + + if (hh != NULL) + hh->eh.got.offset |= 1; + else + local_got_offsets[r_symndx] |= 1; + } + + if ((tls_type & GOT_TLS_GD) + && r_type != R_PARISC_TLS_GD21L + && r_type != R_PARISC_TLS_GD14R) + off += 2 * GOT_ENTRY_SIZE; + + /* Add the base of the GOT to the relocation value. */ + relocation = (off + + htab->sgot->output_offset + + htab->sgot->output_section->vma); + + break; + } + + case R_PARISC_TLS_LE21L: + case R_PARISC_TLS_LE14R: + { + relocation = tpoff (info, relocation); + break; + } + break; default: break; @@ -3887,7 +4270,7 @@ elf32_hppa_relocate_section (bfd *output_bfd, continue; if (hh != NULL) - sym_name = hh->eh.root.root.string; + sym_name = hh_name (hh); else { sym_name = bfd_elf_string_from_elf_section (input_bfd, @@ -3996,7 +4379,9 @@ elf32_hppa_finish_dynamic_symbol (bfd *output_bfd, } } - if (eh->got.offset != (bfd_vma) -1) + if (eh->got.offset != (bfd_vma) -1 + && (hppa_elf_hash_entry (eh)->tls_type & GOT_TLS_GD) == 0 + && (hppa_elf_hash_entry (eh)->tls_type & GOT_TLS_IE) == 0) { /* This symbol has an entry in the global offset table. Set it up. */ @@ -4057,8 +4442,8 @@ elf32_hppa_finish_dynamic_symbol (bfd *output_bfd, } /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute. */ - if (eh->root.root.string[0] == '_' - && (strcmp (eh->root.root.string, "_DYNAMIC") == 0 + if (eh_name (eh)[0] == '_' + && (strcmp (eh_name (eh), "_DYNAMIC") == 0 || eh == htab->etab.hgot)) { sym->st_shndx = SHN_ABS; @@ -4073,6 +4458,17 @@ elf32_hppa_finish_dynamic_symbol (bfd *output_bfd, static enum elf_reloc_type_class elf32_hppa_reloc_type_class (const Elf_Internal_Rela *rela) { + /* Handle TLS relocs first; we don't want them to be marked + relative by the "if (ELF32_R_SYM (rela->r_info) == 0)" + check below. */ + switch ((int) ELF32_R_TYPE (rela->r_info)) + { + case R_PARISC_TLS_DTPMOD32: + case R_PARISC_TLS_DTPOFF32: + case R_PARISC_TLS_TPREL32: + return reloc_class_normal; + } + if (ELF32_R_SYM (rela->r_info) == 0) return reloc_class_relative; diff --git a/gas/ChangeLog b/gas/ChangeLog index cb9fa62..b192941 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,19 @@ +2006-05-24 Nick Clifton <nickc@redhat.com> + + * config/tc-hppa.c: Convert to ISO C90 format. + * config/tc-hppa.h: Likewise. + +2006-05-24 Carlos O'Donell <carlos@systemhalted.org> + Randolph Chung <randolph@tausq.org> + + * config/tc-hppa.c (is_tls_gdidx, is_tls_ldidx, is_tls_dtpoff, + is_tls_ieoff, is_tls_leoff): Define. + (fix_new_hppa): Handle TLS. + (cons_fix_new_hppa): Likewise. + (pa_ip): Likewise. + (md_apply_fix): Handle TLS relocs. + * config/tc-hppa.h (hppa_fix_adjustable): Handle TLS. + 2006-05-24 Bjoern Haase <bjoern.m.haase@web.de> * config/tc-avr.c: Add new cpu targets avr6, avr2560 and avr2561. diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c index 177e36a..66d72a1 100644 --- a/gas/config/tc-hppa.c +++ b/gas/config/tc-hppa.c @@ -490,112 +490,42 @@ struct selector_entry /* Prototypes for functions local to tc-hppa.c. */ #ifdef OBJ_SOM -static void pa_check_current_space_and_subspace PARAMS ((void)); +static void pa_check_current_space_and_subspace (void); #endif #if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) -static void pa_text PARAMS ((int)); -static void pa_data PARAMS ((int)); -static void pa_comm PARAMS ((int)); +static void pa_text (int); +static void pa_data (int); +static void pa_comm (int); #endif -static fp_operand_format pa_parse_fp_format PARAMS ((char **s)); -static void pa_cons PARAMS ((int)); -static void pa_float_cons PARAMS ((int)); -static void pa_fill PARAMS ((int)); -static void pa_lcomm PARAMS ((int)); -static void pa_lsym PARAMS ((int)); -static void pa_stringer PARAMS ((int)); -static void pa_version PARAMS ((int)); -static int pa_parse_fp_cmp_cond PARAMS ((char **)); -static int get_expression PARAMS ((char *)); -static int pa_get_absolute_expression PARAMS ((struct pa_it *, char **)); -static int evaluate_absolute PARAMS ((struct pa_it *)); -static unsigned int pa_build_arg_reloc PARAMS ((char *)); -static unsigned int pa_align_arg_reloc PARAMS ((unsigned int, unsigned int)); -static int pa_parse_nullif PARAMS ((char **)); -static int pa_parse_nonneg_cmpsub_cmpltr PARAMS ((char **)); -static int pa_parse_neg_cmpsub_cmpltr PARAMS ((char **)); -static int pa_parse_neg_add_cmpltr PARAMS ((char **)); -static int pa_parse_nonneg_add_cmpltr PARAMS ((char **)); -static int pa_parse_cmpb_64_cmpltr PARAMS ((char **)); -static int pa_parse_cmpib_64_cmpltr PARAMS ((char **)); -static int pa_parse_addb_64_cmpltr PARAMS ((char **)); -static void pa_block PARAMS ((int)); -static void pa_brtab PARAMS ((int)); -static void pa_try PARAMS ((int)); -static void pa_call PARAMS ((int)); -static void pa_call_args PARAMS ((struct call_desc *)); -static void pa_callinfo PARAMS ((int)); -static void pa_copyright PARAMS ((int)); -static void pa_end PARAMS ((int)); -static void pa_enter PARAMS ((int)); -static void pa_entry PARAMS ((int)); -static void pa_equ PARAMS ((int)); -static void pa_exit PARAMS ((int)); -static void pa_export PARAMS ((int)); -static void pa_type_args PARAMS ((symbolS *, int)); -static void pa_import PARAMS ((int)); -static void pa_label PARAMS ((int)); -static void pa_leave PARAMS ((int)); -static void pa_level PARAMS ((int)); -static void pa_origin PARAMS ((int)); -static void pa_proc PARAMS ((int)); -static void pa_procend PARAMS ((int)); -static void pa_param PARAMS ((int)); -static void pa_undefine_label PARAMS ((void)); -static int need_pa11_opcode PARAMS ((void)); -static int pa_parse_number PARAMS ((char **, int)); -static label_symbol_struct *pa_get_label PARAMS ((void)); #ifdef OBJ_SOM -static int exact_log2 PARAMS ((int)); -static void pa_compiler PARAMS ((int)); -static void pa_align PARAMS ((int)); -static void pa_space PARAMS ((int)); -static void pa_spnum PARAMS ((int)); -static void pa_subspace PARAMS ((int)); -static sd_chain_struct *create_new_space PARAMS ((char *, int, int, +static int exact_log2 (int); +static void pa_compiler (int); +static void pa_align (int); +static void pa_space (int); +static void pa_spnum (int); +static void pa_subspace (int); +static sd_chain_struct *create_new_space (char *, int, int, int, int, int, - asection *, int)); -static ssd_chain_struct *create_new_subspace PARAMS ((sd_chain_struct *, + asection *, int); +static ssd_chain_struct *create_new_subspace (sd_chain_struct *, char *, int, int, int, int, int, int, int, int, int, int, - int, asection *)); -static ssd_chain_struct *update_subspace PARAMS ((sd_chain_struct *, + int, asection *); +static ssd_chain_struct *update_subspace (sd_chain_struct *, char *, int, int, int, int, int, int, int, int, int, int, int, - asection *)); -static sd_chain_struct *is_defined_space PARAMS ((char *)); -static ssd_chain_struct *is_defined_subspace PARAMS ((char *)); -static sd_chain_struct *pa_segment_to_space PARAMS ((asection *)); -static ssd_chain_struct *pa_subsegment_to_subspace PARAMS ((asection *, - subsegT)); -static sd_chain_struct *pa_find_space_by_number PARAMS ((int)); -static unsigned int pa_subspace_start PARAMS ((sd_chain_struct *, int)); -static sd_chain_struct *pa_parse_space_stmt PARAMS ((char *, int)); -static void pa_spaces_begin PARAMS ((void)); -#endif -static void pa_ip PARAMS ((char *)); -static void fix_new_hppa PARAMS ((fragS *, int, int, symbolS *, - offsetT, expressionS *, int, - bfd_reloc_code_real_type, - enum hppa_reloc_field_selector_type_alt, - int, unsigned int, int)); -static int is_end_of_statement PARAMS ((void)); -static int reg_name_search PARAMS ((char *)); -static int pa_chk_field_selector PARAMS ((char **)); -static int is_same_frag PARAMS ((fragS *, fragS *)); -static void process_exit PARAMS ((void)); -static unsigned int pa_stringer_aux PARAMS ((char *)); -static fp_operand_format pa_parse_fp_cnv_format PARAMS ((char **s)); -static int pa_parse_ftest_gfx_completer PARAMS ((char **)); - -#ifdef OBJ_ELF -static void hppa_elf_mark_end_of_function PARAMS ((void)); -static void pa_build_unwind_subspace PARAMS ((struct call_info *)); -static void pa_vtable_entry PARAMS ((int)); -static void pa_vtable_inherit PARAMS ((int)); + asection *); +static sd_chain_struct *is_defined_space (char *); +static ssd_chain_struct *is_defined_subspace (char *); +static sd_chain_struct *pa_segment_to_space (asection *); +static ssd_chain_struct *pa_subsegment_to_subspace (asection *, + subsegT); +static sd_chain_struct *pa_find_space_by_number (int); +static unsigned int pa_subspace_start (sd_chain_struct *, int); +static sd_chain_struct *pa_parse_space_stmt (char *, int); #endif /* File and globally scoped variable declarations. */ @@ -629,96 +559,6 @@ static struct hash_control *op_hash = NULL; as they never appear followed by meaningful whitespace. */ const char hppa_symbol_chars[] = "*?=<>"; -/* Table of pseudo ops for the PA. FIXME -- how many of these - are now redundant with the overall GAS and the object file - dependent tables? */ -const pseudo_typeS md_pseudo_table[] = -{ - /* align pseudo-ops on the PA specify the actual alignment requested, - not the log2 of the requested alignment. */ -#ifdef OBJ_SOM - {"align", pa_align, 8}, -#endif -#ifdef OBJ_ELF - {"align", s_align_bytes, 8}, -#endif - {"begin_brtab", pa_brtab, 1}, - {"begin_try", pa_try, 1}, - {"block", pa_block, 1}, - {"blockz", pa_block, 0}, - {"byte", pa_cons, 1}, - {"call", pa_call, 0}, - {"callinfo", pa_callinfo, 0}, -#if defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD)) - {"code", obj_elf_text, 0}, -#else - {"code", pa_text, 0}, - {"comm", pa_comm, 0}, -#endif -#ifdef OBJ_SOM - {"compiler", pa_compiler, 0}, -#endif - {"copyright", pa_copyright, 0}, -#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) - {"data", pa_data, 0}, -#endif - {"double", pa_float_cons, 'd'}, - {"dword", pa_cons, 8}, - {"end", pa_end, 0}, - {"end_brtab", pa_brtab, 0}, -#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) - {"end_try", pa_try, 0}, -#endif - {"enter", pa_enter, 0}, - {"entry", pa_entry, 0}, - {"equ", pa_equ, 0}, - {"exit", pa_exit, 0}, - {"export", pa_export, 0}, - {"fill", pa_fill, 0}, - {"float", pa_float_cons, 'f'}, - {"half", pa_cons, 2}, - {"import", pa_import, 0}, - {"int", pa_cons, 4}, - {"label", pa_label, 0}, - {"lcomm", pa_lcomm, 0}, - {"leave", pa_leave, 0}, - {"level", pa_level, 0}, - {"long", pa_cons, 4}, - {"lsym", pa_lsym, 0}, -#ifdef OBJ_SOM - {"nsubspa", pa_subspace, 1}, -#endif - {"octa", pa_cons, 16}, - {"org", pa_origin, 0}, - {"origin", pa_origin, 0}, - {"param", pa_param, 0}, - {"proc", pa_proc, 0}, - {"procend", pa_procend, 0}, - {"quad", pa_cons, 8}, - {"reg", pa_equ, 1}, - {"short", pa_cons, 2}, - {"single", pa_float_cons, 'f'}, -#ifdef OBJ_SOM - {"space", pa_space, 0}, - {"spnum", pa_spnum, 0}, -#endif - {"string", pa_stringer, 0}, - {"stringz", pa_stringer, 1}, -#ifdef OBJ_SOM - {"subspa", pa_subspace, 0}, -#endif -#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) - {"text", pa_text, 0}, -#endif - {"version", pa_version, 0}, -#ifdef OBJ_ELF - {"vtable_entry", pa_vtable_entry, 0}, - {"vtable_inherit", pa_vtable_inherit, 0}, -#endif - {"word", pa_cons, 4}, - {NULL, 0, 0} -}; - /* This array holds the chars that only start a comment at the beginning of a line. If the line seems to have the form '# 123 filename' .line and .file directives will appear in the pre-processed output. @@ -1215,6 +1055,26 @@ static struct default_space_dict pa_def_spaces[] = ((exp).X_op == O_subtract \ && strcmp (S_GET_NAME ((exp).X_op_symbol), "$PIC_pcrel$0") == 0) +#define is_tls_gdidx(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_gdidx$") == 0) + +#define is_tls_ldidx(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_ldidx$") == 0) + +#define is_tls_dtpoff(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_dtpoff$") == 0) + +#define is_tls_ieoff(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_ieoff$") == 0) + +#define is_tls_leoff(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_leoff$") == 0) + /* We need some complex handling for stabs (sym1 - sym2). Luckily, we'll always be able to reduce the expression to a constant, so we don't need real complex handling yet. */ @@ -1227,7 +1087,7 @@ static struct default_space_dict pa_def_spaces[] = proc/procend pairs match. */ void -pa_check_eof () +pa_check_eof (void) { if (within_entry_exit) as_fatal (_("Missing .exit\n")); @@ -1240,7 +1100,7 @@ pa_check_eof () or NULL if no label_symbol_struct exists for the current space. */ static label_symbol_struct * -pa_get_label () +pa_get_label (void) { label_symbol_struct *label_chain; @@ -1265,8 +1125,7 @@ pa_get_label () this function will replace it with the new label. */ void -pa_define_label (symbol) - symbolS *symbol; +pa_define_label (symbolS *symbol) { label_symbol_struct *label_chain = pa_get_label (); @@ -1275,8 +1134,7 @@ pa_define_label (symbol) else { /* Create a new label entry and add it to the head of the chain. */ - label_chain - = (label_symbol_struct *) xmalloc (sizeof (label_symbol_struct)); + label_chain = xmalloc (sizeof (label_symbol_struct)); label_chain->lss_label = symbol; #ifdef OBJ_SOM label_chain->lss_space = current_space; @@ -1301,7 +1159,7 @@ pa_define_label (symbol) If there is no label_symbol_struct entry, then no action is taken. */ static void -pa_undefine_label () +pa_undefine_label (void) { label_symbol_struct *label_chain; label_symbol_struct *prev_label_chain = NULL; @@ -1340,25 +1198,21 @@ pa_undefine_label () tc_fix_data field. */ static void -fix_new_hppa (frag, where, size, add_symbol, offset, exp, pcrel, - r_type, r_field, r_format, arg_reloc, unwind_bits) - fragS *frag; - int where; - int size; - symbolS *add_symbol; - offsetT offset; - expressionS *exp; - int pcrel; - bfd_reloc_code_real_type r_type; - enum hppa_reloc_field_selector_type_alt r_field; - int r_format; - unsigned int arg_reloc; - int unwind_bits ATTRIBUTE_UNUSED; +fix_new_hppa (fragS *frag, + int where, + int size, + symbolS *add_symbol, + offsetT offset, + expressionS *exp, + int pcrel, + bfd_reloc_code_real_type r_type, + enum hppa_reloc_field_selector_type_alt r_field, + int r_format, + unsigned int arg_reloc, + int unwind_bits ATTRIBUTE_UNUSED) { fixS *new_fix; - - struct hppa_fix_struct *hppa_fix = (struct hppa_fix_struct *) - obstack_alloc (¬es, sizeof (struct hppa_fix_struct)); + struct hppa_fix_struct *hppa_fix = obstack_alloc (¬es, sizeof (struct hppa_fix_struct)); if (exp != NULL) new_fix = fix_new_exp (frag, where, size, exp, pcrel, r_type); @@ -1380,30 +1234,20 @@ fix_new_hppa (frag, where, size, add_symbol, offset, exp, pcrel, it now so as not to confuse write.c. Ditto for $PIC_pcrel$0. */ if (new_fix->fx_subsy && (strcmp (S_GET_NAME (new_fix->fx_subsy), "$global$") == 0 - || strcmp (S_GET_NAME (new_fix->fx_subsy), "$PIC_pcrel$0") == 0)) + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$PIC_pcrel$0") == 0 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_gdidx$") == 0 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_ldidx$") == 0 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_dtpoff$") == 0 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_ieoff$") == 0 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_leoff$") == 0)) new_fix->fx_subsy = NULL; } -/* Parse a .byte, .word, .long expression for the HPPA. Called by - cons via the TC_PARSE_CONS_EXPRESSION macro. */ - -void -parse_cons_expression_hppa (exp) - expressionS *exp; -{ - hppa_field_selector = pa_chk_field_selector (&input_line_pointer); - expression (exp); -} - /* This fix_new is called by cons via TC_CONS_FIX_NEW. hppa_field_selector is set by the parse_cons_expression_hppa. */ void -cons_fix_new_hppa (frag, where, size, exp) - fragS *frag; - int where; - int size; - expressionS *exp; +cons_fix_new_hppa (fragS *frag, int where, int size, expressionS *exp) { unsigned int rel_type; @@ -1412,6 +1256,18 @@ cons_fix_new_hppa (frag, where, size, exp) rel_type = R_HPPA_GOTOFF; else if (is_PC_relative (*exp)) rel_type = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (*exp)) + rel_type = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (*exp)) + rel_type = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (*exp)) + rel_type = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (*exp)) + rel_type = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (*exp)) + rel_type = R_PARISC_TLS_LE21L; +#endif else if (is_complex (*exp)) rel_type = R_HPPA_COMPLEX; else @@ -1431,155 +1287,1936 @@ cons_fix_new_hppa (frag, where, size, exp) hppa_field_selector = 0; } -/* This function is called once, at assembler startup time. It should - set up all the tables, etc. that the MD part of the assembler will need. */ +/* Mark (via expr_end) the end of an expression (I think). FIXME. */ + +static void +get_expression (char *str) +{ + char *save_in; + asection *seg; + + save_in = input_line_pointer; + input_line_pointer = str; + seg = expression (&the_insn.exp); + if (!(seg == absolute_section + || seg == undefined_section + || SEG_NORMAL (seg))) + { + as_warn (_("Bad segment in expression.")); + expr_end = input_line_pointer; + input_line_pointer = save_in; + return; + } + expr_end = input_line_pointer; + input_line_pointer = save_in; +} + +/* Parse a PA nullification completer (,n). Return nonzero if the + completer was found; return zero if no completer was found. */ + +static int +pa_parse_nullif (char **s) +{ + int nullif; + + nullif = 0; + if (**s == ',') + { + *s = *s + 1; + if (strncasecmp (*s, "n", 1) == 0) + nullif = 1; + else + { + as_bad (_("Invalid Nullification: (%c)"), **s); + nullif = 0; + } + *s = *s + 1; + } + + return nullif; +} + +/* Turn a string in input_line_pointer into a floating point constant of type + type, and store the appropriate bytes in *litP. The number of LITTLENUMS + emitted is stored in *sizeP . An error message or NULL is returned. */ + +#define MAX_LITTLENUMS 6 + +char * +md_atof (int type, char *litP, int *sizeP) +{ + int prec; + LITTLENUM_TYPE words[MAX_LITTLENUMS]; + LITTLENUM_TYPE *wordP; + char *t; + + switch (type) + { + + case 'f': + case 'F': + case 's': + case 'S': + prec = 2; + break; + + case 'd': + case 'D': + case 'r': + case 'R': + prec = 4; + break; + + case 'x': + case 'X': + prec = 6; + break; + + case 'p': + case 'P': + prec = 6; + break; + + default: + *sizeP = 0; + return _("Bad call to MD_ATOF()"); + } + t = atof_ieee (input_line_pointer, type, words); + if (t) + input_line_pointer = t; + *sizeP = prec * sizeof (LITTLENUM_TYPE); + for (wordP = words; prec--;) + { + md_number_to_chars (litP, (valueT) (*wordP++), sizeof (LITTLENUM_TYPE)); + litP += sizeof (LITTLENUM_TYPE); + } + return NULL; +} + +/* Write out big-endian. */ void -md_begin () +md_number_to_chars (char *buf, valueT val, int n) { - const char *retval = NULL; - int lose = 0; - unsigned int i = 0; + number_to_chars_bigendian (buf, val, n); +} - last_call_info = NULL; - call_info_root = NULL; +/* Translate internal representation of relocation info to BFD target + format. */ - /* Set the default machine type. */ - if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, DEFAULT_LEVEL)) - as_warn (_("could not set architecture and machine")); +arelent ** +tc_gen_reloc (asection *section, fixS *fixp) +{ + arelent *reloc; + struct hppa_fix_struct *hppa_fixp; + static arelent *no_relocs = NULL; + arelent **relocs; + reloc_type **codes; + reloc_type code; + int n_relocs; + int i; - /* Folding of text and data segments fails miserably on the PA. - Warn user and disable "-R" option. */ - if (flag_readonly_data_in_text) + hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data; + if (fixp->fx_addsy == 0) + return &no_relocs; + + assert (hppa_fixp != 0); + assert (section != 0); + + reloc = xmalloc (sizeof (arelent)); + + reloc->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); + codes = hppa_gen_reloc_type (stdoutput, + fixp->fx_r_type, + hppa_fixp->fx_r_format, + hppa_fixp->fx_r_field, + fixp->fx_subsy != NULL, + symbol_get_bfdsym (fixp->fx_addsy)); + + if (codes == NULL) { - as_warn (_("-R option not supported on this target.")); - flag_readonly_data_in_text = 0; + as_bad_where (fixp->fx_file, fixp->fx_line, _("Cannot handle fixup")); + abort (); } -#ifdef OBJ_SOM - pa_spaces_begin (); + for (n_relocs = 0; codes[n_relocs]; n_relocs++) + ; + + relocs = xmalloc (sizeof (arelent *) * n_relocs + 1); + reloc = xmalloc (sizeof (arelent) * n_relocs); + for (i = 0; i < n_relocs; i++) + relocs[i] = &reloc[i]; + + relocs[n_relocs] = NULL; + +#ifdef OBJ_ELF + switch (fixp->fx_r_type) + { + default: + assert (n_relocs == 1); + + code = *codes[0]; + + /* Now, do any processing that is dependent on the relocation type. */ + switch (code) + { + case R_PARISC_DLTREL21L: + case R_PARISC_DLTREL14R: + case R_PARISC_DLTREL14F: + case R_PARISC_PLABEL32: + case R_PARISC_PLABEL21L: + case R_PARISC_PLABEL14R: + /* For plabel relocations, the addend of the + relocation should be either 0 (no static link) or 2 + (static link required). This adjustment is done in + bfd/elf32-hppa.c:elf32_hppa_relocate_section. + + We also slam a zero addend into the DLT relative relocs; + it doesn't make a lot of sense to use any addend since + it gets you a different (eg unknown) DLT entry. */ + reloc->addend = 0; + break; + +#ifdef ELF_ARG_RELOC + case R_PARISC_PCREL17R: + case R_PARISC_PCREL17F: + case R_PARISC_PCREL17C: + case R_PARISC_DIR17R: + case R_PARISC_DIR17F: + case R_PARISC_PCREL21L: + case R_PARISC_DIR21L: + reloc->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc, + fixp->fx_offset); + break; #endif - op_hash = hash_new (); + case R_PARISC_DIR32: + /* Facilitate hand-crafted unwind info. */ + if (strcmp (section->name, UNWIND_SECTION_NAME) == 0) + code = R_PARISC_SEGREL32; + /* Fall thru */ - while (i < NUMOPCODES) + default: + reloc->addend = fixp->fx_offset; + break; + } + + reloc->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); + reloc->howto = bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) code); + reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; + + assert (reloc->howto && (unsigned int) code == reloc->howto->type); + break; + } +#else /* OBJ_SOM */ + + /* Walk over reach relocation returned by the BFD backend. */ + for (i = 0; i < n_relocs; i++) { - const char *name = pa_opcodes[i].name; - retval = hash_insert (op_hash, name, (struct pa_opcode *) &pa_opcodes[i]); - if (retval != NULL && *retval != '\0') + code = *codes[i]; + + relocs[i]->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); + relocs[i]->howto = + bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) code); + relocs[i]->address = fixp->fx_frag->fr_address + fixp->fx_where; + + switch (code) { - as_fatal (_("Internal error: can't hash `%s': %s\n"), name, retval); - lose = 1; + case R_COMP2: + /* The only time we ever use a R_COMP2 fixup is for the difference + of two symbols. With that in mind we fill in all four + relocs now and break out of the loop. */ + assert (i == 1); + relocs[0]->sym_ptr_ptr + = (asymbol **) bfd_abs_section_ptr->symbol_ptr_ptr; + relocs[0]->howto + = bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[0]); + relocs[0]->address = fixp->fx_frag->fr_address + fixp->fx_where; + relocs[0]->addend = 0; + relocs[1]->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *relocs[1]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); + relocs[1]->howto + = bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[1]); + relocs[1]->address = fixp->fx_frag->fr_address + fixp->fx_where; + relocs[1]->addend = 0; + relocs[2]->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *relocs[2]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_subsy); + relocs[2]->howto + = bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[2]); + relocs[2]->address = fixp->fx_frag->fr_address + fixp->fx_where; + relocs[2]->addend = 0; + relocs[3]->sym_ptr_ptr + = (asymbol **) bfd_abs_section_ptr->symbol_ptr_ptr; + relocs[3]->howto + = bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[3]); + relocs[3]->address = fixp->fx_frag->fr_address + fixp->fx_where; + relocs[3]->addend = 0; + relocs[4]->sym_ptr_ptr + = (asymbol **) bfd_abs_section_ptr->symbol_ptr_ptr; + relocs[4]->howto + = bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[4]); + relocs[4]->address = fixp->fx_frag->fr_address + fixp->fx_where; + relocs[4]->addend = 0; + goto done; + case R_PCREL_CALL: + case R_ABS_CALL: + relocs[i]->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc, 0); + break; + + case R_DLT_REL: + case R_DATA_PLABEL: + case R_CODE_PLABEL: + /* For plabel relocations, the addend of the + relocation should be either 0 (no static link) or 2 + (static link required). + + FIXME: We always assume no static link! + + We also slam a zero addend into the DLT relative relocs; + it doesn't make a lot of sense to use any addend since + it gets you a different (eg unknown) DLT entry. */ + relocs[i]->addend = 0; + break; + + case R_N_MODE: + case R_S_MODE: + case R_D_MODE: + case R_R_MODE: + case R_FSEL: + case R_LSEL: + case R_RSEL: + case R_BEGIN_BRTAB: + case R_END_BRTAB: + case R_BEGIN_TRY: + case R_N0SEL: + case R_N1SEL: + /* There is no symbol or addend associated with these fixups. */ + relocs[i]->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); + relocs[i]->addend = 0; + break; + + case R_END_TRY: + case R_ENTRY: + case R_EXIT: + /* There is no symbol associated with these fixups. */ + relocs[i]->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); + relocs[i]->addend = fixp->fx_offset; + break; + + default: + relocs[i]->addend = fixp->fx_offset; } - do + } + + done: +#endif + + return relocs; +} + +/* Process any machine dependent frag types. */ + +void +md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, + asection *sec ATTRIBUTE_UNUSED, + fragS *fragP) +{ + unsigned int address; + + if (fragP->fr_type == rs_machine_dependent) + { + switch ((int) fragP->fr_subtype) { - if ((pa_opcodes[i].match & pa_opcodes[i].mask) - != pa_opcodes[i].match) + case 0: + fragP->fr_type = rs_fill; + know (fragP->fr_var == 1); + know (fragP->fr_next); + address = fragP->fr_address + fragP->fr_fix; + if (address % fragP->fr_offset) { - fprintf (stderr, _("internal error: losing opcode: `%s' \"%s\"\n"), - pa_opcodes[i].name, pa_opcodes[i].args); - lose = 1; + fragP->fr_offset = + fragP->fr_next->fr_address + - fragP->fr_address + - fragP->fr_fix; } - ++i; + else + fragP->fr_offset = 0; + break; } - while (i < NUMOPCODES && !strcmp (pa_opcodes[i].name, name)); } +} - if (lose) - as_fatal (_("Broken assembler. No assembly attempted.")); +/* Round up a section size to the appropriate boundary. */ + +valueT +md_section_align (asection *segment, valueT size) +{ + int align = bfd_get_section_alignment (stdoutput, segment); + int align2 = (1 << align) - 1; + + return (size + align2) & ~align2; +} + +/* Return the approximate size of a frag before relaxation has occurred. */ + +int +md_estimate_size_before_relax (fragS *fragP, asection *segment ATTRIBUTE_UNUSED) +{ + int size; + + size = 0; + + while ((fragP->fr_fix + size) % fragP->fr_offset) + size++; + + return size; +} + +#ifdef OBJ_ELF +# ifdef WARN_COMMENTS +const char *md_shortopts = "Vc"; +# else +const char *md_shortopts = "V"; +# endif +#else +# ifdef WARN_COMMENTS +const char *md_shortopts = "c"; +# else +const char *md_shortopts = ""; +# endif +#endif + +struct option md_longopts[] = +{ +#ifdef WARN_COMMENTS + {"warn-comment", no_argument, NULL, 'c'}, +#endif + {NULL, no_argument, NULL, 0} +}; +size_t md_longopts_size = sizeof (md_longopts); + +int +md_parse_option (int c, char *arg ATTRIBUTE_UNUSED) +{ + switch (c) + { + default: + return 0; + +#ifdef OBJ_ELF + case 'V': + print_version_id (); + break; +#endif +#ifdef WARN_COMMENTS + case 'c': + warn_comment = 1; + break; +#endif + } + + return 1; +} + +void +md_show_usage (FILE *stream ATTRIBUTE_UNUSED) +{ +#ifdef OBJ_ELF + fprintf (stream, _("\ + -Q ignored\n")); +#endif +#ifdef WARN_COMMENTS + fprintf (stream, _("\ + -c print a warning if a comment is found\n")); +#endif +} + +/* We have no need to default values of symbols. */ + +symbolS * +md_undefined_symbol (char *name ATTRIBUTE_UNUSED) +{ + return NULL; +} + +#if defined (OBJ_SOM) || defined (ELF_ARG_RELOC) +#define nonzero_dibits(x) \ + ((x) | (((x) & 0x55555555) << 1) | (((x) & 0xAAAAAAAA) >> 1)) +#define arg_reloc_stub_needed(CALLER, CALLEE) \ + (((CALLER) ^ (CALLEE)) & nonzero_dibits (CALLER) & nonzero_dibits (CALLEE)) +#else +#define arg_reloc_stub_needed(CALLER, CALLEE) 0 +#endif + +/* Apply a fixup to an instruction. */ +void +md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) +{ + char *fixpos; + struct hppa_fix_struct *hppa_fixP; + offsetT new_val; + int insn, val, fmt; + + /* SOM uses R_HPPA_ENTRY and R_HPPA_EXIT relocations which can + never be "applied" (they are just markers). Likewise for + R_HPPA_BEGIN_BRTAB and R_HPPA_END_BRTAB. */ #ifdef OBJ_SOM - /* SOM will change text_section. To make sure we never put - anything into the old one switch to the new one now. */ - subseg_set (text_section, 0); + if (fixP->fx_r_type == R_HPPA_ENTRY + || fixP->fx_r_type == R_HPPA_EXIT + || fixP->fx_r_type == R_HPPA_BEGIN_BRTAB + || fixP->fx_r_type == R_HPPA_END_BRTAB + || fixP->fx_r_type == R_HPPA_BEGIN_TRY) + return; + + /* Disgusting. We must set fx_offset ourselves -- R_HPPA_END_TRY + fixups are considered not adjustable, which in turn causes + adjust_reloc_syms to not set fx_offset. Ugh. */ + if (fixP->fx_r_type == R_HPPA_END_TRY) + { + fixP->fx_offset = * valP; + return; + } #endif +#ifdef OBJ_ELF + if (fixP->fx_r_type == (int) R_PARISC_GNU_VTENTRY + || fixP->fx_r_type == (int) R_PARISC_GNU_VTINHERIT) + return; +#endif + + if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0) + fixP->fx_done = 1; + + /* There should be a HPPA specific fixup associated with the GAS fixup. */ + hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data; + if (hppa_fixP == NULL) + { + as_bad_where (fixP->fx_file, fixP->fx_line, + _("no hppa_fixup entry for fixup type 0x%x"), + fixP->fx_r_type); + return; + } + fixpos = fixP->fx_frag->fr_literal + fixP->fx_where; + + if (fixP->fx_size != 4 || hppa_fixP->fx_r_format == 32) + { + /* Handle constant output. */ + number_to_chars_bigendian (fixpos, *valP, fixP->fx_size); + return; + } + + insn = bfd_get_32 (stdoutput, fixpos); + fmt = bfd_hppa_insn2fmt (stdoutput, insn); + + /* If there is a symbol associated with this fixup, then it's something + which will need a SOM relocation (except for some PC-relative relocs). + In such cases we should treat the "val" or "addend" as zero since it + will be added in as needed from fx_offset in tc_gen_reloc. */ + if ((fixP->fx_addsy != NULL + || fixP->fx_r_type == (int) R_HPPA_NONE) #ifdef OBJ_SOM - dummy_symbol = symbol_find_or_make ("L$dummy"); - S_SET_SEGMENT (dummy_symbol, text_section); - /* Force the symbol to be converted to a real symbol. */ - (void) symbol_get_bfdsym (dummy_symbol); + && fmt != 32 +#endif + ) + new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0); +#ifdef OBJ_SOM + /* These field selectors imply that we do not want an addend. */ + else if (hppa_fixP->fx_r_field == e_psel + || hppa_fixP->fx_r_field == e_rpsel + || hppa_fixP->fx_r_field == e_lpsel + || hppa_fixP->fx_r_field == e_tsel + || hppa_fixP->fx_r_field == e_rtsel + || hppa_fixP->fx_r_field == e_ltsel) + new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0); +#endif + else + new_val = hppa_field_adjust (* valP, 0, hppa_fixP->fx_r_field); + + /* Handle pc-relative exceptions from above. */ + if ((fmt == 12 || fmt == 17 || fmt == 22) + && fixP->fx_addsy + && fixP->fx_pcrel + && !arg_reloc_stub_needed (symbol_arg_reloc_info (fixP->fx_addsy), + hppa_fixP->fx_arg_reloc) +#ifdef OBJ_ELF + && (* valP - 8 + 8192 < 16384 + || (fmt == 17 && * valP - 8 + 262144 < 524288) + || (fmt == 22 && * valP - 8 + 8388608 < 16777216)) +#endif +#ifdef OBJ_SOM + && (* valP - 8 + 262144 < 524288 + || (fmt == 22 && * valP - 8 + 8388608 < 16777216)) #endif + && !S_IS_EXTERNAL (fixP->fx_addsy) + && !S_IS_WEAK (fixP->fx_addsy) + && S_GET_SEGMENT (fixP->fx_addsy) == hppa_fixP->segment + && !(fixP->fx_subsy + && S_GET_SEGMENT (fixP->fx_subsy) != hppa_fixP->segment)) + { + new_val = hppa_field_adjust (* valP, 0, hppa_fixP->fx_r_field); + } + + switch (fmt) + { + case 10: + CHECK_FIELD_WHERE (new_val, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val; + + insn = (insn & ~ 0x3ff1) | (((val & 0x1ff8) << 1) + | ((val & 0x2000) >> 13)); + break; + case -11: + CHECK_FIELD_WHERE (new_val, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val; + + insn = (insn & ~ 0x3ff9) | (((val & 0x1ffc) << 1) + | ((val & 0x2000) >> 13)); + break; + /* Handle all opcodes with the 'j' operand type. */ + case 14: + CHECK_FIELD_WHERE (new_val, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val; + + insn = ((insn & ~ 0x3fff) | low_sign_unext (val, 14)); + break; + + /* Handle all opcodes with the 'k' operand type. */ + case 21: + CHECK_FIELD_WHERE (new_val, 1048575, -1048576, + fixP->fx_file, fixP->fx_line); + val = new_val; + + insn = (insn & ~ 0x1fffff) | re_assemble_21 (val); + break; + + /* Handle all the opcodes with the 'i' operand type. */ + case 11: + CHECK_FIELD_WHERE (new_val, 1023, -1024, + fixP->fx_file, fixP->fx_line); + val = new_val; + + insn = (insn & ~ 0x7ff) | low_sign_unext (val, 11); + break; + + /* Handle all the opcodes with the 'w' operand type. */ + case 12: + CHECK_FIELD_WHERE (new_val - 8, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; + + insn = (insn & ~ 0x1ffd) | re_assemble_12 (val >> 2); + break; + + /* Handle some of the opcodes with the 'W' operand type. */ + case 17: + { + offsetT distance = * valP; + + /* If this is an absolute branch (ie no link) with an out of + range target, then we want to complain. */ + if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL + && (insn & 0xffe00000) == 0xe8000000) + CHECK_FIELD_WHERE (distance - 8, 262143, -262144, + fixP->fx_file, fixP->fx_line); + + CHECK_FIELD_WHERE (new_val - 8, 262143, -262144, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; + + insn = (insn & ~ 0x1f1ffd) | re_assemble_17 (val >> 2); + break; + } + + case 22: + { + offsetT distance = * valP; + + /* If this is an absolute branch (ie no link) with an out of + range target, then we want to complain. */ + if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL + && (insn & 0xffe00000) == 0xe8000000) + CHECK_FIELD_WHERE (distance - 8, 8388607, -8388608, + fixP->fx_file, fixP->fx_line); + + CHECK_FIELD_WHERE (new_val - 8, 8388607, -8388608, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; + + insn = (insn & ~ 0x3ff1ffd) | re_assemble_22 (val >> 2); + break; + } + + case -10: + val = new_val; + insn = (insn & ~ 0xfff1) | re_assemble_16 (val & -8); + break; + + case -16: + val = new_val; + insn = (insn & ~ 0xfff9) | re_assemble_16 (val & -4); + break; + + case 16: + val = new_val; + insn = (insn & ~ 0xffff) | re_assemble_16 (val); + break; + + case 32: + insn = new_val; + break; + + default: + as_bad_where (fixP->fx_file, fixP->fx_line, + _("Unknown relocation encountered in md_apply_fix.")); + return; + } + +#ifdef OBJ_ELF + switch (fixP->fx_r_type) + { + case R_PARISC_TLS_GD21L: + case R_PARISC_TLS_GD14R: + case R_PARISC_TLS_LDM21L: + case R_PARISC_TLS_LDM14R: + case R_PARISC_TLS_LE21L: + case R_PARISC_TLS_LE14R: + case R_PARISC_TLS_IE21L: + case R_PARISC_TLS_IE14R: + if (fixP->fx_addsy) + S_SET_THREAD_LOCAL (fixP->fx_addsy); + break; + default: + break; + } +#endif + + /* Insert the relocation. */ + bfd_put_32 (stdoutput, insn, fixpos); } -/* Assemble a single instruction storing it into a frag. */ -void -md_assemble (str) - char *str; +/* Exactly what point is a PC-relative offset relative TO? + On the PA, they're relative to the address of the offset. */ + +long +md_pcrel_from (fixS *fixP) { - char *to; + return fixP->fx_where + fixP->fx_frag->fr_address; +} - /* The had better be something to assemble. */ - assert (str); +/* Return nonzero if the input line pointer is at the end of + a statement. */ - /* If we are within a procedure definition, make sure we've - defined a label for the procedure; handle case where the - label was defined after the .PROC directive. +static int +is_end_of_statement (void) +{ + return ((*input_line_pointer == '\n') + || (*input_line_pointer == ';') + || (*input_line_pointer == '!')); +} - Note there's not need to diddle with the segment or fragment - for the label symbol in this case. We have already switched - into the new $CODE$ subspace at this point. */ - if (within_procedure && last_call_info->start_symbol == NULL) +#define REG_NAME_CNT (sizeof (pre_defined_registers) / sizeof (struct pd_reg)) + +/* Given NAME, find the register number associated with that name, return + the integer value associated with the given name or -1 on failure. */ + +static int +reg_name_search (char *name) +{ + int middle, low, high; + int cmp; + + low = 0; + high = REG_NAME_CNT - 1; + + do { - label_symbol_struct *label_symbol = pa_get_label (); + middle = (low + high) / 2; + cmp = strcasecmp (name, pre_defined_registers[middle].name); + if (cmp < 0) + high = middle - 1; + else if (cmp > 0) + low = middle + 1; + else + return pre_defined_registers[middle].value; + } + while (low <= high); - if (label_symbol) + return -1; +} + +/* Read a number from S. The number might come in one of many forms, + the most common will be a hex or decimal constant, but it could be + a pre-defined register (Yuk!), or an absolute symbol. + + Return 1 on success or 0 on failure. If STRICT, then a missing + register prefix will cause a failure. The number itself is + returned in `pa_number'. + + IS_FLOAT indicates that a PA-89 FP register number should be + parsed; A `l' or `r' suffix is checked for if but 2 of IS_FLOAT is + not set. + + pa_parse_number can not handle negative constants and will fail + horribly if it is passed such a constant. */ + +static int +pa_parse_number (char **s, int is_float) +{ + int num; + char *name; + char c; + symbolS *sym; + int status; + char *p = *s; + bfd_boolean have_prefix; + + /* Skip whitespace before the number. */ + while (*p == ' ' || *p == '\t') + p = p + 1; + + pa_number = -1; + have_prefix = 0; + num = 0; + if (!strict && ISDIGIT (*p)) + { + /* Looks like a number. */ + + if (*p == '0' && (*(p + 1) == 'x' || *(p + 1) == 'X')) { - if (label_symbol->lss_label) + /* The number is specified in hex. */ + p += 2; + while (ISDIGIT (*p) || ((*p >= 'a') && (*p <= 'f')) + || ((*p >= 'A') && (*p <= 'F'))) { - last_call_info->start_symbol = label_symbol->lss_label; - symbol_get_bfdsym (label_symbol->lss_label)->flags - |= BSF_FUNCTION; -#ifdef OBJ_SOM - /* Also handle allocation of a fixup to hold the unwind - information when the label appears after the proc/procend. */ - if (within_entry_exit) - { - char *where; - unsigned int u; + if (ISDIGIT (*p)) + num = num * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') + num = num * 16 + *p - 'a' + 10; + else + num = num * 16 + *p - 'A' + 10; + ++p; + } + } + else + { + /* The number is specified in decimal. */ + while (ISDIGIT (*p)) + { + num = num * 10 + *p - '0'; + ++p; + } + } - where = frag_more (0); - u = UNWIND_LOW32 (&last_call_info->ci_unwind.descriptor); - fix_new_hppa (frag_now, where - frag_now->fr_literal, 0, - NULL, (offsetT) 0, NULL, - 0, R_HPPA_ENTRY, e_fsel, 0, 0, u); + pa_number = num; + + /* Check for a `l' or `r' suffix. */ + if (is_float) + { + pa_number += FP_REG_BASE; + if (! (is_float & 2)) + { + if (IS_R_SELECT (p)) + { + pa_number += FP_REG_RSEL; + ++p; + } + else if (IS_L_SELECT (p)) + { + ++p; } -#endif + } + } + } + else if (*p == '%') + { + /* The number might be a predefined register. */ + have_prefix = 1; + name = p; + p++; + c = *p; + /* Tege hack: Special case for general registers as the general + code makes a binary search with case translation, and is VERY + slow. */ + if (c == 'r') + { + p++; + if (*p == 'e' && *(p + 1) == 't' + && (*(p + 2) == '0' || *(p + 2) == '1')) + { + p += 2; + num = *p - '0' + 28; + p++; + } + else if (*p == 'p') + { + num = 2; + p++; + } + else if (!ISDIGIT (*p)) + { + if (print_errors) + as_bad (_("Undefined register: '%s'."), name); + num = -1; } else - as_bad (_("Missing function name for .PROC (corrupted label chain)")); + { + do + num = num * 10 + *p++ - '0'; + while (ISDIGIT (*p)); + } } else - as_bad (_("Missing function name for .PROC")); + { + /* Do a normal register search. */ + while (is_part_of_name (c)) + { + p = p + 1; + c = *p; + } + *p = 0; + status = reg_name_search (name); + if (status >= 0) + num = status; + else + { + if (print_errors) + as_bad (_("Undefined register: '%s'."), name); + num = -1; + } + *p = c; + } + + pa_number = num; } + else + { + /* And finally, it could be a symbol in the absolute section which + is effectively a constant, or a register alias symbol. */ + name = p; + c = *p; + while (is_part_of_name (c)) + { + p = p + 1; + c = *p; + } + *p = 0; + if ((sym = symbol_find (name)) != NULL) + { + if (S_GET_SEGMENT (sym) == reg_section) + { + num = S_GET_VALUE (sym); + /* Well, we don't really have one, but we do have a + register, so... */ + have_prefix = TRUE; + } + else if (S_GET_SEGMENT (sym) == &bfd_abs_section) + num = S_GET_VALUE (sym); + else if (!strict) + { + if (print_errors) + as_bad (_("Non-absolute symbol: '%s'."), name); + num = -1; + } + } + else if (!strict) + { + /* There is where we'd come for an undefined symbol + or for an empty string. For an empty string we + will return zero. That's a concession made for + compatibility with the braindamaged HP assemblers. */ + if (*name == 0) + num = 0; + else + { + if (print_errors) + as_bad (_("Undefined absolute constant: '%s'."), name); + num = -1; + } + } + *p = c; - /* Assemble the instruction. Results are saved into "the_insn". */ - pa_ip (str); + pa_number = num; + } - /* Get somewhere to put the assembled instruction. */ - to = frag_more (4); + if (!strict || have_prefix) + { + *s = p; + return 1; + } + return 0; +} - /* Output the opcode. */ - md_number_to_chars (to, the_insn.opcode, 4); +/* Return nonzero if the given INSN and L/R information will require + a new PA-1.1 opcode. */ - /* If necessary output more stuff. */ - if (the_insn.reloc != R_HPPA_NONE) - fix_new_hppa (frag_now, (to - frag_now->fr_literal), 4, NULL, - (offsetT) 0, &the_insn.exp, the_insn.pcrel, - the_insn.reloc, the_insn.field_selector, - the_insn.format, the_insn.arg_reloc, 0); +static int +need_pa11_opcode (void) +{ + if ((pa_number & FP_REG_RSEL) != 0 + && !(the_insn.fpof1 == DBL && the_insn.fpof2 == DBL)) + { + /* If this instruction is specific to a particular architecture, + then set a new architecture. */ + if (bfd_get_mach (stdoutput) < pa11) + { + if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, pa11)) + as_warn (_("could not update architecture and machine")); + } + return TRUE; + } + else + return FALSE; +} -#ifdef OBJ_ELF - dwarf2_emit_insn (4); +/* Parse a condition for a fcmp instruction. Return the numerical + code associated with the condition. */ + +static int +pa_parse_fp_cmp_cond (char **s) +{ + int cond, i; + + cond = 0; + + for (i = 0; i < 32; i++) + { + if (strncasecmp (*s, fp_cond_map[i].string, + strlen (fp_cond_map[i].string)) == 0) + { + cond = fp_cond_map[i].cond; + *s += strlen (fp_cond_map[i].string); + /* If not a complete match, back up the input string and + report an error. */ + if (**s != ' ' && **s != '\t') + { + *s -= strlen (fp_cond_map[i].string); + break; + } + while (**s == ' ' || **s == '\t') + *s = *s + 1; + return cond; + } + } + + as_bad (_("Invalid FP Compare Condition: %s"), *s); + + /* Advance over the bogus completer. */ + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + + return 0; +} + +/* Parse a graphics test complete for ftest. */ + +static int +pa_parse_ftest_gfx_completer (char **s) +{ + int value; + + value = 0; + if (strncasecmp (*s, "acc8", 4) == 0) + { + value = 5; + *s += 4; + } + else if (strncasecmp (*s, "acc6", 4) == 0) + { + value = 9; + *s += 4; + } + else if (strncasecmp (*s, "acc4", 4) == 0) + { + value = 13; + *s += 4; + } + else if (strncasecmp (*s, "acc2", 4) == 0) + { + value = 17; + *s += 4; + } + else if (strncasecmp (*s, "acc", 3) == 0) + { + value = 1; + *s += 3; + } + else if (strncasecmp (*s, "rej8", 4) == 0) + { + value = 6; + *s += 4; + } + else if (strncasecmp (*s, "rej", 3) == 0) + { + value = 2; + *s += 3; + } + else + { + value = 0; + as_bad (_("Invalid FTEST completer: %s"), *s); + } + + return value; +} + +/* Parse an FP operand format completer returning the completer + type. */ + +static fp_operand_format +pa_parse_fp_cnv_format (char **s) +{ + int format; + + format = SGL; + if (**s == ',') + { + *s += 1; + if (strncasecmp (*s, "sgl", 3) == 0) + { + format = SGL; + *s += 4; + } + else if (strncasecmp (*s, "dbl", 3) == 0) + { + format = DBL; + *s += 4; + } + else if (strncasecmp (*s, "quad", 4) == 0) + { + format = QUAD; + *s += 5; + } + else if (strncasecmp (*s, "w", 1) == 0) + { + format = W; + *s += 2; + } + else if (strncasecmp (*s, "uw", 2) == 0) + { + format = UW; + *s += 3; + } + else if (strncasecmp (*s, "dw", 2) == 0) + { + format = DW; + *s += 3; + } + else if (strncasecmp (*s, "udw", 3) == 0) + { + format = UDW; + *s += 4; + } + else if (strncasecmp (*s, "qw", 2) == 0) + { + format = QW; + *s += 3; + } + else if (strncasecmp (*s, "uqw", 3) == 0) + { + format = UQW; + *s += 4; + } + else + { + format = ILLEGAL_FMT; + as_bad (_("Invalid FP Operand Format: %3s"), *s); + } + } + + return format; +} + +/* Parse an FP operand format completer returning the completer + type. */ + +static fp_operand_format +pa_parse_fp_format (char **s) +{ + int format; + + format = SGL; + if (**s == ',') + { + *s += 1; + if (strncasecmp (*s, "sgl", 3) == 0) + { + format = SGL; + *s += 4; + } + else if (strncasecmp (*s, "dbl", 3) == 0) + { + format = DBL; + *s += 4; + } + else if (strncasecmp (*s, "quad", 4) == 0) + { + format = QUAD; + *s += 5; + } + else + { + format = ILLEGAL_FMT; + as_bad (_("Invalid FP Operand Format: %3s"), *s); + } + } + + return format; +} + +/* Convert from a selector string into a selector type. */ + +static int +pa_chk_field_selector (char **str) +{ + int middle, low, high; + int cmp; + char name[4]; + + /* Read past any whitespace. */ + /* FIXME: should we read past newlines and formfeeds??? */ + while (**str == ' ' || **str == '\t' || **str == '\n' || **str == '\f') + *str = *str + 1; + + if ((*str)[1] == '\'' || (*str)[1] == '%') + name[0] = TOLOWER ((*str)[0]), + name[1] = 0; + else if ((*str)[2] == '\'' || (*str)[2] == '%') + name[0] = TOLOWER ((*str)[0]), + name[1] = TOLOWER ((*str)[1]), + name[2] = 0; + else if ((*str)[3] == '\'' || (*str)[3] == '%') + name[0] = TOLOWER ((*str)[0]), + name[1] = TOLOWER ((*str)[1]), + name[2] = TOLOWER ((*str)[2]), + name[3] = 0; + else + return e_fsel; + + low = 0; + high = sizeof (selector_table) / sizeof (struct selector_entry) - 1; + + do + { + middle = (low + high) / 2; + cmp = strcmp (name, selector_table[middle].prefix); + if (cmp < 0) + high = middle - 1; + else if (cmp > 0) + low = middle + 1; + else + { + *str += strlen (name) + 1; +#ifndef OBJ_SOM + if (selector_table[middle].field_selector == e_nsel) + return e_fsel; #endif + return selector_table[middle].field_selector; + } + } + while (low <= high); + + return e_fsel; +} + +/* Parse a .byte, .word, .long expression for the HPPA. Called by + cons via the TC_PARSE_CONS_EXPRESSION macro. */ + +void +parse_cons_expression_hppa (expressionS *exp) +{ + hppa_field_selector = pa_chk_field_selector (&input_line_pointer); + expression (exp); +} + +/* Evaluate an absolute expression EXP which may be modified by + the selector FIELD_SELECTOR. Return the value of the expression. */ +static int +evaluate_absolute (struct pa_it *insn) +{ + offsetT value; + expressionS exp; + int field_selector = insn->field_selector; + + exp = insn->exp; + value = exp.X_add_number; + + return hppa_field_adjust (0, value, field_selector); +} + +/* Mark (via expr_end) the end of an absolute expression. FIXME. */ + +static int +pa_get_absolute_expression (struct pa_it *insn, char **strp) +{ + char *save_in; + + insn->field_selector = pa_chk_field_selector (strp); + save_in = input_line_pointer; + input_line_pointer = *strp; + expression (&insn->exp); + /* This is not perfect, but is a huge improvement over doing nothing. + + The PA assembly syntax is ambiguous in a variety of ways. Consider + this string "4 %r5" Is that the number 4 followed by the register + r5, or is that 4 MOD r5? + + If we get a modulo expression when looking for an absolute, we try + again cutting off the input string at the first whitespace character. */ + if (insn->exp.X_op == O_modulus) + { + char *s, c; + int retval; + + input_line_pointer = *strp; + s = *strp; + while (*s != ',' && *s != ' ' && *s != '\t') + s++; + + c = *s; + *s = 0; + + retval = pa_get_absolute_expression (insn, strp); + + input_line_pointer = save_in; + *s = c; + return evaluate_absolute (insn); + } + /* When in strict mode we have a non-match, fix up the pointers + and return to our caller. */ + if (insn->exp.X_op != O_constant && strict) + { + expr_end = input_line_pointer; + input_line_pointer = save_in; + return 0; + } + if (insn->exp.X_op != O_constant) + { + as_bad (_("Bad segment (should be absolute).")); + expr_end = input_line_pointer; + input_line_pointer = save_in; + return 0; + } + expr_end = input_line_pointer; + input_line_pointer = save_in; + return evaluate_absolute (insn); +} + +/* Given an argument location specification return the associated + argument location number. */ + +static unsigned int +pa_build_arg_reloc (char *type_name) +{ + + if (strncasecmp (type_name, "no", 2) == 0) + return 0; + if (strncasecmp (type_name, "gr", 2) == 0) + return 1; + else if (strncasecmp (type_name, "fr", 2) == 0) + return 2; + else if (strncasecmp (type_name, "fu", 2) == 0) + return 3; + else + as_bad (_("Invalid argument location: %s\n"), type_name); + + return 0; +} + +/* Encode and return an argument relocation specification for + the given register in the location specified by arg_reloc. */ + +static unsigned int +pa_align_arg_reloc (unsigned int reg, unsigned int arg_reloc) +{ + unsigned int new_reloc; + + new_reloc = arg_reloc; + switch (reg) + { + case 0: + new_reloc <<= 8; + break; + case 1: + new_reloc <<= 6; + break; + case 2: + new_reloc <<= 4; + break; + case 3: + new_reloc <<= 2; + break; + default: + as_bad (_("Invalid argument description: %d"), reg); + } + + return new_reloc; +} + +/* Parse a non-negated compare/subtract completer returning the + number (for encoding in instructions) of the given completer. */ + +static int +pa_parse_nonneg_cmpsub_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; + + cmpltr = 0; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + + if (strcmp (name, "=") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, "<") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, "<=") == 0) + { + cmpltr = 3; + } + else if (strcmp (name, "<<") == 0) + { + cmpltr = 4; + } + else if (strcmp (name, "<<=") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "sv") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "od") == 0) + { + cmpltr = 7; + } + /* If we have something like addb,n then there is no condition + completer. */ + else if (strcasecmp (name, "n") == 0) + { + cmpltr = 0; + nullify = 1; + } + else + { + cmpltr = -1; + } + **s = c; + } + + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; + + return cmpltr; +} + +/* Parse a negated compare/subtract completer returning the + number (for encoding in instructions) of the given completer. */ + +static int +pa_parse_neg_cmpsub_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; + + cmpltr = 0; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + + if (strcasecmp (name, "tr") == 0) + { + cmpltr = 0; + } + else if (strcmp (name, "<>") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, ">=") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, ">") == 0) + { + cmpltr = 3; + } + else if (strcmp (name, ">>=") == 0) + { + cmpltr = 4; + } + else if (strcmp (name, ">>") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "nsv") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "ev") == 0) + { + cmpltr = 7; + } + /* If we have something like addb,n then there is no condition + completer. */ + else if (strcasecmp (name, "n") == 0) + { + cmpltr = 0; + nullify = 1; + } + else + { + cmpltr = -1; + } + **s = c; + } + + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; + + return cmpltr; +} + +/* Parse a 64 bit compare and branch completer returning the number (for + encoding in instructions) of the given completer. + + Nonnegated comparisons are returned as 0-7, negated comparisons are + returned as 8-15. */ + +static int +pa_parse_cmpb_64_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + + cmpltr = -1; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + + if (strcmp (name, "*") == 0) + { + cmpltr = 0; + } + else if (strcmp (name, "*=") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, "*<") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, "*<=") == 0) + { + cmpltr = 3; + } + else if (strcmp (name, "*<<") == 0) + { + cmpltr = 4; + } + else if (strcmp (name, "*<<=") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "*sv") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "*od") == 0) + { + cmpltr = 7; + } + else if (strcasecmp (name, "*tr") == 0) + { + cmpltr = 8; + } + else if (strcmp (name, "*<>") == 0) + { + cmpltr = 9; + } + else if (strcmp (name, "*>=") == 0) + { + cmpltr = 10; + } + else if (strcmp (name, "*>") == 0) + { + cmpltr = 11; + } + else if (strcmp (name, "*>>=") == 0) + { + cmpltr = 12; + } + else if (strcmp (name, "*>>") == 0) + { + cmpltr = 13; + } + else if (strcasecmp (name, "*nsv") == 0) + { + cmpltr = 14; + } + else if (strcasecmp (name, "*ev") == 0) + { + cmpltr = 15; + } + else + { + cmpltr = -1; + } + **s = c; + } + + return cmpltr; +} + +/* Parse a 64 bit compare immediate and branch completer returning the number + (for encoding in instructions) of the given completer. */ + +static int +pa_parse_cmpib_64_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + + cmpltr = -1; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + + if (strcmp (name, "*<<") == 0) + { + cmpltr = 0; + } + else if (strcmp (name, "*=") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, "*<") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, "*<=") == 0) + { + cmpltr = 3; + } + else if (strcmp (name, "*>>=") == 0) + { + cmpltr = 4; + } + else if (strcmp (name, "*<>") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "*>=") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "*>") == 0) + { + cmpltr = 7; + } + else + { + cmpltr = -1; + } + **s = c; + } + + return cmpltr; +} + +/* Parse a non-negated addition completer returning the number + (for encoding in instructions) of the given completer. */ + +static int +pa_parse_nonneg_add_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; + + cmpltr = 0; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + if (strcmp (name, "=") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, "<") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, "<=") == 0) + { + cmpltr = 3; + } + else if (strcasecmp (name, "nuv") == 0) + { + cmpltr = 4; + } + else if (strcasecmp (name, "znv") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "sv") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "od") == 0) + { + cmpltr = 7; + } + /* If we have something like addb,n then there is no condition + completer. */ + else if (strcasecmp (name, "n") == 0) + { + cmpltr = 0; + nullify = 1; + } + else + { + cmpltr = -1; + } + **s = c; + } + + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; + + return cmpltr; +} + +/* Parse a negated addition completer returning the number + (for encoding in instructions) of the given completer. */ + +static int +pa_parse_neg_add_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; + + cmpltr = 0; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + if (strcasecmp (name, "tr") == 0) + { + cmpltr = 0; + } + else if (strcmp (name, "<>") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, ">=") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, ">") == 0) + { + cmpltr = 3; + } + else if (strcasecmp (name, "uv") == 0) + { + cmpltr = 4; + } + else if (strcasecmp (name, "vnz") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "nsv") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "ev") == 0) + { + cmpltr = 7; + } + /* If we have something like addb,n then there is no condition + completer. */ + else if (strcasecmp (name, "n") == 0) + { + cmpltr = 0; + nullify = 1; + } + else + { + cmpltr = -1; + } + **s = c; + } + + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; + + return cmpltr; +} + +/* Parse a 64 bit wide mode add and branch completer returning the number (for + encoding in instructions) of the given completer. */ + +static int +pa_parse_addb_64_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; + + cmpltr = 0; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + if (strcmp (name, "=") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, "<") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, "<=") == 0) + { + cmpltr = 3; + } + else if (strcasecmp (name, "nuv") == 0) + { + cmpltr = 4; + } + else if (strcasecmp (name, "*=") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "*<") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "*<=") == 0) + { + cmpltr = 7; + } + else if (strcmp (name, "tr") == 0) + { + cmpltr = 8; + } + else if (strcmp (name, "<>") == 0) + { + cmpltr = 9; + } + else if (strcmp (name, ">=") == 0) + { + cmpltr = 10; + } + else if (strcmp (name, ">") == 0) + { + cmpltr = 11; + } + else if (strcasecmp (name, "uv") == 0) + { + cmpltr = 12; + } + else if (strcasecmp (name, "*<>") == 0) + { + cmpltr = 13; + } + else if (strcasecmp (name, "*>=") == 0) + { + cmpltr = 14; + } + else if (strcasecmp (name, "*>") == 0) + { + cmpltr = 15; + } + /* If we have something like addb,n then there is no condition + completer. */ + else if (strcasecmp (name, "n") == 0) + { + cmpltr = 0; + nullify = 1; + } + else + { + cmpltr = -1; + } + **s = c; + } + + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; + + return cmpltr; } /* Do the real work for assembling a single instruction. Store results into the global "the_insn" variable. */ static void -pa_ip (str) - char *str; +pa_ip (char *str) { char *error_message = ""; char *s, c, *argstart, *name, *save_s; @@ -1634,9 +3271,7 @@ pa_ip (str) } if (comma) - { - *--s = ','; - } + *--s = ','; /* Mark the location where arguments for the instruction start, then start processing them. */ @@ -1664,7 +3299,6 @@ pa_ip (str) switch (*args) { - /* End of arguments. */ case '\0': if (*s == '\0') @@ -2974,6 +4608,18 @@ pa_ip (str) the_insn.reloc = R_HPPA_GOTOFF; else if (is_PC_relative (the_insn.exp)) the_insn.reloc = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif else the_insn.reloc = R_HPPA; the_insn.format = 11; @@ -3093,6 +4739,18 @@ pa_ip (str) the_insn.reloc = R_HPPA_GOTOFF; else if (is_PC_relative (the_insn.exp)) the_insn.reloc = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif else the_insn.reloc = R_HPPA; the_insn.format = 14; @@ -3123,6 +4781,18 @@ pa_ip (str) the_insn.reloc = R_HPPA_GOTOFF; else if (is_PC_relative (the_insn.exp)) the_insn.reloc = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif else the_insn.reloc = R_HPPA; the_insn.format = 14; @@ -3147,6 +4817,18 @@ pa_ip (str) the_insn.reloc = R_HPPA_GOTOFF; else if (is_PC_relative (the_insn.exp)) the_insn.reloc = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif else the_insn.reloc = R_HPPA; the_insn.format = 14; @@ -3171,6 +4853,18 @@ pa_ip (str) the_insn.reloc = R_HPPA_GOTOFF; else if (is_PC_relative (the_insn.exp)) the_insn.reloc = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif else the_insn.reloc = R_HPPA; the_insn.format = 21; @@ -3196,6 +4890,18 @@ pa_ip (str) the_insn.reloc = R_HPPA_GOTOFF; else if (is_PC_relative (the_insn.exp)) the_insn.reloc = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif else the_insn.reloc = R_HPPA; the_insn.format = 14; @@ -3222,6 +4928,18 @@ pa_ip (str) the_insn.reloc = R_HPPA_GOTOFF; else if (is_PC_relative (the_insn.exp)) the_insn.reloc = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif else the_insn.reloc = R_HPPA; the_insn.format = 14; @@ -3248,6 +4966,18 @@ pa_ip (str) the_insn.reloc = R_HPPA_GOTOFF; else if (is_PC_relative (the_insn.exp)) the_insn.reloc = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif else the_insn.reloc = R_HPPA; the_insn.format = 14; @@ -3992,1950 +5722,83 @@ pa_ip (str) the_insn.opcode = opcode; } -/* Turn a string in input_line_pointer into a floating point constant of type - type, and store the appropriate bytes in *litP. The number of LITTLENUMS - emitted is stored in *sizeP . An error message or NULL is returned. */ - -#define MAX_LITTLENUMS 6 - -char * -md_atof (type, litP, sizeP) - char type; - char *litP; - int *sizeP; -{ - int prec; - LITTLENUM_TYPE words[MAX_LITTLENUMS]; - LITTLENUM_TYPE *wordP; - char *t; - - switch (type) - { - - case 'f': - case 'F': - case 's': - case 'S': - prec = 2; - break; - - case 'd': - case 'D': - case 'r': - case 'R': - prec = 4; - break; - - case 'x': - case 'X': - prec = 6; - break; - - case 'p': - case 'P': - prec = 6; - break; - - default: - *sizeP = 0; - return _("Bad call to MD_ATOF()"); - } - t = atof_ieee (input_line_pointer, type, words); - if (t) - input_line_pointer = t; - *sizeP = prec * sizeof (LITTLENUM_TYPE); - for (wordP = words; prec--;) - { - md_number_to_chars (litP, (valueT) (*wordP++), sizeof (LITTLENUM_TYPE)); - litP += sizeof (LITTLENUM_TYPE); - } - return NULL; -} - -/* Write out big-endian. */ +/* Assemble a single instruction storing it into a frag. */ void -md_number_to_chars (buf, val, n) - char *buf; - valueT val; - int n; +md_assemble (char *str) { - number_to_chars_bigendian (buf, val, n); -} - -/* Translate internal representation of relocation info to BFD target - format. */ - -arelent ** -tc_gen_reloc (section, fixp) - asection *section; - fixS *fixp; -{ - arelent *reloc; - struct hppa_fix_struct *hppa_fixp; - static arelent *no_relocs = NULL; - arelent **relocs; - reloc_type **codes; - reloc_type code; - int n_relocs; - int i; - - hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data; - if (fixp->fx_addsy == 0) - return &no_relocs; - - assert (hppa_fixp != 0); - assert (section != 0); - - reloc = (arelent *) xmalloc (sizeof (arelent)); - - reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); - codes = hppa_gen_reloc_type (stdoutput, - fixp->fx_r_type, - hppa_fixp->fx_r_format, - hppa_fixp->fx_r_field, - fixp->fx_subsy != NULL, - symbol_get_bfdsym (fixp->fx_addsy)); - - if (codes == NULL) - { - as_bad_where (fixp->fx_file, fixp->fx_line, _("Cannot handle fixup")); - abort (); - } - - for (n_relocs = 0; codes[n_relocs]; n_relocs++) - ; - - relocs = (arelent **) xmalloc (sizeof (arelent *) * n_relocs + 1); - reloc = (arelent *) xmalloc (sizeof (arelent) * n_relocs); - for (i = 0; i < n_relocs; i++) - relocs[i] = &reloc[i]; - - relocs[n_relocs] = NULL; - -#ifdef OBJ_ELF - switch (fixp->fx_r_type) - { - default: - assert (n_relocs == 1); - - code = *codes[0]; - - /* Now, do any processing that is dependent on the relocation type. */ - switch (code) - { - case R_PARISC_DLTREL21L: - case R_PARISC_DLTREL14R: - case R_PARISC_DLTREL14F: - case R_PARISC_PLABEL32: - case R_PARISC_PLABEL21L: - case R_PARISC_PLABEL14R: - /* For plabel relocations, the addend of the - relocation should be either 0 (no static link) or 2 - (static link required). This adjustment is done in - bfd/elf32-hppa.c:elf32_hppa_relocate_section. - - We also slam a zero addend into the DLT relative relocs; - it doesn't make a lot of sense to use any addend since - it gets you a different (eg unknown) DLT entry. */ - reloc->addend = 0; - break; - -#ifdef ELF_ARG_RELOC - case R_PARISC_PCREL17R: - case R_PARISC_PCREL17F: - case R_PARISC_PCREL17C: - case R_PARISC_DIR17R: - case R_PARISC_DIR17F: - case R_PARISC_PCREL21L: - case R_PARISC_DIR21L: - reloc->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc, - fixp->fx_offset); - break; -#endif - - case R_PARISC_DIR32: - /* Facilitate hand-crafted unwind info. */ - if (strcmp (section->name, UNWIND_SECTION_NAME) == 0) - code = R_PARISC_SEGREL32; - /* Fall thru */ - - default: - reloc->addend = fixp->fx_offset; - break; - } + char *to; - reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); - reloc->howto = bfd_reloc_type_lookup (stdoutput, - (bfd_reloc_code_real_type) code); - reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; + /* The had better be something to assemble. */ + assert (str); - assert (reloc->howto && (unsigned int) code == reloc->howto->type); - break; - } -#else /* OBJ_SOM */ + /* If we are within a procedure definition, make sure we've + defined a label for the procedure; handle case where the + label was defined after the .PROC directive. - /* Walk over reach relocation returned by the BFD backend. */ - for (i = 0; i < n_relocs; i++) + Note there's not need to diddle with the segment or fragment + for the label symbol in this case. We have already switched + into the new $CODE$ subspace at this point. */ + if (within_procedure && last_call_info->start_symbol == NULL) { - code = *codes[i]; - - relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); - relocs[i]->howto = - bfd_reloc_type_lookup (stdoutput, - (bfd_reloc_code_real_type) code); - relocs[i]->address = fixp->fx_frag->fr_address + fixp->fx_where; - - switch (code) - { - case R_COMP2: - /* The only time we ever use a R_COMP2 fixup is for the difference - of two symbols. With that in mind we fill in all four - relocs now and break out of the loop. */ - assert (i == 1); - relocs[0]->sym_ptr_ptr - = (asymbol **) bfd_abs_section_ptr->symbol_ptr_ptr; - relocs[0]->howto - = bfd_reloc_type_lookup (stdoutput, - (bfd_reloc_code_real_type) *codes[0]); - relocs[0]->address = fixp->fx_frag->fr_address + fixp->fx_where; - relocs[0]->addend = 0; - relocs[1]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *relocs[1]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); - relocs[1]->howto - = bfd_reloc_type_lookup (stdoutput, - (bfd_reloc_code_real_type) *codes[1]); - relocs[1]->address = fixp->fx_frag->fr_address + fixp->fx_where; - relocs[1]->addend = 0; - relocs[2]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *relocs[2]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_subsy); - relocs[2]->howto - = bfd_reloc_type_lookup (stdoutput, - (bfd_reloc_code_real_type) *codes[2]); - relocs[2]->address = fixp->fx_frag->fr_address + fixp->fx_where; - relocs[2]->addend = 0; - relocs[3]->sym_ptr_ptr - = (asymbol **) bfd_abs_section_ptr->symbol_ptr_ptr; - relocs[3]->howto - = bfd_reloc_type_lookup (stdoutput, - (bfd_reloc_code_real_type) *codes[3]); - relocs[3]->address = fixp->fx_frag->fr_address + fixp->fx_where; - relocs[3]->addend = 0; - relocs[4]->sym_ptr_ptr - = (asymbol **) bfd_abs_section_ptr->symbol_ptr_ptr; - relocs[4]->howto - = bfd_reloc_type_lookup (stdoutput, - (bfd_reloc_code_real_type) *codes[4]); - relocs[4]->address = fixp->fx_frag->fr_address + fixp->fx_where; - relocs[4]->addend = 0; - goto done; - case R_PCREL_CALL: - case R_ABS_CALL: - relocs[i]->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc, 0); - break; - - case R_DLT_REL: - case R_DATA_PLABEL: - case R_CODE_PLABEL: - /* For plabel relocations, the addend of the - relocation should be either 0 (no static link) or 2 - (static link required). - - FIXME: We always assume no static link! - - We also slam a zero addend into the DLT relative relocs; - it doesn't make a lot of sense to use any addend since - it gets you a different (eg unknown) DLT entry. */ - relocs[i]->addend = 0; - break; - - case R_N_MODE: - case R_S_MODE: - case R_D_MODE: - case R_R_MODE: - case R_FSEL: - case R_LSEL: - case R_RSEL: - case R_BEGIN_BRTAB: - case R_END_BRTAB: - case R_BEGIN_TRY: - case R_N0SEL: - case R_N1SEL: - /* There is no symbol or addend associated with these fixups. */ - relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); - relocs[i]->addend = 0; - break; - - case R_END_TRY: - case R_ENTRY: - case R_EXIT: - /* There is no symbol associated with these fixups. */ - relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); - relocs[i]->addend = fixp->fx_offset; - break; - - default: - relocs[i]->addend = fixp->fx_offset; - } - } - - done: -#endif - - return relocs; -} - -/* Process any machine dependent frag types. */ - -void -md_convert_frag (abfd, sec, fragP) - register bfd *abfd ATTRIBUTE_UNUSED; - register asection *sec ATTRIBUTE_UNUSED; - register fragS *fragP; -{ - unsigned int address; + label_symbol_struct *label_symbol = pa_get_label (); - if (fragP->fr_type == rs_machine_dependent) - { - switch ((int) fragP->fr_subtype) + if (label_symbol) { - case 0: - fragP->fr_type = rs_fill; - know (fragP->fr_var == 1); - know (fragP->fr_next); - address = fragP->fr_address + fragP->fr_fix; - if (address % fragP->fr_offset) + if (label_symbol->lss_label) { - fragP->fr_offset = - fragP->fr_next->fr_address - - fragP->fr_address - - fragP->fr_fix; - } - else - fragP->fr_offset = 0; - break; - } - } -} - -/* Round up a section size to the appropriate boundary. */ - -valueT -md_section_align (segment, size) - asection *segment; - valueT size; -{ - int align = bfd_get_section_alignment (stdoutput, segment); - int align2 = (1 << align) - 1; - - return (size + align2) & ~align2; -} - -/* Return the approximate size of a frag before relaxation has occurred. */ -int -md_estimate_size_before_relax (fragP, segment) - register fragS *fragP; - asection *segment ATTRIBUTE_UNUSED; -{ - int size; - - size = 0; - - while ((fragP->fr_fix + size) % fragP->fr_offset) - size++; - - return size; -} - -#ifdef OBJ_ELF -# ifdef WARN_COMMENTS -const char *md_shortopts = "Vc"; -# else -const char *md_shortopts = "V"; -# endif -#else -# ifdef WARN_COMMENTS -const char *md_shortopts = "c"; -# else -const char *md_shortopts = ""; -# endif -#endif - -struct option md_longopts[] = { -#ifdef WARN_COMMENTS - {"warn-comment", no_argument, NULL, 'c'}, -#endif - {NULL, no_argument, NULL, 0} -}; -size_t md_longopts_size = sizeof (md_longopts); - -int -md_parse_option (c, arg) - int c ATTRIBUTE_UNUSED; - char *arg ATTRIBUTE_UNUSED; -{ - switch (c) - { - default: - return 0; - -#ifdef OBJ_ELF - case 'V': - print_version_id (); - break; -#endif -#ifdef WARN_COMMENTS - case 'c': - warn_comment = 1; - break; -#endif - } - - return 1; -} - -void -md_show_usage (stream) - FILE *stream ATTRIBUTE_UNUSED; -{ -#ifdef OBJ_ELF - fprintf (stream, _("\ - -Q ignored\n")); -#endif -#ifdef WARN_COMMENTS - fprintf (stream, _("\ - -c print a warning if a comment is found\n")); -#endif -} - -/* We have no need to default values of symbols. */ - -symbolS * -md_undefined_symbol (name) - char *name ATTRIBUTE_UNUSED; -{ - return 0; -} - -#if defined (OBJ_SOM) || defined (ELF_ARG_RELOC) -#define nonzero_dibits(x) \ - ((x) | (((x) & 0x55555555) << 1) | (((x) & 0xAAAAAAAA) >> 1)) -#define arg_reloc_stub_needed(CALLER, CALLEE) \ - (((CALLER) ^ (CALLEE)) & nonzero_dibits (CALLER) & nonzero_dibits (CALLEE)) -#else -#define arg_reloc_stub_needed(CALLER, CALLEE) 0 -#endif - -/* Apply a fixup to an instruction. */ - -void -md_apply_fix (fixP, valP, seg) - fixS *fixP; - valueT *valP; - segT seg ATTRIBUTE_UNUSED; -{ - char *fixpos; - struct hppa_fix_struct *hppa_fixP; - offsetT new_val; - int insn, val, fmt; - - /* SOM uses R_HPPA_ENTRY and R_HPPA_EXIT relocations which can - never be "applied" (they are just markers). Likewise for - R_HPPA_BEGIN_BRTAB and R_HPPA_END_BRTAB. */ -#ifdef OBJ_SOM - if (fixP->fx_r_type == R_HPPA_ENTRY - || fixP->fx_r_type == R_HPPA_EXIT - || fixP->fx_r_type == R_HPPA_BEGIN_BRTAB - || fixP->fx_r_type == R_HPPA_END_BRTAB - || fixP->fx_r_type == R_HPPA_BEGIN_TRY) - return; - - /* Disgusting. We must set fx_offset ourselves -- R_HPPA_END_TRY - fixups are considered not adjustable, which in turn causes - adjust_reloc_syms to not set fx_offset. Ugh. */ - if (fixP->fx_r_type == R_HPPA_END_TRY) - { - fixP->fx_offset = * valP; - return; - } -#endif -#ifdef OBJ_ELF - if (fixP->fx_r_type == (int) R_PARISC_GNU_VTENTRY - || fixP->fx_r_type == (int) R_PARISC_GNU_VTINHERIT) - return; -#endif - - if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0) - fixP->fx_done = 1; - - /* There should be a HPPA specific fixup associated with the GAS fixup. */ - hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data; - if (hppa_fixP == NULL) - { - as_bad_where (fixP->fx_file, fixP->fx_line, - _("no hppa_fixup entry for fixup type 0x%x"), - fixP->fx_r_type); - return; - } - - fixpos = fixP->fx_frag->fr_literal + fixP->fx_where; - - if (fixP->fx_size != 4 || hppa_fixP->fx_r_format == 32) - { - /* Handle constant output. */ - number_to_chars_bigendian (fixpos, *valP, fixP->fx_size); - return; - } - - insn = bfd_get_32 (stdoutput, fixpos); - fmt = bfd_hppa_insn2fmt (stdoutput, insn); - - /* If there is a symbol associated with this fixup, then it's something - which will need a SOM relocation (except for some PC-relative relocs). - In such cases we should treat the "val" or "addend" as zero since it - will be added in as needed from fx_offset in tc_gen_reloc. */ - if ((fixP->fx_addsy != NULL - || fixP->fx_r_type == (int) R_HPPA_NONE) -#ifdef OBJ_SOM - && fmt != 32 -#endif - ) - new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0); -#ifdef OBJ_SOM - /* These field selectors imply that we do not want an addend. */ - else if (hppa_fixP->fx_r_field == e_psel - || hppa_fixP->fx_r_field == e_rpsel - || hppa_fixP->fx_r_field == e_lpsel - || hppa_fixP->fx_r_field == e_tsel - || hppa_fixP->fx_r_field == e_rtsel - || hppa_fixP->fx_r_field == e_ltsel) - new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0); -#endif - else - new_val = hppa_field_adjust (* valP, 0, hppa_fixP->fx_r_field); - - /* Handle pc-relative exceptions from above. */ - if ((fmt == 12 || fmt == 17 || fmt == 22) - && fixP->fx_addsy - && fixP->fx_pcrel - && !arg_reloc_stub_needed (symbol_arg_reloc_info (fixP->fx_addsy), - hppa_fixP->fx_arg_reloc) -#ifdef OBJ_ELF - && (* valP - 8 + 8192 < 16384 - || (fmt == 17 && * valP - 8 + 262144 < 524288) - || (fmt == 22 && * valP - 8 + 8388608 < 16777216)) -#endif + last_call_info->start_symbol = label_symbol->lss_label; + symbol_get_bfdsym (label_symbol->lss_label)->flags + |= BSF_FUNCTION; #ifdef OBJ_SOM - && (* valP - 8 + 262144 < 524288 - || (fmt == 22 && * valP - 8 + 8388608 < 16777216)) -#endif - && !S_IS_EXTERNAL (fixP->fx_addsy) - && !S_IS_WEAK (fixP->fx_addsy) - && S_GET_SEGMENT (fixP->fx_addsy) == hppa_fixP->segment - && !(fixP->fx_subsy - && S_GET_SEGMENT (fixP->fx_subsy) != hppa_fixP->segment)) - { - new_val = hppa_field_adjust (* valP, 0, hppa_fixP->fx_r_field); - } - - switch (fmt) - { - case 10: - CHECK_FIELD_WHERE (new_val, 8191, -8192, - fixP->fx_file, fixP->fx_line); - val = new_val; - - insn = (insn & ~ 0x3ff1) | (((val & 0x1ff8) << 1) - | ((val & 0x2000) >> 13)); - break; - case -11: - CHECK_FIELD_WHERE (new_val, 8191, -8192, - fixP->fx_file, fixP->fx_line); - val = new_val; - - insn = (insn & ~ 0x3ff9) | (((val & 0x1ffc) << 1) - | ((val & 0x2000) >> 13)); - break; - /* Handle all opcodes with the 'j' operand type. */ - case 14: - CHECK_FIELD_WHERE (new_val, 8191, -8192, - fixP->fx_file, fixP->fx_line); - val = new_val; - - insn = ((insn & ~ 0x3fff) | low_sign_unext (val, 14)); - break; - - /* Handle all opcodes with the 'k' operand type. */ - case 21: - CHECK_FIELD_WHERE (new_val, 1048575, -1048576, - fixP->fx_file, fixP->fx_line); - val = new_val; - - insn = (insn & ~ 0x1fffff) | re_assemble_21 (val); - break; - - /* Handle all the opcodes with the 'i' operand type. */ - case 11: - CHECK_FIELD_WHERE (new_val, 1023, -1024, - fixP->fx_file, fixP->fx_line); - val = new_val; - - insn = (insn & ~ 0x7ff) | low_sign_unext (val, 11); - break; - - /* Handle all the opcodes with the 'w' operand type. */ - case 12: - CHECK_FIELD_WHERE (new_val - 8, 8191, -8192, - fixP->fx_file, fixP->fx_line); - val = new_val - 8; - - insn = (insn & ~ 0x1ffd) | re_assemble_12 (val >> 2); - break; - - /* Handle some of the opcodes with the 'W' operand type. */ - case 17: - { - offsetT distance = * valP; - - /* If this is an absolute branch (ie no link) with an out of - range target, then we want to complain. */ - if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL - && (insn & 0xffe00000) == 0xe8000000) - CHECK_FIELD_WHERE (distance - 8, 262143, -262144, - fixP->fx_file, fixP->fx_line); - - CHECK_FIELD_WHERE (new_val - 8, 262143, -262144, - fixP->fx_file, fixP->fx_line); - val = new_val - 8; - - insn = (insn & ~ 0x1f1ffd) | re_assemble_17 (val >> 2); - break; - } - - case 22: - { - offsetT distance = * valP; - - /* If this is an absolute branch (ie no link) with an out of - range target, then we want to complain. */ - if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL - && (insn & 0xffe00000) == 0xe8000000) - CHECK_FIELD_WHERE (distance - 8, 8388607, -8388608, - fixP->fx_file, fixP->fx_line); - - CHECK_FIELD_WHERE (new_val - 8, 8388607, -8388608, - fixP->fx_file, fixP->fx_line); - val = new_val - 8; - - insn = (insn & ~ 0x3ff1ffd) | re_assemble_22 (val >> 2); - break; - } - - case -10: - val = new_val; - insn = (insn & ~ 0xfff1) | re_assemble_16 (val & -8); - break; - - case -16: - val = new_val; - insn = (insn & ~ 0xfff9) | re_assemble_16 (val & -4); - break; - - case 16: - val = new_val; - insn = (insn & ~ 0xffff) | re_assemble_16 (val); - break; - - case 32: - insn = new_val; - break; - - default: - as_bad_where (fixP->fx_file, fixP->fx_line, - _("Unknown relocation encountered in md_apply_fix.")); - return; - } - - /* Insert the relocation. */ - bfd_put_32 (stdoutput, insn, fixpos); -} - -/* Exactly what point is a PC-relative offset relative TO? - On the PA, they're relative to the address of the offset. */ - -long -md_pcrel_from (fixP) - fixS *fixP; -{ - return fixP->fx_where + fixP->fx_frag->fr_address; -} - -/* Return nonzero if the input line pointer is at the end of - a statement. */ - -static int -is_end_of_statement () -{ - return ((*input_line_pointer == '\n') - || (*input_line_pointer == ';') - || (*input_line_pointer == '!')); -} - -/* Read a number from S. The number might come in one of many forms, - the most common will be a hex or decimal constant, but it could be - a pre-defined register (Yuk!), or an absolute symbol. - - Return 1 on success or 0 on failure. If STRICT, then a missing - register prefix will cause a failure. The number itself is - returned in `pa_number'. - - IS_FLOAT indicates that a PA-89 FP register number should be - parsed; A `l' or `r' suffix is checked for if but 2 of IS_FLOAT is - not set. - - pa_parse_number can not handle negative constants and will fail - horribly if it is passed such a constant. */ - -static int -pa_parse_number (s, is_float) - char **s; - int is_float; -{ - int num; - char *name; - char c; - symbolS *sym; - int status; - char *p = *s; - bfd_boolean have_prefix; - - /* Skip whitespace before the number. */ - while (*p == ' ' || *p == '\t') - p = p + 1; - - pa_number = -1; - have_prefix = 0; - num = 0; - if (!strict && ISDIGIT (*p)) - { - /* Looks like a number. */ - - if (*p == '0' && (*(p + 1) == 'x' || *(p + 1) == 'X')) - { - /* The number is specified in hex. */ - p += 2; - while (ISDIGIT (*p) || ((*p >= 'a') && (*p <= 'f')) - || ((*p >= 'A') && (*p <= 'F'))) - { - if (ISDIGIT (*p)) - num = num * 16 + *p - '0'; - else if (*p >= 'a' && *p <= 'f') - num = num * 16 + *p - 'a' + 10; - else - num = num * 16 + *p - 'A' + 10; - ++p; - } - } - else - { - /* The number is specified in decimal. */ - while (ISDIGIT (*p)) - { - num = num * 10 + *p - '0'; - ++p; - } - } - - pa_number = num; - - /* Check for a `l' or `r' suffix. */ - if (is_float) - { - pa_number += FP_REG_BASE; - if (! (is_float & 2)) - { - if (IS_R_SELECT (p)) - { - pa_number += FP_REG_RSEL; - ++p; - } - else if (IS_L_SELECT (p)) + /* Also handle allocation of a fixup to hold the unwind + information when the label appears after the proc/procend. */ + if (within_entry_exit) { - ++p; - } - } - } - } - else if (*p == '%') - { - /* The number might be a predefined register. */ - have_prefix = 1; - name = p; - p++; - c = *p; - /* Tege hack: Special case for general registers as the general - code makes a binary search with case translation, and is VERY - slow. */ - if (c == 'r') - { - p++; - if (*p == 'e' && *(p + 1) == 't' - && (*(p + 2) == '0' || *(p + 2) == '1')) - { - p += 2; - num = *p - '0' + 28; - p++; - } - else if (*p == 'p') - { - num = 2; - p++; - } - else if (!ISDIGIT (*p)) - { - if (print_errors) - as_bad (_("Undefined register: '%s'."), name); - num = -1; - } - else - { - do - num = num * 10 + *p++ - '0'; - while (ISDIGIT (*p)); - } - } - else - { - /* Do a normal register search. */ - while (is_part_of_name (c)) - { - p = p + 1; - c = *p; - } - *p = 0; - status = reg_name_search (name); - if (status >= 0) - num = status; - else - { - if (print_errors) - as_bad (_("Undefined register: '%s'."), name); - num = -1; - } - *p = c; - } + char *where; + unsigned int u; - pa_number = num; - } - else - { - /* And finally, it could be a symbol in the absolute section which - is effectively a constant, or a register alias symbol. */ - name = p; - c = *p; - while (is_part_of_name (c)) - { - p = p + 1; - c = *p; - } - *p = 0; - if ((sym = symbol_find (name)) != NULL) - { - if (S_GET_SEGMENT (sym) == reg_section) - { - num = S_GET_VALUE (sym); - /* Well, we don't really have one, but we do have a - register, so... */ - have_prefix = TRUE; - } - else if (S_GET_SEGMENT (sym) == &bfd_abs_section) - num = S_GET_VALUE (sym); - else if (!strict) - { - if (print_errors) - as_bad (_("Non-absolute symbol: '%s'."), name); - num = -1; + where = frag_more (0); + u = UNWIND_LOW32 (&last_call_info->ci_unwind.descriptor); + fix_new_hppa (frag_now, where - frag_now->fr_literal, 0, + NULL, (offsetT) 0, NULL, + 0, R_HPPA_ENTRY, e_fsel, 0, 0, u); + } +#endif } - } - else if (!strict) - { - /* There is where we'd come for an undefined symbol - or for an empty string. For an empty string we - will return zero. That's a concession made for - compatibility with the braindamaged HP assemblers. */ - if (*name == 0) - num = 0; else - { - if (print_errors) - as_bad (_("Undefined absolute constant: '%s'."), name); - num = -1; - } - } - *p = c; - - pa_number = num; - } - - if (!strict || have_prefix) - { - *s = p; - return 1; - } - return 0; -} - -#define REG_NAME_CNT (sizeof (pre_defined_registers) / sizeof (struct pd_reg)) - -/* Given NAME, find the register number associated with that name, return - the integer value associated with the given name or -1 on failure. */ - -static int -reg_name_search (name) - char *name; -{ - int middle, low, high; - int cmp; - - low = 0; - high = REG_NAME_CNT - 1; - - do - { - middle = (low + high) / 2; - cmp = strcasecmp (name, pre_defined_registers[middle].name); - if (cmp < 0) - high = middle - 1; - else if (cmp > 0) - low = middle + 1; - else - return pre_defined_registers[middle].value; - } - while (low <= high); - - return -1; -} - -/* Return nonzero if the given INSN and L/R information will require - a new PA-1.1 opcode. */ - -static int -need_pa11_opcode () -{ - if ((pa_number & FP_REG_RSEL) != 0 - && !(the_insn.fpof1 == DBL && the_insn.fpof2 == DBL)) - { - /* If this instruction is specific to a particular architecture, - then set a new architecture. */ - if (bfd_get_mach (stdoutput) < pa11) - { - if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, pa11)) - as_warn (_("could not update architecture and machine")); - } - return TRUE; - } - else - return FALSE; -} - -/* Parse a condition for a fcmp instruction. Return the numerical - code associated with the condition. */ - -static int -pa_parse_fp_cmp_cond (s) - char **s; -{ - int cond, i; - - cond = 0; - - for (i = 0; i < 32; i++) - { - if (strncasecmp (*s, fp_cond_map[i].string, - strlen (fp_cond_map[i].string)) == 0) - { - cond = fp_cond_map[i].cond; - *s += strlen (fp_cond_map[i].string); - /* If not a complete match, back up the input string and - report an error. */ - if (**s != ' ' && **s != '\t') - { - *s -= strlen (fp_cond_map[i].string); - break; - } - while (**s == ' ' || **s == '\t') - *s = *s + 1; - return cond; - } - } - - as_bad (_("Invalid FP Compare Condition: %s"), *s); - - /* Advance over the bogus completer. */ - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - - return 0; -} - -/* Parse a graphics test complete for ftest. */ - -static int -pa_parse_ftest_gfx_completer (s) - char **s; -{ - int value; - - value = 0; - if (strncasecmp (*s, "acc8", 4) == 0) - { - value = 5; - *s += 4; - } - else if (strncasecmp (*s, "acc6", 4) == 0) - { - value = 9; - *s += 4; - } - else if (strncasecmp (*s, "acc4", 4) == 0) - { - value = 13; - *s += 4; - } - else if (strncasecmp (*s, "acc2", 4) == 0) - { - value = 17; - *s += 4; - } - else if (strncasecmp (*s, "acc", 3) == 0) - { - value = 1; - *s += 3; - } - else if (strncasecmp (*s, "rej8", 4) == 0) - { - value = 6; - *s += 4; - } - else if (strncasecmp (*s, "rej", 3) == 0) - { - value = 2; - *s += 3; - } - else - { - value = 0; - as_bad (_("Invalid FTEST completer: %s"), *s); - } - - return value; -} - -/* Parse an FP operand format completer returning the completer - type. */ - -static fp_operand_format -pa_parse_fp_cnv_format (s) - char **s; -{ - int format; - - format = SGL; - if (**s == ',') - { - *s += 1; - if (strncasecmp (*s, "sgl", 3) == 0) - { - format = SGL; - *s += 4; - } - else if (strncasecmp (*s, "dbl", 3) == 0) - { - format = DBL; - *s += 4; - } - else if (strncasecmp (*s, "quad", 4) == 0) - { - format = QUAD; - *s += 5; - } - else if (strncasecmp (*s, "w", 1) == 0) - { - format = W; - *s += 2; - } - else if (strncasecmp (*s, "uw", 2) == 0) - { - format = UW; - *s += 3; - } - else if (strncasecmp (*s, "dw", 2) == 0) - { - format = DW; - *s += 3; - } - else if (strncasecmp (*s, "udw", 3) == 0) - { - format = UDW; - *s += 4; - } - else if (strncasecmp (*s, "qw", 2) == 0) - { - format = QW; - *s += 3; - } - else if (strncasecmp (*s, "uqw", 3) == 0) - { - format = UQW; - *s += 4; - } - else - { - format = ILLEGAL_FMT; - as_bad (_("Invalid FP Operand Format: %3s"), *s); - } - } - - return format; -} - -/* Parse an FP operand format completer returning the completer - type. */ - -static fp_operand_format -pa_parse_fp_format (s) - char **s; -{ - int format; - - format = SGL; - if (**s == ',') - { - *s += 1; - if (strncasecmp (*s, "sgl", 3) == 0) - { - format = SGL; - *s += 4; - } - else if (strncasecmp (*s, "dbl", 3) == 0) - { - format = DBL; - *s += 4; - } - else if (strncasecmp (*s, "quad", 4) == 0) - { - format = QUAD; - *s += 5; + as_bad (_("Missing function name for .PROC (corrupted label chain)")); } else - { - format = ILLEGAL_FMT; - as_bad (_("Invalid FP Operand Format: %3s"), *s); - } + as_bad (_("Missing function name for .PROC")); } - return format; -} - -/* Convert from a selector string into a selector type. */ - -static int -pa_chk_field_selector (str) - char **str; -{ - int middle, low, high; - int cmp; - char name[4]; + /* Assemble the instruction. Results are saved into "the_insn". */ + pa_ip (str); - /* Read past any whitespace. */ - /* FIXME: should we read past newlines and formfeeds??? */ - while (**str == ' ' || **str == '\t' || **str == '\n' || **str == '\f') - *str = *str + 1; + /* Get somewhere to put the assembled instruction. */ + to = frag_more (4); - if ((*str)[1] == '\'' || (*str)[1] == '%') - name[0] = TOLOWER ((*str)[0]), - name[1] = 0; - else if ((*str)[2] == '\'' || (*str)[2] == '%') - name[0] = TOLOWER ((*str)[0]), - name[1] = TOLOWER ((*str)[1]), - name[2] = 0; - else if ((*str)[3] == '\'' || (*str)[3] == '%') - name[0] = TOLOWER ((*str)[0]), - name[1] = TOLOWER ((*str)[1]), - name[2] = TOLOWER ((*str)[2]), - name[3] = 0; - else - return e_fsel; + /* Output the opcode. */ + md_number_to_chars (to, the_insn.opcode, 4); - low = 0; - high = sizeof (selector_table) / sizeof (struct selector_entry) - 1; + /* If necessary output more stuff. */ + if (the_insn.reloc != R_HPPA_NONE) + fix_new_hppa (frag_now, (to - frag_now->fr_literal), 4, NULL, + (offsetT) 0, &the_insn.exp, the_insn.pcrel, + the_insn.reloc, the_insn.field_selector, + the_insn.format, the_insn.arg_reloc, 0); - do - { - middle = (low + high) / 2; - cmp = strcmp (name, selector_table[middle].prefix); - if (cmp < 0) - high = middle - 1; - else if (cmp > 0) - low = middle + 1; - else - { - *str += strlen (name) + 1; -#ifndef OBJ_SOM - if (selector_table[middle].field_selector == e_nsel) - return e_fsel; +#ifdef OBJ_ELF + dwarf2_emit_insn (4); #endif - return selector_table[middle].field_selector; - } - } - while (low <= high); - - return e_fsel; -} - -/* Mark (via expr_end) the end of an expression (I think). FIXME. */ - -static int -get_expression (str) - char *str; -{ - char *save_in; - asection *seg; - - save_in = input_line_pointer; - input_line_pointer = str; - seg = expression (&the_insn.exp); - if (!(seg == absolute_section - || seg == undefined_section - || SEG_NORMAL (seg))) - { - as_warn (_("Bad segment in expression.")); - expr_end = input_line_pointer; - input_line_pointer = save_in; - return 1; - } - expr_end = input_line_pointer; - input_line_pointer = save_in; - return 0; -} - -/* Mark (via expr_end) the end of an absolute expression. FIXME. */ -static int -pa_get_absolute_expression (insn, strp) - struct pa_it *insn; - char **strp; -{ - char *save_in; - - insn->field_selector = pa_chk_field_selector (strp); - save_in = input_line_pointer; - input_line_pointer = *strp; - expression (&insn->exp); - /* This is not perfect, but is a huge improvement over doing nothing. - - The PA assembly syntax is ambiguous in a variety of ways. Consider - this string "4 %r5" Is that the number 4 followed by the register - r5, or is that 4 MOD r5? - - If we get a modulo expression when looking for an absolute, we try - again cutting off the input string at the first whitespace character. */ - if (insn->exp.X_op == O_modulus) - { - char *s, c; - int retval; - - input_line_pointer = *strp; - s = *strp; - while (*s != ',' && *s != ' ' && *s != '\t') - s++; - - c = *s; - *s = 0; - - retval = pa_get_absolute_expression (insn, strp); - - input_line_pointer = save_in; - *s = c; - return evaluate_absolute (insn); - } - /* When in strict mode we have a non-match, fix up the pointers - and return to our caller. */ - if (insn->exp.X_op != O_constant && strict) - { - expr_end = input_line_pointer; - input_line_pointer = save_in; - return 0; - } - if (insn->exp.X_op != O_constant) - { - as_bad (_("Bad segment (should be absolute).")); - expr_end = input_line_pointer; - input_line_pointer = save_in; - return 0; - } - expr_end = input_line_pointer; - input_line_pointer = save_in; - return evaluate_absolute (insn); -} - -/* Evaluate an absolute expression EXP which may be modified by - the selector FIELD_SELECTOR. Return the value of the expression. */ -static int -evaluate_absolute (insn) - struct pa_it *insn; -{ - offsetT value; - expressionS exp; - int field_selector = insn->field_selector; - - exp = insn->exp; - value = exp.X_add_number; - - return hppa_field_adjust (0, value, field_selector); -} - -/* Given an argument location specification return the associated - argument location number. */ - -static unsigned int -pa_build_arg_reloc (type_name) - char *type_name; -{ - - if (strncasecmp (type_name, "no", 2) == 0) - return 0; - if (strncasecmp (type_name, "gr", 2) == 0) - return 1; - else if (strncasecmp (type_name, "fr", 2) == 0) - return 2; - else if (strncasecmp (type_name, "fu", 2) == 0) - return 3; - else - as_bad (_("Invalid argument location: %s\n"), type_name); - - return 0; -} - -/* Encode and return an argument relocation specification for - the given register in the location specified by arg_reloc. */ - -static unsigned int -pa_align_arg_reloc (reg, arg_reloc) - unsigned int reg; - unsigned int arg_reloc; -{ - unsigned int new_reloc; - - new_reloc = arg_reloc; - switch (reg) - { - case 0: - new_reloc <<= 8; - break; - case 1: - new_reloc <<= 6; - break; - case 2: - new_reloc <<= 4; - break; - case 3: - new_reloc <<= 2; - break; - default: - as_bad (_("Invalid argument description: %d"), reg); - } - - return new_reloc; -} - -/* Parse a PA nullification completer (,n). Return nonzero if the - completer was found; return zero if no completer was found. */ - -static int -pa_parse_nullif (s) - char **s; -{ - int nullif; - - nullif = 0; - if (**s == ',') - { - *s = *s + 1; - if (strncasecmp (*s, "n", 1) == 0) - nullif = 1; - else - { - as_bad (_("Invalid Nullification: (%c)"), **s); - nullif = 0; - } - *s = *s + 1; - } - - return nullif; -} - -/* Parse a non-negated compare/subtract completer returning the - number (for encoding in instructions) of the given completer. */ - -static int -pa_parse_nonneg_cmpsub_cmpltr (s) - char **s; -{ - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; - int nullify = 0; - - cmpltr = 0; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; - - if (strcmp (name, "=") == 0) - { - cmpltr = 1; - } - else if (strcmp (name, "<") == 0) - { - cmpltr = 2; - } - else if (strcmp (name, "<=") == 0) - { - cmpltr = 3; - } - else if (strcmp (name, "<<") == 0) - { - cmpltr = 4; - } - else if (strcmp (name, "<<=") == 0) - { - cmpltr = 5; - } - else if (strcasecmp (name, "sv") == 0) - { - cmpltr = 6; - } - else if (strcasecmp (name, "od") == 0) - { - cmpltr = 7; - } - /* If we have something like addb,n then there is no condition - completer. */ - else if (strcasecmp (name, "n") == 0) - { - cmpltr = 0; - nullify = 1; - } - else - { - cmpltr = -1; - } - **s = c; - } - - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (nullify) - *s = save_s; - - return cmpltr; -} - -/* Parse a negated compare/subtract completer returning the - number (for encoding in instructions) of the given completer. */ - -static int -pa_parse_neg_cmpsub_cmpltr (s) - char **s; -{ - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; - int nullify = 0; - - cmpltr = 0; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; - - if (strcasecmp (name, "tr") == 0) - { - cmpltr = 0; - } - else if (strcmp (name, "<>") == 0) - { - cmpltr = 1; - } - else if (strcmp (name, ">=") == 0) - { - cmpltr = 2; - } - else if (strcmp (name, ">") == 0) - { - cmpltr = 3; - } - else if (strcmp (name, ">>=") == 0) - { - cmpltr = 4; - } - else if (strcmp (name, ">>") == 0) - { - cmpltr = 5; - } - else if (strcasecmp (name, "nsv") == 0) - { - cmpltr = 6; - } - else if (strcasecmp (name, "ev") == 0) - { - cmpltr = 7; - } - /* If we have something like addb,n then there is no condition - completer. */ - else if (strcasecmp (name, "n") == 0) - { - cmpltr = 0; - nullify = 1; - } - else - { - cmpltr = -1; - } - **s = c; - } - - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (nullify) - *s = save_s; - - return cmpltr; -} - -/* Parse a 64 bit compare and branch completer returning the number (for - encoding in instructions) of the given completer. - - Nonnegated comparisons are returned as 0-7, negated comparisons are - returned as 8-15. */ - -static int -pa_parse_cmpb_64_cmpltr (s) - char **s; -{ - int cmpltr; - char *name = *s + 1; - char c; - - cmpltr = -1; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; - - if (strcmp (name, "*") == 0) - { - cmpltr = 0; - } - else if (strcmp (name, "*=") == 0) - { - cmpltr = 1; - } - else if (strcmp (name, "*<") == 0) - { - cmpltr = 2; - } - else if (strcmp (name, "*<=") == 0) - { - cmpltr = 3; - } - else if (strcmp (name, "*<<") == 0) - { - cmpltr = 4; - } - else if (strcmp (name, "*<<=") == 0) - { - cmpltr = 5; - } - else if (strcasecmp (name, "*sv") == 0) - { - cmpltr = 6; - } - else if (strcasecmp (name, "*od") == 0) - { - cmpltr = 7; - } - else if (strcasecmp (name, "*tr") == 0) - { - cmpltr = 8; - } - else if (strcmp (name, "*<>") == 0) - { - cmpltr = 9; - } - else if (strcmp (name, "*>=") == 0) - { - cmpltr = 10; - } - else if (strcmp (name, "*>") == 0) - { - cmpltr = 11; - } - else if (strcmp (name, "*>>=") == 0) - { - cmpltr = 12; - } - else if (strcmp (name, "*>>") == 0) - { - cmpltr = 13; - } - else if (strcasecmp (name, "*nsv") == 0) - { - cmpltr = 14; - } - else if (strcasecmp (name, "*ev") == 0) - { - cmpltr = 15; - } - else - { - cmpltr = -1; - } - **s = c; - } - - return cmpltr; -} - -/* Parse a 64 bit compare immediate and branch completer returning the number - (for encoding in instructions) of the given completer. */ - -static int -pa_parse_cmpib_64_cmpltr (s) - char **s; -{ - int cmpltr; - char *name = *s + 1; - char c; - - cmpltr = -1; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; - - if (strcmp (name, "*<<") == 0) - { - cmpltr = 0; - } - else if (strcmp (name, "*=") == 0) - { - cmpltr = 1; - } - else if (strcmp (name, "*<") == 0) - { - cmpltr = 2; - } - else if (strcmp (name, "*<=") == 0) - { - cmpltr = 3; - } - else if (strcmp (name, "*>>=") == 0) - { - cmpltr = 4; - } - else if (strcmp (name, "*<>") == 0) - { - cmpltr = 5; - } - else if (strcasecmp (name, "*>=") == 0) - { - cmpltr = 6; - } - else if (strcasecmp (name, "*>") == 0) - { - cmpltr = 7; - } - else - { - cmpltr = -1; - } - **s = c; - } - - return cmpltr; -} - -/* Parse a non-negated addition completer returning the number - (for encoding in instructions) of the given completer. */ - -static int -pa_parse_nonneg_add_cmpltr (s) - char **s; -{ - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; - int nullify = 0; - - cmpltr = 0; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; - if (strcmp (name, "=") == 0) - { - cmpltr = 1; - } - else if (strcmp (name, "<") == 0) - { - cmpltr = 2; - } - else if (strcmp (name, "<=") == 0) - { - cmpltr = 3; - } - else if (strcasecmp (name, "nuv") == 0) - { - cmpltr = 4; - } - else if (strcasecmp (name, "znv") == 0) - { - cmpltr = 5; - } - else if (strcasecmp (name, "sv") == 0) - { - cmpltr = 6; - } - else if (strcasecmp (name, "od") == 0) - { - cmpltr = 7; - } - /* If we have something like addb,n then there is no condition - completer. */ - else if (strcasecmp (name, "n") == 0) - { - cmpltr = 0; - nullify = 1; - } - else - { - cmpltr = -1; - } - **s = c; - } - - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (nullify) - *s = save_s; - - return cmpltr; -} - -/* Parse a negated addition completer returning the number - (for encoding in instructions) of the given completer. */ - -static int -pa_parse_neg_add_cmpltr (s) - char **s; -{ - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; - int nullify = 0; - - cmpltr = 0; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; - if (strcasecmp (name, "tr") == 0) - { - cmpltr = 0; - } - else if (strcmp (name, "<>") == 0) - { - cmpltr = 1; - } - else if (strcmp (name, ">=") == 0) - { - cmpltr = 2; - } - else if (strcmp (name, ">") == 0) - { - cmpltr = 3; - } - else if (strcasecmp (name, "uv") == 0) - { - cmpltr = 4; - } - else if (strcasecmp (name, "vnz") == 0) - { - cmpltr = 5; - } - else if (strcasecmp (name, "nsv") == 0) - { - cmpltr = 6; - } - else if (strcasecmp (name, "ev") == 0) - { - cmpltr = 7; - } - /* If we have something like addb,n then there is no condition - completer. */ - else if (strcasecmp (name, "n") == 0) - { - cmpltr = 0; - nullify = 1; - } - else - { - cmpltr = -1; - } - **s = c; - } - - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (nullify) - *s = save_s; - - return cmpltr; -} - -/* Parse a 64 bit wide mode add and branch completer returning the number (for - encoding in instructions) of the given completer. */ - -static int -pa_parse_addb_64_cmpltr (s) - char **s; -{ - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; - int nullify = 0; - - cmpltr = 0; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; - if (strcmp (name, "=") == 0) - { - cmpltr = 1; - } - else if (strcmp (name, "<") == 0) - { - cmpltr = 2; - } - else if (strcmp (name, "<=") == 0) - { - cmpltr = 3; - } - else if (strcasecmp (name, "nuv") == 0) - { - cmpltr = 4; - } - else if (strcasecmp (name, "*=") == 0) - { - cmpltr = 5; - } - else if (strcasecmp (name, "*<") == 0) - { - cmpltr = 6; - } - else if (strcasecmp (name, "*<=") == 0) - { - cmpltr = 7; - } - else if (strcmp (name, "tr") == 0) - { - cmpltr = 8; - } - else if (strcmp (name, "<>") == 0) - { - cmpltr = 9; - } - else if (strcmp (name, ">=") == 0) - { - cmpltr = 10; - } - else if (strcmp (name, ">") == 0) - { - cmpltr = 11; - } - else if (strcasecmp (name, "uv") == 0) - { - cmpltr = 12; - } - else if (strcasecmp (name, "*<>") == 0) - { - cmpltr = 13; - } - else if (strcasecmp (name, "*>=") == 0) - { - cmpltr = 14; - } - else if (strcasecmp (name, "*>") == 0) - { - cmpltr = 15; - } - /* If we have something like addb,n then there is no condition - completer. */ - else if (strcasecmp (name, "n") == 0) - { - cmpltr = 0; - nullify = 1; - } - else - { - cmpltr = -1; - } - **s = c; - } - - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (nullify) - *s = save_s; - - return cmpltr; } #ifdef OBJ_SOM /* Handle an alignment directive. Special so that we can update the alignment of the subspace if necessary. */ static void -pa_align (bytes) - int bytes; +pa_align (int bytes) { /* We must have a valid space and subspace. */ pa_check_current_space_and_subspace (); @@ -5953,8 +5816,7 @@ pa_align (bytes) /* Handle a .BLOCK type pseudo-op. */ static void -pa_block (z) - int z ATTRIBUTE_UNUSED; +pa_block (int z ATTRIBUTE_UNUSED) { unsigned int temp_size; @@ -5984,8 +5846,7 @@ pa_block (z) /* Handle a .begin_brtab and .end_brtab pseudo-op. */ static void -pa_brtab (begin) - int begin ATTRIBUTE_UNUSED; +pa_brtab (int begin ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM @@ -6005,8 +5866,7 @@ pa_brtab (begin) /* Handle a .begin_try and .end_try pseudo-op. */ static void -pa_try (begin) - int begin ATTRIBUTE_UNUSED; +pa_try (int begin ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM expressionS exp; @@ -6027,29 +5887,11 @@ pa_try (begin) demand_empty_rest_of_line (); } -/* Handle a .CALL pseudo-op. This involves storing away information - about where arguments are to be found so the linker can detect - (and correct) argument location mismatches between caller and callee. */ - -static void -pa_call (unused) - int unused ATTRIBUTE_UNUSED; -{ -#ifdef OBJ_SOM - /* We must have a valid space and subspace. */ - pa_check_current_space_and_subspace (); -#endif - - pa_call_args (&last_call_desc); - demand_empty_rest_of_line (); -} - /* Do the dirty work of building a call descriptor which describes where the caller placed arguments to a function call. */ static void -pa_call_args (call_desc) - struct call_desc *call_desc; +pa_call_args (struct call_desc *call_desc) { char *name, c, *p; unsigned int temp, arg_reloc; @@ -6092,24 +5934,38 @@ pa_call_args (call_desc) } } +/* Handle a .CALL pseudo-op. This involves storing away information + about where arguments are to be found so the linker can detect + (and correct) argument location mismatches between caller and callee. */ + +static void +pa_call (int unused ATTRIBUTE_UNUSED) +{ +#ifdef OBJ_SOM + /* We must have a valid space and subspace. */ + pa_check_current_space_and_subspace (); +#endif + + pa_call_args (&last_call_desc); + demand_empty_rest_of_line (); +} + /* Return TRUE if FRAG1 and FRAG2 are the same. */ -static int -is_same_frag (frag1, frag2) - fragS *frag1; - fragS *frag2; +static bfd_boolean +is_same_frag (fragS *frag1, fragS *frag2) { if (frag1 == NULL) - return (FALSE); + return FALSE; else if (frag2 == NULL) - return (FALSE); + return FALSE; else if (frag1 == frag2) - return (TRUE); + return TRUE; else if (frag2->fr_type == rs_fill && frag2->fr_fix == 0) return (is_same_frag (frag1, frag2->fr_next)); else - return (FALSE); + return FALSE; } #ifdef OBJ_ELF @@ -6119,8 +5975,7 @@ is_same_frag (frag1, frag2) of the unwind spaces. */ static void -pa_build_unwind_subspace (call_info) - struct call_info *call_info; +pa_build_unwind_subspace (struct call_info *call_info) { asection *seg, *save_seg; subsegT save_subseg; @@ -6192,8 +6047,7 @@ pa_build_unwind_subspace (call_info) .ENTER and .LEAVE. */ static void -pa_callinfo (unused) - int unused ATTRIBUTE_UNUSED; +pa_callinfo (int unused ATTRIBUTE_UNUSED) { char *name, c, *p; int temp; @@ -6335,9 +6189,9 @@ pa_callinfo (unused) #if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) /* Switch to the text space. Like s_text, but delete our label when finished. */ + static void -pa_text (unused) - int unused ATTRIBUTE_UNUSED; +pa_text (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM current_space = is_defined_space ("$TEXT$"); @@ -6350,9 +6204,9 @@ pa_text (unused) } /* Switch to the data space. As usual delete our label. */ + static void -pa_data (unused) - int unused ATTRIBUTE_UNUSED; +pa_data (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM current_space = is_defined_space ("$PRIVATE$"); @@ -6384,8 +6238,7 @@ pa_data (unused) This also makes error detection all but impossible. */ static void -pa_comm (unused) - int unused ATTRIBUTE_UNUSED; +pa_comm (int unused ATTRIBUTE_UNUSED) { unsigned int size; symbolS *symbol; @@ -6418,16 +6271,15 @@ pa_comm (unused) /* Process a .END pseudo-op. */ static void -pa_end (unused) - int unused ATTRIBUTE_UNUSED; +pa_end (int unused ATTRIBUTE_UNUSED) { demand_empty_rest_of_line (); } /* Process a .ENTER pseudo-op. This is not supported. */ + static void -pa_enter (unused) - int unused ATTRIBUTE_UNUSED; +pa_enter (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6440,9 +6292,9 @@ pa_enter (unused) /* Process a .ENTRY pseudo-op. .ENTRY marks the beginning of the procedure. */ + static void -pa_entry (unused) - int unused ATTRIBUTE_UNUSED; +pa_entry (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6489,10 +6341,9 @@ pa_entry (unused) static int fudge_reg_expressions; int -hppa_force_reg_syms_absolute (resultP, op, rightP) - expressionS *resultP; - operatorT op ATTRIBUTE_UNUSED; - expressionS *rightP; +hppa_force_reg_syms_absolute (expressionS *resultP, + operatorT op ATTRIBUTE_UNUSED, + expressionS *rightP) { if (fudge_reg_expressions && rightP->X_op == O_register @@ -6507,8 +6358,7 @@ hppa_force_reg_syms_absolute (resultP, op, rightP) /* Handle a .EQU pseudo-op. */ static void -pa_equ (reg) - int reg; +pa_equ (int reg) { label_symbol_struct *label_symbol = pa_get_label (); symbolS *symbol; @@ -6556,12 +6406,75 @@ pa_equ (reg) demand_empty_rest_of_line (); } +#ifdef OBJ_ELF +/* Mark the end of a function so that it's possible to compute + the size of the function in elf_hppa_final_processing. */ + +static void +hppa_elf_mark_end_of_function (void) +{ + /* ELF does not have EXIT relocations. All we do is create a + temporary symbol marking the end of the function. */ + char *name; + + if (last_call_info == NULL || last_call_info->start_symbol == NULL) + { + /* We have already warned about a missing label, + or other problems. */ + return; + } + + name = xmalloc (strlen ("L$\001end_") + + strlen (S_GET_NAME (last_call_info->start_symbol)) + + 1); + if (name) + { + symbolS *symbolP; + + strcpy (name, "L$\001end_"); + strcat (name, S_GET_NAME (last_call_info->start_symbol)); + + /* If we have a .exit followed by a .procend, then the + symbol will have already been defined. */ + symbolP = symbol_find (name); + if (symbolP) + { + /* The symbol has already been defined! This can + happen if we have a .exit followed by a .procend. + + This is *not* an error. All we want to do is free + the memory we just allocated for the name and continue. */ + xfree (name); + } + else + { + /* symbol value should be the offset of the + last instruction of the function */ + symbolP = symbol_new (name, now_seg, (valueT) (frag_now_fix () - 4), + frag_now); + + assert (symbolP); + S_CLEAR_EXTERNAL (symbolP); + symbol_table_insert (symbolP); + } + + if (symbolP) + last_call_info->end_symbol = symbolP; + else + as_bad (_("Symbol '%s' could not be created."), name); + + } + else + as_bad (_("No memory for symbol name.")); +} +#endif + /* Helper function. Does processing for the end of a function. This usually involves creating some relocations or building special symbols to mark the end of the function. */ static void -process_exit () +process_exit (void) { char *where; @@ -6593,8 +6506,7 @@ process_exit () /* Process a .EXIT pseudo-op. */ static void -pa_exit (unused) - int unused ATTRIBUTE_UNUSED; +pa_exit (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6621,54 +6533,10 @@ pa_exit (unused) demand_empty_rest_of_line (); } -/* Process a .EXPORT directive. This makes functions external - and provides information such as argument relocation entries - to callers. */ - -static void -pa_export (unused) - int unused ATTRIBUTE_UNUSED; -{ - char *name, c, *p; - symbolS *symbol; - - name = input_line_pointer; - c = get_symbol_end (); - /* Make sure the given symbol exists. */ - if ((symbol = symbol_find_or_make (name)) == NULL) - { - as_bad (_("Cannot define export symbol: %s\n"), name); - p = input_line_pointer; - *p = c; - input_line_pointer++; - } - else - { - /* OK. Set the external bits and process argument relocations. - For the HP, weak and global are not mutually exclusive. - S_SET_EXTERNAL will not set BSF_GLOBAL if WEAK is set. - Call S_SET_EXTERNAL to get the other processing. Manually - set BSF_GLOBAL when we get back. */ - S_SET_EXTERNAL (symbol); - symbol_get_bfdsym (symbol)->flags |= BSF_GLOBAL; - p = input_line_pointer; - *p = c; - if (!is_end_of_statement ()) - { - input_line_pointer++; - pa_type_args (symbol, 1); - } - } - - demand_empty_rest_of_line (); -} - /* Helper function to process arguments to a .EXPORT pseudo-op. */ static void -pa_type_args (symbolP, is_export) - symbolS *symbolP; - int is_export; +pa_type_args (symbolS *symbolP, int is_export) { char *name, c, *p; unsigned int temp, arg_reloc; @@ -6676,7 +6544,6 @@ pa_type_args (symbolP, is_export) asymbol *bfdsym = symbol_get_bfdsym (symbolP); if (strncasecmp (input_line_pointer, "absolute", 8) == 0) - { input_line_pointer += 8; bfdsym->flags &= ~BSF_FUNCTION; @@ -6821,13 +6688,53 @@ pa_type_args (symbolP, is_export) } } +/* Process a .EXPORT directive. This makes functions external + and provides information such as argument relocation entries + to callers. */ + +static void +pa_export (int unused ATTRIBUTE_UNUSED) +{ + char *name, c, *p; + symbolS *symbol; + + name = input_line_pointer; + c = get_symbol_end (); + /* Make sure the given symbol exists. */ + if ((symbol = symbol_find_or_make (name)) == NULL) + { + as_bad (_("Cannot define export symbol: %s\n"), name); + p = input_line_pointer; + *p = c; + input_line_pointer++; + } + else + { + /* OK. Set the external bits and process argument relocations. + For the HP, weak and global are not mutually exclusive. + S_SET_EXTERNAL will not set BSF_GLOBAL if WEAK is set. + Call S_SET_EXTERNAL to get the other processing. Manually + set BSF_GLOBAL when we get back. */ + S_SET_EXTERNAL (symbol); + symbol_get_bfdsym (symbol)->flags |= BSF_GLOBAL; + p = input_line_pointer; + *p = c; + if (!is_end_of_statement ()) + { + input_line_pointer++; + pa_type_args (symbol, 1); + } + } + + demand_empty_rest_of_line (); +} + /* Handle an .IMPORT pseudo-op. Any symbol referenced in a given assembly file must either be defined in the assembly file, or explicitly IMPORTED from another. */ static void -pa_import (unused) - int unused ATTRIBUTE_UNUSED; +pa_import (int unused ATTRIBUTE_UNUSED) { char *name, c, *p; symbolS *symbol; @@ -6878,8 +6785,7 @@ pa_import (unused) /* Handle a .LABEL pseudo-op. */ static void -pa_label (unused) - int unused ATTRIBUTE_UNUSED; +pa_label (int unused ATTRIBUTE_UNUSED) { char *name, c, *p; @@ -6908,8 +6814,7 @@ pa_label (unused) /* Handle a .LEAVE pseudo-op. This is not supported yet. */ static void -pa_leave (unused) - int unused ATTRIBUTE_UNUSED; +pa_leave (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6923,8 +6828,7 @@ pa_leave (unused) /* Handle a .LEVEL pseudo-op. */ static void -pa_level (unused) - int unused ATTRIBUTE_UNUSED; +pa_level (int unused ATTRIBUTE_UNUSED) { char *level; @@ -6964,8 +6868,7 @@ pa_level (unused) /* Handle a .ORIGIN pseudo-op. */ static void -pa_origin (unused) - int unused ATTRIBUTE_UNUSED; +pa_origin (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6980,8 +6883,7 @@ pa_origin (unused) is for static functions. FIXME. Should share more code with .EXPORT. */ static void -pa_param (unused) - int unused ATTRIBUTE_UNUSED; +pa_param (int unused ATTRIBUTE_UNUSED) { char *name, c, *p; symbolS *symbol; @@ -7015,8 +6917,7 @@ pa_param (unused) of a procedure from a syntactical point of view. */ static void -pa_proc (unused) - int unused ATTRIBUTE_UNUSED; +pa_proc (int unused ATTRIBUTE_UNUSED) { struct call_info *call_info; @@ -7033,7 +6934,7 @@ pa_proc (unused) within_procedure = TRUE; /* Create another call_info structure. */ - call_info = (struct call_info *) xmalloc (sizeof (struct call_info)); + call_info = xmalloc (sizeof (struct call_info)); if (!call_info) as_fatal (_("Cannot allocate unwind descriptor\n")); @@ -7085,10 +6986,8 @@ pa_proc (unused) appropriate pseudo-ops were found within the procedure. */ static void -pa_procend (unused) - int unused ATTRIBUTE_UNUSED; +pa_procend (int unused ATTRIBUTE_UNUSED) { - #ifdef OBJ_SOM /* We must have a valid space and subspace. */ pa_check_current_space_and_subspace (); @@ -7160,8 +7059,7 @@ pa_procend (unused) return log2 (VALUE). Else return -1. */ static int -exact_log2 (value) - int value; +exact_log2 (int value) { int shift = 0; @@ -7177,7 +7075,7 @@ exact_log2 (value) /* Check to make sure we have a valid space and subspace. */ static void -pa_check_current_space_and_subspace () +pa_check_current_space_and_subspace (void) { if (current_space == NULL) as_fatal (_("Not in a space.\n")); @@ -7191,9 +7089,7 @@ pa_check_current_space_and_subspace () by the parameters to the .SPACE directive. */ static sd_chain_struct * -pa_parse_space_stmt (space_name, create_flag) - char *space_name; - int create_flag; +pa_parse_space_stmt (char *space_name, int create_flag) { char *name, *ptemp, c; char loadable, defined, private, sort; @@ -7201,7 +7097,7 @@ pa_parse_space_stmt (space_name, create_flag) asection *seg = NULL; sd_chain_struct *space; - /* load default values */ + /* Load default values. */ spnum = 0; sort = 0; loadable = TRUE; @@ -7313,8 +7209,7 @@ pa_parse_space_stmt (space_name, create_flag) given space, creating the new space if necessary. */ static void -pa_space (unused) - int unused ATTRIBUTE_UNUSED; +pa_space (int unused ATTRIBUTE_UNUSED) { char *name, c, *space_name, *save_s; sd_chain_struct *sd_chain; @@ -7433,8 +7328,7 @@ pa_space (unused) /* Switch to a new space. (I think). FIXME. */ static void -pa_spnum (unused) - int unused ATTRIBUTE_UNUSED; +pa_spnum (int unused ATTRIBUTE_UNUSED) { char *name; char c; @@ -7463,8 +7357,7 @@ pa_spnum (unused) they're broken up into subroutines. */ static void -pa_subspace (create_new) - int create_new; +pa_subspace (int create_new) { char *name, *ss_name, c; char loadable, code_only, comdat, common, dup_common, zero, sort; @@ -7702,7 +7595,7 @@ pa_subspace (create_new) /* Create default space and subspace dictionaries. */ static void -pa_spaces_begin () +pa_spaces_begin (void) { int i; @@ -7829,25 +7722,23 @@ pa_spaces_begin () by the given parameters. */ static sd_chain_struct * -create_new_space (name, spnum, loadable, defined, private, - sort, seg, user_defined) - char *name; - int spnum; - int loadable ATTRIBUTE_UNUSED; - int defined; - int private; - int sort; - asection *seg; - int user_defined; +create_new_space (char *name, + int spnum, + int loadable ATTRIBUTE_UNUSED, + int defined, + int private, + int sort, + asection *seg, + int user_defined) { sd_chain_struct *chain_entry; - chain_entry = (sd_chain_struct *) xmalloc (sizeof (sd_chain_struct)); + chain_entry = xmalloc (sizeof (sd_chain_struct)); if (!chain_entry) as_fatal (_("Out of memory: could not allocate new space chain entry: %s\n"), name); - SPACE_NAME (chain_entry) = (char *) xmalloc (strlen (name) + 1); + SPACE_NAME (chain_entry) = xmalloc (strlen (name) + 1); strcpy (SPACE_NAME (chain_entry), name); SPACE_DEFINED (chain_entry) = defined; SPACE_USER_DEFINED (chain_entry) = user_defined; @@ -7913,29 +7804,28 @@ create_new_space (name, spnum, loadable, defined, private, order as defined by the SORT entries. */ static ssd_chain_struct * -create_new_subspace (space, name, loadable, code_only, comdat, common, - dup_common, is_zero, sort, access, space_index, - alignment, quadrant, seg) - sd_chain_struct *space; - char *name; - int loadable ATTRIBUTE_UNUSED; - int code_only ATTRIBUTE_UNUSED; - int comdat, common, dup_common; - int is_zero ATTRIBUTE_UNUSED; - int sort; - int access; - int space_index ATTRIBUTE_UNUSED; - int alignment ATTRIBUTE_UNUSED; - int quadrant; - asection *seg; +create_new_subspace (sd_chain_struct *space, + char *name, + int loadable ATTRIBUTE_UNUSED, + int code_only ATTRIBUTE_UNUSED, + int comdat, + int common, + int dup_common, + int is_zero ATTRIBUTE_UNUSED, + int sort, + int access, + int space_index ATTRIBUTE_UNUSED, + int alignment ATTRIBUTE_UNUSED, + int quadrant, + asection *seg) { ssd_chain_struct *chain_entry; - chain_entry = (ssd_chain_struct *) xmalloc (sizeof (ssd_chain_struct)); + chain_entry = xmalloc (sizeof (ssd_chain_struct)); if (!chain_entry) as_fatal (_("Out of memory: could not allocate new subspace chain entry: %s\n"), name); - SUBSPACE_NAME (chain_entry) = (char *) xmalloc (strlen (name) + 1); + SUBSPACE_NAME (chain_entry) = xmalloc (strlen (name) + 1); strcpy (SUBSPACE_NAME (chain_entry), name); /* Initialize subspace_defined. When we hit a .subspace directive @@ -7989,22 +7879,20 @@ create_new_subspace (space, name, loadable, code_only, comdat, common, various arguments. Return the modified subspace chain entry. */ static ssd_chain_struct * -update_subspace (space, name, loadable, code_only, comdat, common, dup_common, - sort, zero, access, space_index, alignment, quadrant, section) - sd_chain_struct *space; - char *name; - int loadable ATTRIBUTE_UNUSED; - int code_only ATTRIBUTE_UNUSED; - int comdat; - int common; - int dup_common; - int zero ATTRIBUTE_UNUSED; - int sort; - int access; - int space_index ATTRIBUTE_UNUSED; - int alignment ATTRIBUTE_UNUSED; - int quadrant; - asection *section; +update_subspace (sd_chain_struct *space, + char *name, + int loadable ATTRIBUTE_UNUSED, + int code_only ATTRIBUTE_UNUSED, + int comdat, + int common, + int dup_common, + int sort, + int zero ATTRIBUTE_UNUSED, + int access, + int space_index ATTRIBUTE_UNUSED, + int alignment ATTRIBUTE_UNUSED, + int quadrant, + asection *section) { ssd_chain_struct *chain_entry; @@ -8022,18 +7910,15 @@ update_subspace (space, name, loadable, code_only, comdat, common, dup_common, NULL if no such space exists. */ static sd_chain_struct * -is_defined_space (name) - char *name; +is_defined_space (char *name) { sd_chain_struct *chain_pointer; for (chain_pointer = space_dict_root; chain_pointer; chain_pointer = chain_pointer->sd_next) - { - if (strcmp (SPACE_NAME (chain_pointer), name) == 0) - return chain_pointer; - } + if (strcmp (SPACE_NAME (chain_pointer), name) == 0) + return chain_pointer; /* No mapping from segment to space was found. Return NULL. */ return NULL; @@ -8046,8 +7931,7 @@ is_defined_space (name) so a linear exhaustive search is OK here. */ static sd_chain_struct * -pa_segment_to_space (seg) - asection *seg; +pa_segment_to_space (asection *seg) { sd_chain_struct *space_chain; @@ -8055,10 +7939,8 @@ pa_segment_to_space (seg) for (space_chain = space_dict_root; space_chain; space_chain = space_chain->sd_next) - { - if (space_chain->sd_seg == seg) - return space_chain; - } + if (space_chain->sd_seg == seg) + return space_chain; /* Mapping was not found. Return NULL. */ return NULL; @@ -8071,14 +7953,13 @@ pa_segment_to_space (seg) the first (i.e., default) subspace is preferable in most situations. For example, it wouldn't be desirable to merge COMDAT data with non COMDAT data. - + Uses a linear search through all the spaces and subspaces, this may not be appropriate if we ever being placing each function in its own subspace. */ static ssd_chain_struct * -is_defined_subspace (name) - char *name; +is_defined_subspace (char *name) { sd_chain_struct *space_chain; ssd_chain_struct *subspace_chain; @@ -8108,9 +7989,7 @@ is_defined_subspace (name) to become more efficient. */ static ssd_chain_struct * -pa_subsegment_to_subspace (seg, subseg) - asection *seg; - subsegT subseg; +pa_subsegment_to_subspace (asection *seg, subsegT subseg) { sd_chain_struct *space_chain; ssd_chain_struct *subspace_chain; @@ -8142,8 +8021,7 @@ pa_subsegment_to_subspace (seg, subseg) that was found or NULL on failure. */ static sd_chain_struct * -pa_find_space_by_number (number) - int number; +pa_find_space_by_number (int number) { sd_chain_struct *space_chain; @@ -8163,9 +8041,7 @@ pa_find_space_by_number (number) address is unknown then return zero. */ static unsigned int -pa_subspace_start (space, quadrant) - sd_chain_struct *space; - int quadrant; +pa_subspace_start (sd_chain_struct *space, int quadrant) { /* FIXME. Assumes everyone puts read/write data at 0x4000000, this is not correct for the PA OSF1 port. */ @@ -8183,8 +8059,7 @@ pa_subspace_start (space, quadrant) a string. */ static unsigned int -pa_stringer_aux (s) - char *s; +pa_stringer_aux (char *s) { unsigned int c = *s & CHAR_MASK; @@ -8202,8 +8077,7 @@ pa_stringer_aux (s) /* Handle a .STRING type pseudo-op. */ static void -pa_stringer (append_zero) - int append_zero; +pa_stringer (int append_zero) { char *s, num_buf[4]; unsigned int c; @@ -8284,8 +8158,7 @@ pa_stringer (append_zero) /* Handle a .VERSION pseudo-op. */ static void -pa_version (unused) - int unused ATTRIBUTE_UNUSED; +pa_version (int unused ATTRIBUTE_UNUSED) { obj_version (0); pa_undefine_label (); @@ -8296,8 +8169,7 @@ pa_version (unused) /* Handle a .COMPILER pseudo-op. */ static void -pa_compiler (unused) - int unused ATTRIBUTE_UNUSED; +pa_compiler (int unused ATTRIBUTE_UNUSED) { obj_som_compiler (0); pa_undefine_label (); @@ -8308,8 +8180,7 @@ pa_compiler (unused) /* Handle a .COPYRIGHT pseudo-op. */ static void -pa_copyright (unused) - int unused ATTRIBUTE_UNUSED; +pa_copyright (int unused ATTRIBUTE_UNUSED) { obj_copyright (0); pa_undefine_label (); @@ -8319,8 +8190,7 @@ pa_copyright (unused) the latest space label. */ static void -pa_cons (nbytes) - int nbytes; +pa_cons (int nbytes) { cons (nbytes); pa_undefine_label (); @@ -8329,8 +8199,7 @@ pa_cons (nbytes) /* Like float_cons, but we need to undefine our label. */ static void -pa_float_cons (float_type) - int float_type; +pa_float_cons (int float_type) { float_cons (float_type); pa_undefine_label (); @@ -8339,8 +8208,7 @@ pa_float_cons (float_type) /* Like s_fill, but delete our label when finished. */ static void -pa_fill (unused) - int unused ATTRIBUTE_UNUSED; +pa_fill (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -8354,8 +8222,7 @@ pa_fill (unused) /* Like lcomm, but delete our label when finished. */ static void -pa_lcomm (needs_align) - int needs_align; +pa_lcomm (int needs_align) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -8369,8 +8236,7 @@ pa_lcomm (needs_align) /* Like lsym, but delete our label when finished. */ static void -pa_lsym (unused) - int unused ATTRIBUTE_UNUSED; +pa_lsym (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -8381,6 +8247,79 @@ pa_lsym (unused) pa_undefine_label (); } +/* This function is called once, at assembler startup time. It should + set up all the tables, etc. that the MD part of the assembler will need. */ + +void +md_begin (void) +{ + const char *retval = NULL; + int lose = 0; + unsigned int i = 0; + + last_call_info = NULL; + call_info_root = NULL; + + /* Set the default machine type. */ + if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, DEFAULT_LEVEL)) + as_warn (_("could not set architecture and machine")); + + /* Folding of text and data segments fails miserably on the PA. + Warn user and disable "-R" option. */ + if (flag_readonly_data_in_text) + { + as_warn (_("-R option not supported on this target.")); + flag_readonly_data_in_text = 0; + } + +#ifdef OBJ_SOM + pa_spaces_begin (); +#endif + + op_hash = hash_new (); + + while (i < NUMOPCODES) + { + const char *name = pa_opcodes[i].name; + + retval = hash_insert (op_hash, name, (struct pa_opcode *) &pa_opcodes[i]); + if (retval != NULL && *retval != '\0') + { + as_fatal (_("Internal error: can't hash `%s': %s\n"), name, retval); + lose = 1; + } + + do + { + if ((pa_opcodes[i].match & pa_opcodes[i].mask) + != pa_opcodes[i].match) + { + fprintf (stderr, _("internal error: losing opcode: `%s' \"%s\"\n"), + pa_opcodes[i].name, pa_opcodes[i].args); + lose = 1; + } + ++i; + } + while (i < NUMOPCODES && !strcmp (pa_opcodes[i].name, name)); + } + + if (lose) + as_fatal (_("Broken assembler. No assembly attempted.")); + +#ifdef OBJ_SOM + /* SOM will change text_section. To make sure we never put + anything into the old one switch to the new one now. */ + subseg_set (text_section, 0); +#endif + +#ifdef OBJ_SOM + dummy_symbol = symbol_find_or_make ("L$dummy"); + S_SET_SEGMENT (dummy_symbol, text_section); + /* Force the symbol to be converted to a real symbol. */ + (void) symbol_get_bfdsym (dummy_symbol); +#endif +} + /* On the PA relocations which involve function symbols must not be adjusted. This so that the linker can know when/how to create argument relocation stubs for indirect calls and calls to static functions. @@ -8403,8 +8342,7 @@ pa_lsym (unused) reductions make life a living hell for object file editors. */ int -hppa_fix_adjustable (fixp) - fixS *fixp; +hppa_fix_adjustable (fixS *fixp) { #ifdef OBJ_ELF reloc_type code; @@ -8525,8 +8463,7 @@ hppa_fix_adjustable (fixp) within GAS. */ int -hppa_force_relocation (fixp) - struct fix *fixp; +hppa_force_relocation (struct fix *fixp) { struct hppa_fix_struct *hppa_fixp; @@ -8600,75 +8537,13 @@ hppa_force_relocation (fixp) /* Now for some ELF specific code. FIXME. */ #ifdef OBJ_ELF -/* Mark the end of a function so that it's possible to compute - the size of the function in elf_hppa_final_processing. */ - -static void -hppa_elf_mark_end_of_function () -{ - /* ELF does not have EXIT relocations. All we do is create a - temporary symbol marking the end of the function. */ - char *name; - - if (last_call_info == NULL || last_call_info->start_symbol == NULL) - { - /* We have already warned about a missing label, - or other problems. */ - return; - } - - name = (char *) xmalloc (strlen ("L$\001end_") - + strlen (S_GET_NAME (last_call_info->start_symbol)) - + 1); - if (name) - { - symbolS *symbolP; - - strcpy (name, "L$\001end_"); - strcat (name, S_GET_NAME (last_call_info->start_symbol)); - - /* If we have a .exit followed by a .procend, then the - symbol will have already been defined. */ - symbolP = symbol_find (name); - if (symbolP) - { - /* The symbol has already been defined! This can - happen if we have a .exit followed by a .procend. - - This is *not* an error. All we want to do is free - the memory we just allocated for the name and continue. */ - xfree (name); - } - else - { - /* symbol value should be the offset of the - last instruction of the function */ - symbolP = symbol_new (name, now_seg, (valueT) (frag_now_fix () - 4), - frag_now); - - assert (symbolP); - S_CLEAR_EXTERNAL (symbolP); - symbol_table_insert (symbolP); - } - - if (symbolP) - last_call_info->end_symbol = symbolP; - else - as_bad (_("Symbol '%s' could not be created."), name); - - } - else - as_bad (_("No memory for symbol name.")); - -} - /* For ELF, this function serves one purpose: to setup the st_size field of STT_FUNC symbols. To do this, we need to scan the call_info structure list, determining st_size in by taking the difference in the address of the beginning/end marker symbols. */ void -elf_hppa_final_processing () +elf_hppa_final_processing (void) { struct call_info *call_info_pointer; @@ -8686,8 +8561,7 @@ elf_hppa_final_processing () } static void -pa_vtable_entry (ignore) - int ignore ATTRIBUTE_UNUSED; +pa_vtable_entry (int ignore ATTRIBUTE_UNUSED) { struct fix *new_fix; @@ -8695,8 +8569,8 @@ pa_vtable_entry (ignore) if (new_fix) { - struct hppa_fix_struct *hppa_fix = (struct hppa_fix_struct *) - obstack_alloc (¬es, sizeof (struct hppa_fix_struct)); + struct hppa_fix_struct * hppa_fix = obstack_alloc (¬es, sizeof (struct hppa_fix_struct)); + hppa_fix->fx_r_type = R_HPPA; hppa_fix->fx_r_field = e_fsel; hppa_fix->fx_r_format = 32; @@ -8708,8 +8582,7 @@ pa_vtable_entry (ignore) } static void -pa_vtable_inherit (ignore) - int ignore ATTRIBUTE_UNUSED; +pa_vtable_inherit (int ignore ATTRIBUTE_UNUSED) { struct fix *new_fix; @@ -8717,8 +8590,8 @@ pa_vtable_inherit (ignore) if (new_fix) { - struct hppa_fix_struct *hppa_fix = (struct hppa_fix_struct *) - obstack_alloc (¬es, sizeof (struct hppa_fix_struct)); + struct hppa_fix_struct * hppa_fix = obstack_alloc (¬es, sizeof (struct hppa_fix_struct)); + hppa_fix->fx_r_type = R_HPPA; hppa_fix->fx_r_field = e_fsel; hppa_fix->fx_r_format = 32; @@ -8729,3 +8602,93 @@ pa_vtable_inherit (ignore) } } #endif + +/* Table of pseudo ops for the PA. FIXME -- how many of these + are now redundant with the overall GAS and the object file + dependent tables? */ +const pseudo_typeS md_pseudo_table[] = +{ + /* align pseudo-ops on the PA specify the actual alignment requested, + not the log2 of the requested alignment. */ +#ifdef OBJ_SOM + {"align", pa_align, 8}, +#endif +#ifdef OBJ_ELF + {"align", s_align_bytes, 8}, +#endif + {"begin_brtab", pa_brtab, 1}, + {"begin_try", pa_try, 1}, + {"block", pa_block, 1}, + {"blockz", pa_block, 0}, + {"byte", pa_cons, 1}, + {"call", pa_call, 0}, + {"callinfo", pa_callinfo, 0}, +#if defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD)) + {"code", obj_elf_text, 0}, +#else + {"code", pa_text, 0}, + {"comm", pa_comm, 0}, +#endif +#ifdef OBJ_SOM + {"compiler", pa_compiler, 0}, +#endif + {"copyright", pa_copyright, 0}, +#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) + {"data", pa_data, 0}, +#endif + {"double", pa_float_cons, 'd'}, + {"dword", pa_cons, 8}, + {"end", pa_end, 0}, + {"end_brtab", pa_brtab, 0}, +#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) + {"end_try", pa_try, 0}, +#endif + {"enter", pa_enter, 0}, + {"entry", pa_entry, 0}, + {"equ", pa_equ, 0}, + {"exit", pa_exit, 0}, + {"export", pa_export, 0}, + {"fill", pa_fill, 0}, + {"float", pa_float_cons, 'f'}, + {"half", pa_cons, 2}, + {"import", pa_import, 0}, + {"int", pa_cons, 4}, + {"label", pa_label, 0}, + {"lcomm", pa_lcomm, 0}, + {"leave", pa_leave, 0}, + {"level", pa_level, 0}, + {"long", pa_cons, 4}, + {"lsym", pa_lsym, 0}, +#ifdef OBJ_SOM + {"nsubspa", pa_subspace, 1}, +#endif + {"octa", pa_cons, 16}, + {"org", pa_origin, 0}, + {"origin", pa_origin, 0}, + {"param", pa_param, 0}, + {"proc", pa_proc, 0}, + {"procend", pa_procend, 0}, + {"quad", pa_cons, 8}, + {"reg", pa_equ, 1}, + {"short", pa_cons, 2}, + {"single", pa_float_cons, 'f'}, +#ifdef OBJ_SOM + {"space", pa_space, 0}, + {"spnum", pa_spnum, 0}, +#endif + {"string", pa_stringer, 0}, + {"stringz", pa_stringer, 1}, +#ifdef OBJ_SOM + {"subspa", pa_subspace, 0}, +#endif +#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) + {"text", pa_text, 0}, +#endif + {"version", pa_version, 0}, +#ifdef OBJ_ELF + {"vtable_entry", pa_vtable_entry, 0}, + {"vtable_inherit", pa_vtable_inherit, 0}, +#endif + {"word", pa_cons, 4}, + {NULL, 0, 0} +}; diff --git a/gas/config/tc-hppa.h b/gas/config/tc-hppa.h index 9b3edc1..25e74f0 100644 --- a/gas/config/tc-hppa.h +++ b/gas/config/tc-hppa.h @@ -1,6 +1,6 @@ /* tc-hppa.h -- Header file for the PA Copyright 1989, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -90,15 +90,14 @@ #define ASEC_NULL (asection *)0 /* pa_define_label gets used outside of tc-hppa.c via tc_frob_label. */ -extern void pa_define_label PARAMS ((symbolS *)); - -extern void parse_cons_expression_hppa PARAMS ((expressionS *)); -extern void cons_fix_new_hppa PARAMS ((fragS *, int, int, expressionS *)); -extern int hppa_force_relocation PARAMS ((struct fix *)); +extern void pa_define_label (symbolS *); +extern void parse_cons_expression_hppa (expressionS *); +extern void cons_fix_new_hppa (fragS *, int, int, expressionS *); +extern int hppa_force_relocation (struct fix *); /* This gets called before writing the object file to make sure things like entry/exit and proc/procend pairs match. */ -extern void pa_check_eof PARAMS ((void)); +extern void pa_check_eof (void); #define tc_frob_file pa_check_eof #define tc_frob_label(sym) pa_define_label (sym) @@ -120,7 +119,7 @@ extern const char hppa_symbol_chars[]; When used in an instruction it will always follow a comma. */ #define TC_EOL_IN_INSN(PTR) (*(PTR) == '!' && (PTR)[-1] == ',') -int hppa_fix_adjustable PARAMS((struct fix *)); +int hppa_fix_adjustable (struct fix *); #define tc_fix_adjustable hppa_fix_adjustable #define EXTERN_FORCE_RELOC 1 @@ -170,17 +169,23 @@ int hppa_fix_adjustable PARAMS((struct fix *)); #define tc_frob_symbol(sym,punt) \ { \ - if ((S_GET_SEGMENT (sym) == &bfd_und_section && ! symbol_used_p (sym) && \ - ELF_ST_VISIBILITY (S_GET_OTHER (sym)) == STV_DEFAULT) \ + if ((S_GET_SEGMENT (sym) == &bfd_und_section \ + && ! symbol_used_p (sym) \ + && ELF_ST_VISIBILITY (S_GET_OTHER (sym)) == STV_DEFAULT) \ || (S_GET_SEGMENT (sym) == &bfd_abs_section \ && ! S_IS_EXTERNAL (sym)) \ || strcmp (S_GET_NAME (sym), "$global$") == 0 \ - || strcmp (S_GET_NAME (sym), "$PIC_pcrel$0") == 0) \ + || strcmp (S_GET_NAME (sym), "$PIC_pcrel$0") == 0 \ + || strcmp (S_GET_NAME (sym), "$tls_gdidx$") == 0 \ + || strcmp (S_GET_NAME (sym), "$tls_ldidx$") == 0 \ + || strcmp (S_GET_NAME (sym), "$tls_dtpoff$") == 0 \ + || strcmp (S_GET_NAME (sym), "$tls_ieoff$") == 0 \ + || strcmp (S_GET_NAME (sym), "$tls_leoff$") == 0) \ punt = 1; \ } #define elf_tc_final_processing elf_hppa_final_processing -void elf_hppa_final_processing PARAMS ((void)); +void elf_hppa_final_processing (void); #define DWARF2_LINE_MIN_INSN_LENGTH 4 #endif /* OBJ_ELF */ @@ -191,8 +196,7 @@ void elf_hppa_final_processing PARAMS ((void)); A silly fudge required for backwards compatibility. */ #define md_optimize_expr hppa_force_reg_syms_absolute -int hppa_force_reg_syms_absolute - PARAMS ((expressionS *, operatorT, expressionS *)); +int hppa_force_reg_syms_absolute (expressionS *, operatorT, expressionS *); #define TC_FIX_TYPE PTR #define TC_INIT_FIX_DATA(FIX) ((FIX)->tc_fix_data = NULL) diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 29bd23e..f88b413 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,14 @@ +2006-05-24 Carlos O'Donell <carlos@systemhalted.org> + Randolph Chung <randolph@tausq.org> + * hppa.h (R_PARISC_TLS_GD21L, R_PARISC_TLS_GD14R, R_PARISC_TLS_GDCALL, + R_PARISC_TLS_LDM21L, R_PARISC_TLS_LDM14R, R_PARISC_TLS_LDMCALL, + R_PARISC_TLS_LDO21L, R_PARISC_TLS_LDO14R, R_PARISC_TLS_DTPMOD32, + R_PARISC_TLS_DTPMOD64, R_PARISC_TLS_DTPOFF32, R_PARISC_TLS_DTPOFF64): + New TLS relocs. + (R_PARISC_TLS_LE21L, R_PARISC_TLS_LE14R, R_PARISC_TLS_IE21L, + R_PARISC_TLS_IE14R, R_PARISC_TLS_TPREL32, R_PARISC_TLS_TPREL64): + Define TLS relocs using existing equivalents. + 2006-05-24 Bjoern Haase <bjoern.m.haase@web.de> * avr.h: Add E_AVR_MACH_AVR6, R_AVR_LO8_LDI_GS and R_AVR_HI8_LDI_GS. diff --git a/include/elf/hppa.h b/include/elf/hppa.h index 15be2d5..c9b3200 100644 --- a/include/elf/hppa.h +++ b/include/elf/hppa.h @@ -1,22 +1,22 @@ /* HPPA ELF support for BFD. - Copyright 1993, 1994, 1995, 1998, 1999, 2000, 2005 + Copyright 1993, 1994, 1995, 1998, 1999, 2000, 2005, 2006 Free Software Foundation, Inc. -This file is part of BFD, the Binary File Descriptor library. + 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 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. + 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ /* This file holds definitions specific to the HPPA ELF ABI. Note that most of this is not actually implemented by BFD. */ @@ -80,10 +80,10 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. /* These are strictly for compatibility with the older elf32-hppa implementation. Hopefully we can eliminate them in the future. */ /* Optional section holding argument location/relocation info. */ -#define SHT_PARISC_SYMEXTN SHT_LOPROC+8 +#define SHT_PARISC_SYMEXTN SHT_LOPROC + 8 /* Option section for linker stubs. */ -#define SHT_PARISC_STUBS SHT_LOPROC+9 +#define SHT_PARISC_STUBS SHT_LOPROC + 9 /* Processor specific section flags. */ @@ -480,8 +480,28 @@ RELOC_NUMBER (R_PARISC_LTOFF_TP16DF, 231) RELOC_NUMBER (R_PARISC_GNU_VTENTRY, 232) RELOC_NUMBER (R_PARISC_GNU_VTINHERIT, 233) +RELOC_NUMBER (R_PARISC_TLS_GD21L, 234) +RELOC_NUMBER (R_PARISC_TLS_GD14R, 235) +RELOC_NUMBER (R_PARISC_TLS_GDCALL, 236) +RELOC_NUMBER (R_PARISC_TLS_LDM21L, 237) +RELOC_NUMBER (R_PARISC_TLS_LDM14R, 238) +RELOC_NUMBER (R_PARISC_TLS_LDMCALL, 239) +RELOC_NUMBER (R_PARISC_TLS_LDO21L, 240) +RELOC_NUMBER (R_PARISC_TLS_LDO14R, 241) +RELOC_NUMBER (R_PARISC_TLS_DTPMOD32, 242) +RELOC_NUMBER (R_PARISC_TLS_DTPMOD64, 243) +RELOC_NUMBER (R_PARISC_TLS_DTPOFF32, 244) +RELOC_NUMBER (R_PARISC_TLS_DTPOFF64, 245) + END_RELOC_NUMBERS (R_PARISC_UNIMPLEMENTED) +#define R_PARISC_TLS_LE21L R_PARISC_TPREL21L +#define R_PARISC_TLS_LE14R R_PARISC_TPREL14R +#define R_PARISC_TLS_IE21L R_PARISC_LTOFF_TP21L +#define R_PARISC_TLS_IE14R R_PARISC_LTOFF_TP14R +#define R_PARISC_TLS_TPREL32 R_PARISC_TPREL32 +#define R_PARISC_TLS_TPREL64 R_PARISC_TPREL64 + #ifndef RELOC_MACROS_GEN_FUNC typedef enum elf_hppa_reloc_type elf_hppa_reloc_type; #endif |