From 90219bd0f3e7ff1b4988da0ae32a14f813f7cacc Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Tue, 25 Jan 2005 20:22:41 +0000 Subject: bfd/ChangeLog: 2004-12-10 Alexandre Oliva * elf32-frv.c (elf32_frv_relocate_section): Force local binding for TLSMOFF. * reloc.c: Add R_FRV_TLSMOFF. * elf32-frv.c (elf32_frv_howto_table): Likewise. (frv_reloc_map, frv_reloc_type_lookup): Map it. (elf32_frv_relocate_section): Handle it. (elf32_frv_check_relocs): Likewise. * libbfd.h, bfd-in2.h: Rebuilt. 2004-11-26 Alexandre Oliva * elf32-frv.c (_frvfdpic_emit_got_relocs_plt_entries): Don't crash when given an undefweak TLS symbol. Fix constant TLS PLT entries such that they return the constant in gr9. (_frvfdpic_relax_tls_entries): Don't crash for undefweak TLS symbols. (_frvfdpic_size_got_plt): Set _cooked_size of dynamic sections. too, such that they shrink on relaxation. (elf32_frvfdpic_finish_dynamic_sections): Check __ROFIXUP_END__ as marking the position right past the _GLOBAL_OFFSET_TABLE_ value. (_frvfdpic_assign_plt_entries): Shrink constant TLS PLT entries if we can guarantee the use of 16-bit constants. 2004-11-10 Alexandre Oliva Introduce TLS support for FR-V FDPIC. * reloc.c: Add TLS relocations. * elf32-frv.c (elf32_frv_howto_table): Add TLS relocations. (elf32_frv_rel_tlsdesc_value_howto): New. (elf32_frv_rel_tlsoff_howto): New. (frv_reloc_map): Add new mappings. (struct frvfdpic_elf_link_hash_table): Add pointer to summary reloc information. (frvfdpic_dynamic_got_plt_info): New. (frvfdpic_plt_tls_ret_offset): New. (ELF_DYNAMIC_INTERPRETER, DEFAULT_STACK_SIZE): Move earlier. (struct _frvfdpic_dynamic_got_info): Likewise. Add TLS members. (struct _frvfdpic_dynamic_got_plt_info): Likewise. (FRVFDPIC_SYM_LOCAL): Regard symbols defined in the absolute section as local. (struct frvfdpic_relocs_info): Add TLS fields. (frvfdpic_relocs_info_hash): Warning clean up. (frvfdpic_relocs_info_find): Initialize tlsplt_entry. (frvfdpic_pic_merge_early_relocs_info): Merge TLS fields. (FRVFDPIC_TLS_BIAS): Define. (tls_biased_base): New. (_frvfdpic_emit_got_relocs_plt_entries): Deal with TLS relocations. (frv_reloc_type_lookup): Likewise. (frvfdpic_info_to_howto_rel): Likewise. (elf32_frv_relocate_section): Likewise. (_frv_create_got_section): Create the PLT section here. (elf32_frvfdpic_create_dynamic_sections): Not here. (_frvfdpic_count_nontls_entries): Move out of... (_frvfdpic_count_got_plt_entries): ... here. (_frvfdpic_count_tls_entries): Likewise. Add TLS support. (_frvfdpic_count_relocs_fixups): Likewise. Add relaxation support. (_frvfdpic_relax_tls_entries): New. (_frvfdpic_compute_got_alloc_data): Add TLS support. (_frvfdpic_get_tlsdesc_entry): New. (_frvfdpic_assign_got_entries): Add TLS support. (_frvfdpic_assign_plt_entries): Likewise. (_frvfdpic_reset_got_plt_entries): New. (_frvfdpic_size_got_plt): Move out of... (elf32_frvfdpic_size_dynamic_sections): ... here. (_frvfdpic_relax_got_plt_entries): New. (elf32_frvfdpic_relax_section): New. (elf32_frvfdpic_finish_dynamic_sections): Add TLS sanity check. (elf32_frv_check_relocs): Add TLS support. (bfd_elf32_bfd_relax_section): Define for FDPIC. * libbfd.h, bfd-in2.h: Rebuilt. cpu/ChangeLog: 2004-11-10 Alexandre Oliva * frv.cpu: Add support for TLS annotations in loads and calll. * frv.opc (parse_symbolic_address): New. (parse_ldd_annotation): New. (parse_call_annotation): New. (parse_ld_annotation): New. (parse_ulo16, parse_uslo16): Use parse_symbolic_address. Introduce TLS relocations. (parse_d12, parse_s12, parse_u12): Likewise. (parse_uhi16): Likewise. Fix constant checking on 64-bit host. (parse_call_label, print_at): New. gas/ChangeLog: * config/tc-frv.c (md_apply_fix3): Mark TLS symbols as such. 2004-12-10 Alexandre Oliva * config/tc-frv.c (frv_pic_ptr): Add tlsmoff support. 2004-11-10 Alexandre Oliva * cgen.c (gas_cgen_parse_operand): Handle CGEN_PARSE_OPERAND_SYMBOLIC. * config/tc-frv.c (md_cgen_lookup_reloc): Handle TLS relocations. (frv_force_relocation): Likewise. Fix handling of PIC relocations. (md_apply_fix3): Likewise. include/elf/ChangeLog: 2004-12-10 Alexandre Oliva * frv.h: Add R_FRV_TLSMOFF. 2004-11-10 Alexandre Oliva * frv.h: Add TLS relocations. include/opcode/ChangeLog: 2004-11-10 Alexandre Oliva * cgen.h (enum cgen_parse_operand_type): Add CGEN_PARSE_OPERAND_SYMBOLIC. ld/testsuite/ChangeLog: * ld-frv/fdpic.exp: Add -mfdpic to ASFLAGS. * ld-frv/tls.exp: Likewise. 2004-11-26 Alexandre Oliva * ld-frv/tls-3.s: New. * ld-frv/tls-static-3.d: New. * ld-frv/tls-dynamic-3.d: New. * ld-frv/tls-pie-3.d: New. * ld-frv/tls-shared-3.d: New. * ld-frv/tls-relax-static-3.d: New. * ld-frv/tls-relax-dynamic-3.d: New. * ld-frv/tls-relax-pie-3.d: New. * ld-frv/tls-relax-shared-3.d: New. * ld-frv/tls.exp: Run the new tests. * ld-frv/tls-dynamic-2.d: Adjust for improved relaxation. * ld-frv/tls-relax-dynamic-2.d: Likewise. * ld-frv/tls-relax-initial-shared-2.d: Likewise. 2004-11-10 Alexandre Oliva * ld-frv/tls-1-dep.s: New. * ld-frv/tls-1-shared.lds: New. * ld-frv/tls-1.s: New. * ld-frv/tls-2.s: New. * ld-frv/tls-dynamic-1.d: New. * ld-frv/tls-dynamic-2.d: New. * ld-frv/tls-initial-shared-2.d: New. * ld-frv/tls-pie-1.d: New. * ld-frv/tls-relax-dynamic-1.d: New. * ld-frv/tls-relax-dynamic-2.d: New. * ld-frv/tls-relax-initial-shared-2.d: New. * ld-frv/tls-relax-pie-1.d: New. * ld-frv/tls-relax-shared-1.d: New. * ld-frv/tls-relax-shared-2.d: New. * ld-frv/tls-relax-static-1.d: New. * ld-frv/tls-shared-1-fail.d: New. * ld-frv/tls-shared-1.d: New. * ld-frv/tls-shared-2.d: New. * ld-frv/tls-static-1.d: New. * ld-frv/tls.exp: New. * ld-frv/fdpic-pie-1.d: Adjust for 64-bit host. * ld-frv/fdpic-pie-2.d: Likewise. * ld-frv/fdpic-pie-6.d: Likewise. * ld-frv/fdpic-pie-7.d: Likewise. * ld-frv/fdpic-pie-8.d: Likewise. * ld-frv/fdpic-shared-1.d: Likewise. * ld-frv/fdpic-shared-2.d: Likewise. * ld-frv/fdpic-shared-3.d: Likewise. * ld-frv/fdpic-shared-4.d: Likewise. * ld-frv/fdpic-shared-5.d: Likewise. * ld-frv/fdpic-shared-6.d: Likewise. * ld-frv/fdpic-shared-7.d: Likewise. * ld-frv/fdpic-shared-8.d: Likewise. * ld-frv/fdpic-shared-local-2.d: Likewise. * ld-frv/fdpic-shared-local-8.d: Likewise. * ld-frv/fdpic-static-1.d: Likewise. * ld-frv/fdpic-static-2.d: Likewise. * ld-frv/fdpic-static-6.d: Likewise. * ld-frv/fdpic-static-7.d: Likewise. * ld-frv/fdpic-static-8.d: Likewise. opcodes/ChangeLog: 2004-11-10 Alexandre Oliva * frv-asm.c: Rebuilt. * frv-desc.c: Rebuilt. * frv-desc.h: Rebuilt. * frv-dis.c: Rebuilt. * frv-ibld.c: Rebuilt. * frv-opc.c: Rebuilt. * frv-opc.h: Rebuilt. --- opcodes/ChangeLog | 11 + opcodes/frv-asm.c | 665 +++++++++++++++++++++++++++++++++++++++-------------- opcodes/frv-desc.c | 28 ++- opcodes/frv-desc.h | 41 ++-- opcodes/frv-dis.c | 22 ++ opcodes/frv-ibld.c | 54 +++++ opcodes/frv-opc.c | 12 +- opcodes/frv-opc.h | 1 + 8 files changed, 634 insertions(+), 200 deletions(-) (limited to 'opcodes') diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 02e2553..b91673f 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,14 @@ +2005-01-25 Alexandre Oliva + + 2004-11-10 Alexandre Oliva + * frv-asm.c: Rebuilt. + * frv-desc.c: Rebuilt. + * frv-desc.h: Rebuilt. + * frv-dis.c: Rebuilt. + * frv-ibld.c: Rebuilt. + * frv-opc.c: Rebuilt. + * frv-opc.h: Rebuilt. + 2005-01-24 Andrew Cagney * configure: Regenerate, ../gettext.m4 was updated. diff --git a/opcodes/frv-asm.c b/opcodes/frv-asm.c index 98df36b..52d3bc1 100644 --- a/opcodes/frv-asm.c +++ b/opcodes/frv-asm.c @@ -73,6 +73,146 @@ static const char * parse_A1 static const char * parse_A PARAMS ((CGEN_CPU_DESC, const char **, int, long *, long)); +inline static const char * +parse_symbolic_address (CGEN_CPU_DESC cd, + const char **strp, + int opindex, + int opinfo, + enum cgen_parse_operand_result *resultp, + bfd_vma *valuep) +{ + enum cgen_parse_operand_result result_type; + const char *errmsg = (* cd->parse_operand_fn) + (cd, CGEN_PARSE_OPERAND_SYMBOLIC, strp, opindex, opinfo, + &result_type, valuep); + + if (errmsg == NULL + && result_type != CGEN_PARSE_OPERAND_RESULT_QUEUED) + return "symbolic expression required"; + + if (resultp) + *resultp = result_type; + + return errmsg; +} + +static const char * +parse_ldd_annotation (CGEN_CPU_DESC cd, + const char **strp, + int opindex, + long *valuep) +{ + const char *errmsg; + enum cgen_parse_operand_result result_type; + bfd_vma value; + + if (**strp == '#' || **strp == '%') + { + if (strncasecmp (*strp + 1, "tlsdesc(", 8) == 0) + { + *strp += 9; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_TLSDESC_RELAX, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + if (valuep) + *valuep = value; + ++*strp; + if (errmsg) + return errmsg; + } + } + + while (**strp == ' ' || **strp == '\t') + ++*strp; + + if (**strp != '@') + return "missing `@'"; + + ++*strp; + + return NULL; +} + +static const char * +parse_call_annotation (CGEN_CPU_DESC cd, + const char **strp, + int opindex, + long *valuep) +{ + const char *errmsg; + enum cgen_parse_operand_result result_type; + bfd_vma value; + + if (**strp == '#' || **strp == '%') + { + if (strncasecmp (*strp + 1, "gettlsoff(", 10) == 0) + { + *strp += 11; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GETTLSOFF_RELAX, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + if (valuep) + *valuep = value; + ++*strp; + if (errmsg) + return errmsg; + } + } + + while (**strp == ' ' || **strp == '\t') + ++*strp; + + if (**strp != '@') + return "missing `@'"; + + ++*strp; + + return NULL; +} + +static const char * +parse_ld_annotation (CGEN_CPU_DESC cd, + const char **strp, + int opindex, + long *valuep) +{ + const char *errmsg; + enum cgen_parse_operand_result result_type; + bfd_vma value; + + if (**strp == '#' || **strp == '%') + { + if (strncasecmp (*strp + 1, "tlsoff(", 7) == 0) + { + *strp += 8; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_TLSOFF_RELAX, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + if (valuep) + *valuep = value; + ++*strp; + if (errmsg) + return errmsg; + } + } + + while (**strp == ' ' || **strp == '\t') + ++*strp; + + if (**strp != '@') + return "missing `@'"; + + ++*strp; + + return NULL; +} + static const char * parse_ulo16 (cd, strp, opindex, valuep) CGEN_CPU_DESC cd; @@ -103,73 +243,96 @@ parse_ulo16 (cd, strp, opindex, valuep) if (strncasecmp (*strp + 1, "gprello(", 8) == 0) { *strp += 9; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GPRELLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GPRELLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotlo(", 6) == 0) { *strp += 7; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GOTLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotfuncdesclo(", 14) == 0) { *strp += 15; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOTLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOTLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotofflo(", 9) == 0) { *strp += 10; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_GOTOFFLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTOFFLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotofffuncdesclo(", 17) == 0) { *strp += 18; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOTOFFLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOTOFFLO, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsdesclo(", 13) == 0) + { + *strp += 14; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSDESCLO, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "tlsmofflo(", 10) == 0) + { + *strp += 11; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_TLSMOFFLO, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsofflo(", 12) == 0) + { + *strp += 13; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSOFFLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } @@ -207,73 +370,96 @@ parse_uslo16 (cd, strp, opindex, valuep) else if (strncasecmp (*strp + 1, "gprello(", 8) == 0) { *strp += 9; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GPRELLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GPRELLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotlo(", 6) == 0) { *strp += 7; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GOTLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotfuncdesclo(", 14) == 0) { *strp += 15; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOTLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOTLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotofflo(", 9) == 0) { *strp += 10; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_GOTOFFLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTOFFLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotofffuncdesclo(", 17) == 0) { *strp += 18; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOTOFFLO, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOTOFFLO, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsdesclo(", 13) == 0) + { + *strp += 14; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSDESCLO, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "tlsmofflo(", 10) == 0) + { + *strp += 11; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_TLSMOFFLO, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsofflo(", 12) == 0) + { + *strp += 13; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSOFFLO, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value &= 0xffff; *valuep = value; return errmsg; } @@ -304,80 +490,110 @@ parse_uhi16 (cd, strp, opindex, valuep) ++*strp; if (errmsg == NULL && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value >>= 16; + { + /* If bfd_vma is wider than 32 bits, but we have a sign- + or zero-extension, truncate it. */ + if (value >= - ((bfd_vma)1 << 31) + || value <= ((bfd_vma)1 << 31) - (bfd_vma)1) + value &= (((bfd_vma)1 << 16) << 16) - 1; + value >>= 16; + } *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gprelhi(", 8) == 0) { *strp += 9; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GPRELHI, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GPRELHI, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value >>= 16; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gothi(", 6) == 0) { *strp += 7; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GOTHI, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTHI, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value >>= 16; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotfuncdeschi(", 14) == 0) { *strp += 15; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOTHI, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOTHI, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value >>= 16; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotoffhi(", 9) == 0) { *strp += 10; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_GOTOFFHI, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTOFFHI, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value >>= 16; *valuep = value; return errmsg; } else if (strncasecmp (*strp + 1, "gotofffuncdeschi(", 17) == 0) { *strp += 18; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOTOFFHI, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOTOFFHI, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsdeschi(", 13) == 0) + { + *strp += 14; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSDESCHI, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "tlsmoffhi(", 10) == 0) + { + *strp += 11; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_TLSMOFFHI, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsoffhi(", 12) == 0) + { + *strp += 13; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSOFFHI, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; - if (errmsg == NULL - && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER) - value >>= 16; *valuep = value; return errmsg; } @@ -455,8 +671,9 @@ parse_d12 (cd, strp, opindex, valuep) if (strncasecmp (*strp + 1, "gprel12(", 8) == 0) { *strp += 9; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GPREL12, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GPREL12, + &result_type, &value); if (**strp != ')') return "missing `)'"; ++*strp; @@ -466,8 +683,9 @@ parse_d12 (cd, strp, opindex, valuep) else if (strncasecmp (*strp + 1, "got12(", 6) == 0) { *strp += 7; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GOT12, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOT12, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; @@ -477,9 +695,9 @@ parse_d12 (cd, strp, opindex, valuep) else if (strncasecmp (*strp + 1, "gotfuncdesc12(", 14) == 0) { *strp += 15; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOT12, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOT12, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; @@ -489,9 +707,9 @@ parse_d12 (cd, strp, opindex, valuep) else if (strncasecmp (*strp + 1, "gotoff12(", 9) == 0) { *strp += 10; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_GOTOFF12, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTOFF12, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; @@ -501,9 +719,45 @@ parse_d12 (cd, strp, opindex, valuep) else if (strncasecmp (*strp + 1, "gotofffuncdesc12(", 17) == 0) { *strp += 18; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOTOFF12, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOTOFF12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsdesc12(", 13) == 0) + { + *strp += 14; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSDESC12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "tlsmoff12(", 10) == 0) + { + *strp += 11; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_TLSMOFF12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsoff12(", 12) == 0) + { + *strp += 13; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSOFF12, + &result_type, &value); if (**strp != ')') return "missing ')'"; ++*strp; @@ -526,74 +780,109 @@ parse_s12 (cd, strp, opindex, valuep) bfd_vma value; /* Check for small data reference. */ - if ((**strp == '#' || **strp == '%') - && strncasecmp (*strp + 1, "gprel12(", 8) == 0) - { - *strp += 9; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GPREL12, - &result_type, &value); - if (**strp != ')') - return "missing `)'"; - ++*strp; - *valuep = value; - return errmsg; - } - else if ((**strp == '#' || **strp == '%') - && strncasecmp (*strp + 1, "got12(", 6) == 0) - { - *strp += 7; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GOT12, - &result_type, &value); - if (**strp != ')') - return "missing ')'"; - ++*strp; - *valuep = value; - return errmsg; - } - else if ((**strp == '#' || **strp == '%') - && strncasecmp (*strp + 1, "gotfuncdesc12(", 14) == 0) - { - *strp += 15; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOT12, - &result_type, &value); - if (**strp != ')') - return "missing ')'"; - ++*strp; - *valuep = value; - return errmsg; - } - else if ((**strp == '#' || **strp == '%') - && strncasecmp (*strp + 1, "gotoff12(", 9) == 0) - { - *strp += 10; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GOTOFF12, - &result_type, &value); - if (**strp != ')') - return "missing ')'"; - ++*strp; - *valuep = value; - return errmsg; - } - else if ((**strp == '#' || **strp == '%') - && strncasecmp (*strp + 1, "gotofffuncdesc12(", 17) == 0) - { - *strp += 18; - errmsg = cgen_parse_address (cd, strp, opindex, - BFD_RELOC_FRV_FUNCDESC_GOTOFF12, - &result_type, &value); - if (**strp != ')') - return "missing ')'"; - ++*strp; - *valuep = value; - return errmsg; - } - else + if (**strp == '#' || **strp == '%') { - if (**strp == '#') - ++*strp; - return cgen_parse_signed_integer (cd, strp, opindex, valuep); + if (strncasecmp (*strp + 1, "gprel12(", 8) == 0) + { + *strp += 9; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GPREL12, + &result_type, &value); + if (**strp != ')') + return "missing `)'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "got12(", 6) == 0) + { + *strp += 7; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOT12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gotfuncdesc12(", 14) == 0) + { + *strp += 15; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOT12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gotoff12(", 9) == 0) + { + *strp += 10; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTOFF12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gotofffuncdesc12(", 17) == 0) + { + *strp += 18; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_FUNCDESC_GOTOFF12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsdesc12(", 13) == 0) + { + *strp += 14; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSDESC12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "tlsmoff12(", 10) == 0) + { + *strp += 11; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_TLSMOFF12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } + else if (strncasecmp (*strp + 1, "gottlsoff12(", 12) == 0) + { + *strp += 13; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GOTTLSOFF12, + &result_type, &value); + if (**strp != ')') + return "missing ')'"; + ++*strp; + *valuep = value; + return errmsg; + } } + + if (**strp == '#') + ++*strp; + return cgen_parse_signed_integer (cd, strp, opindex, valuep); } static const char * @@ -612,8 +901,9 @@ parse_u12 (cd, strp, opindex, valuep) && strncasecmp (*strp + 1, "gprel12(", 8) == 0) { *strp += 9; - errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_FRV_GPRELU12, - &result_type, &value); + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GPRELU12, + &result_type, &value); if (**strp != ')') return "missing `)'"; ++*strp; @@ -691,6 +981,38 @@ parse_even_register (cd, strP, tableP, valueP) return errmsg; } + +static const char * +parse_call_label (CGEN_CPU_DESC cd, + const char **strp, + int opindex, + int opinfo, + enum cgen_parse_operand_result *resultp, + bfd_vma *valuep) +{ + const char *errmsg; + bfd_vma value; + + /* Check for small data reference. */ + if (opinfo == 0 && (**strp == '#' || **strp == '%')) + { + if (strncasecmp (*strp + 1, "gettlsoff(", 10) == 0) + { + *strp += 11; + errmsg = parse_symbolic_address (cd, strp, opindex, + BFD_RELOC_FRV_GETTLSOFF, + resultp, &value); + if (**strp != ')') + return "missing `)'"; + ++*strp; + *valuep = value; + return errmsg; + } + } + + return cgen_parse_address (cd, strp, opindex, opinfo, resultp, valuep); +} + /* -- */ const char * frv_cgen_parse_operand @@ -878,6 +1200,9 @@ frv_cgen_parse_operand (cd, opindex, strp, fields) case FRV_OPERAND_AE : errmsg = cgen_parse_unsigned_integer (cd, strp, FRV_OPERAND_AE, &fields->f_ae); break; + case FRV_OPERAND_CALLANN : + errmsg = parse_call_annotation (cd, strp, FRV_OPERAND_CALLANN, &fields->f_reloc_ann); + break; case FRV_OPERAND_CCOND : errmsg = cgen_parse_unsigned_integer (cd, strp, FRV_OPERAND_CCOND, &fields->f_ccond); break; @@ -912,10 +1237,16 @@ frv_cgen_parse_operand (cd, opindex, strp, fields) case FRV_OPERAND_LABEL24 : { bfd_vma value; - errmsg = cgen_parse_address (cd, strp, FRV_OPERAND_LABEL24, 0, NULL, & value); + errmsg = parse_call_label (cd, strp, FRV_OPERAND_LABEL24, 0, NULL, & value); fields->f_label24 = value; } break; + case FRV_OPERAND_LDANN : + errmsg = parse_ld_annotation (cd, strp, FRV_OPERAND_LDANN, &fields->f_reloc_ann); + break; + case FRV_OPERAND_LDDANN : + errmsg = parse_ldd_annotation (cd, strp, FRV_OPERAND_LDDANN, &fields->f_reloc_ann); + break; case FRV_OPERAND_LOCK : errmsg = cgen_parse_unsigned_integer (cd, strp, FRV_OPERAND_LOCK, &fields->f_lock); break; diff --git a/opcodes/frv-desc.c b/opcodes/frv-desc.c index 91f8cca..af49bd0 100644 --- a/opcodes/frv-desc.c +++ b/opcodes/frv-desc.c @@ -1825,6 +1825,7 @@ const CGEN_HW_ENTRY frv_cgen_hw_table[] = { "h-uint", HW_H_UINT, CGEN_ASM_NONE, 0, { 0, { (1<fprintf_func) (info->stream, "@"); +} + +static void print_spr (cd, dis_info, names, regno, attrs) CGEN_CPU_DESC cd; PTR dis_info; @@ -307,6 +320,9 @@ frv_cgen_print_operand (cd, opindex, xinfo, fields, attrs, pc, length) case FRV_OPERAND_AE : print_normal (cd, info, fields->f_ae, 0|(1<f_reloc_ann, 0, pc, length); + break; case FRV_OPERAND_CCOND : print_normal (cd, info, fields->f_ccond, 0|(1<f_label24, 0|(1<f_reloc_ann, 0, pc, length); + break; + case FRV_OPERAND_LDDANN : + print_at (cd, info, fields->f_reloc_ann, 0, pc, length); + break; case FRV_OPERAND_LOCK : print_normal (cd, info, fields->f_lock, 0|(1<f_ae, 0, 0, 25, 1, 32, total_length, buffer); break; + case FRV_OPERAND_CALLANN : + errmsg = insert_normal (cd, fields->f_reloc_ann, 0, 0, 0, 0, 32, total_length, buffer); + break; case FRV_OPERAND_CCOND : errmsg = insert_normal (cd, fields->f_ccond, 0, 0, 12, 1, 32, total_length, buffer); break; @@ -776,6 +779,12 @@ frv_cgen_insert_operand (cd, opindex, fields, buffer, pc) break; } break; + case FRV_OPERAND_LDANN : + errmsg = insert_normal (cd, fields->f_reloc_ann, 0, 0, 0, 0, 32, total_length, buffer); + break; + case FRV_OPERAND_LDDANN : + errmsg = insert_normal (cd, fields->f_reloc_ann, 0, 0, 0, 0, 32, total_length, buffer); + break; case FRV_OPERAND_LOCK : errmsg = insert_normal (cd, fields->f_lock, 0, 0, 25, 1, 32, total_length, buffer); break; @@ -1049,6 +1058,9 @@ frv_cgen_extract_operand (cd, opindex, ex_info, insn_value, fields, pc) case FRV_OPERAND_AE : length = extract_normal (cd, ex_info, insn_value, 0, 0, 25, 1, 32, total_length, pc, & fields->f_ae); break; + case FRV_OPERAND_CALLANN : + length = extract_normal (cd, ex_info, insn_value, 0, 0, 0, 0, 32, total_length, pc, & fields->f_reloc_ann); + break; case FRV_OPERAND_CCOND : length = extract_normal (cd, ex_info, insn_value, 0, 0, 12, 1, 32, total_length, pc, & fields->f_ccond); break; @@ -1092,6 +1104,12 @@ frv_cgen_extract_operand (cd, opindex, ex_info, insn_value, fields, pc) } } break; + case FRV_OPERAND_LDANN : + length = extract_normal (cd, ex_info, insn_value, 0, 0, 0, 0, 32, total_length, pc, & fields->f_reloc_ann); + break; + case FRV_OPERAND_LDDANN : + length = extract_normal (cd, ex_info, insn_value, 0, 0, 0, 0, 32, total_length, pc, & fields->f_reloc_ann); + break; case FRV_OPERAND_LOCK : length = extract_normal (cd, ex_info, insn_value, 0, 0, 25, 1, 32, total_length, pc, & fields->f_lock); break; @@ -1350,6 +1368,9 @@ frv_cgen_get_int_operand (cd, opindex, fields) case FRV_OPERAND_AE : value = fields->f_ae; break; + case FRV_OPERAND_CALLANN : + value = fields->f_reloc_ann; + break; case FRV_OPERAND_CCOND : value = fields->f_ccond; break; @@ -1380,6 +1401,12 @@ frv_cgen_get_int_operand (cd, opindex, fields) case FRV_OPERAND_LABEL24 : value = fields->f_label24; break; + case FRV_OPERAND_LDANN : + value = fields->f_reloc_ann; + break; + case FRV_OPERAND_LDDANN : + value = fields->f_reloc_ann; + break; case FRV_OPERAND_LOCK : value = fields->f_lock; break; @@ -1602,6 +1629,9 @@ frv_cgen_get_vma_operand (cd, opindex, fields) case FRV_OPERAND_AE : value = fields->f_ae; break; + case FRV_OPERAND_CALLANN : + value = fields->f_reloc_ann; + break; case FRV_OPERAND_CCOND : value = fields->f_ccond; break; @@ -1632,6 +1662,12 @@ frv_cgen_get_vma_operand (cd, opindex, fields) case FRV_OPERAND_LABEL24 : value = fields->f_label24; break; + case FRV_OPERAND_LDANN : + value = fields->f_reloc_ann; + break; + case FRV_OPERAND_LDDANN : + value = fields->f_reloc_ann; + break; case FRV_OPERAND_LOCK : value = fields->f_lock; break; @@ -1863,6 +1899,9 @@ frv_cgen_set_int_operand (cd, opindex, fields, value) case FRV_OPERAND_AE : fields->f_ae = value; break; + case FRV_OPERAND_CALLANN : + fields->f_reloc_ann = value; + break; case FRV_OPERAND_CCOND : fields->f_ccond = value; break; @@ -1893,6 +1932,12 @@ frv_cgen_set_int_operand (cd, opindex, fields, value) case FRV_OPERAND_LABEL24 : fields->f_label24 = value; break; + case FRV_OPERAND_LDANN : + fields->f_reloc_ann = value; + break; + case FRV_OPERAND_LDDANN : + fields->f_reloc_ann = value; + break; case FRV_OPERAND_LOCK : fields->f_lock = value; break; @@ -2112,6 +2157,9 @@ frv_cgen_set_vma_operand (cd, opindex, fields, value) case FRV_OPERAND_AE : fields->f_ae = value; break; + case FRV_OPERAND_CALLANN : + fields->f_reloc_ann = value; + break; case FRV_OPERAND_CCOND : fields->f_ccond = value; break; @@ -2142,6 +2190,12 @@ frv_cgen_set_vma_operand (cd, opindex, fields, value) case FRV_OPERAND_LABEL24 : fields->f_label24 = value; break; + case FRV_OPERAND_LDANN : + fields->f_reloc_ann = value; + break; + case FRV_OPERAND_LDDANN : + fields->f_reloc_ann = value; + break; case FRV_OPERAND_LOCK : fields->f_lock = value; break; diff --git a/opcodes/frv-opc.c b/opcodes/frv-opc.c index f220799..f7d9358 100644 --- a/opcodes/frv-opc.c +++ b/opcodes/frv-opc.c @@ -2125,10 +2125,10 @@ static const CGEN_OPCODE frv_cgen_insn_opcode_table[MAX_INSNS] = { { MNEM, OP (PACK), ' ', '@', '(', OP (GRI), ',', OP (GRJ), ')', ',', OP (GRK), 0 } }, & ifmt_slass, { 0x800c0 } }, -/* ld$pack @($GRi,$GRj),$GRk */ +/* ld$pack $ldann($GRi,$GRj),$GRk */ { { 0, 0, 0, 0 }, - { { MNEM, OP (PACK), ' ', '@', '(', OP (GRI), ',', OP (GRJ), ')', ',', OP (GRK), 0 } }, + { { MNEM, OP (PACK), ' ', OP (LDANN), '(', OP (GRI), ',', OP (GRJ), ')', ',', OP (GRK), 0 } }, & ifmt_slass, { 0x80100 } }, /* ldbf$pack @($GRi,$GRj),$FRintk */ @@ -2203,10 +2203,10 @@ static const CGEN_OPCODE frv_cgen_insn_opcode_table[MAX_INSNS] = { { MNEM, OP (PACK), ' ', '@', '(', OP (GRI), ',', OP (GRJ), ')', ',', OP (FRINTK), 0 } }, & ifmt_ldbf, { 0x80a80 } }, -/* ldd$pack @($GRi,$GRj),$GRdoublek */ +/* ldd$pack $lddann($GRi,$GRj),$GRdoublek */ { { 0, 0, 0, 0 }, - { { MNEM, OP (PACK), ' ', '@', '(', OP (GRI), ',', OP (GRJ), ')', ',', OP (GRDOUBLEK), 0 } }, + { { MNEM, OP (PACK), ' ', OP (LDDANN), '(', OP (GRI), ',', OP (GRJ), ')', ',', OP (GRDOUBLEK), 0 } }, & ifmt_ldd, { 0x80140 } }, /* lddf$pack @($GRi,$GRj),$FRdoublek */ @@ -3691,10 +3691,10 @@ static const CGEN_OPCODE frv_cgen_insn_opcode_table[MAX_INSNS] = { { MNEM, OP (PACK), ' ', '@', '(', OP (GRI), ',', OP (GRJ), ')', 0 } }, & ifmt_jmpl, { 0x300000 } }, -/* calll$pack @($GRi,$GRj) */ +/* calll$pack $callann($GRi,$GRj) */ { { 0, 0, 0, 0 }, - { { MNEM, OP (PACK), ' ', '@', '(', OP (GRI), ',', OP (GRJ), ')', 0 } }, + { { MNEM, OP (PACK), ' ', OP (CALLANN), '(', OP (GRI), ',', OP (GRJ), ')', 0 } }, & ifmt_calll, { 0x2300000 } }, /* jmpil$pack @($GRi,$s12) */ diff --git a/opcodes/frv-opc.h b/opcodes/frv-opc.h index c0a52dc..8dc0954 100644 --- a/opcodes/frv-opc.h +++ b/opcodes/frv-opc.h @@ -366,6 +366,7 @@ struct cgen_fields long f_TLBPR_null; long f_LI_off; long f_LI_on; + long f_reloc_ann; }; #define CGEN_INIT_PARSE(od) \ -- cgit v1.1