X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Fcoff-z8k.c;h=076b798f534a5a8c61dd37f85d6d993373fb5e46;hb=680e019e5aeec49734760653145fee89f0ddc00b;hp=fb07db3a6e5a9d78d11b00feef09449828dd0a47;hpb=3db64b009284dda3a1ce10a91beb1297475e60a7;p=binutils-gdb.git diff --git a/bfd/coff-z8k.c b/bfd/coff-z8k.c index fb07db3a6e5..076b798f534 100644 --- a/bfd/coff-z8k.c +++ b/bfd/coff-z8k.c @@ -1,6 +1,5 @@ /* BFD back-end for Zilog Z800n COFF binaries. - Copyright 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 1992-2022 Free Software Foundation, Inc. Contributed by Cygnus Support. Written by Steve Chamberlain, . @@ -8,7 +7,7 @@ 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -18,7 +17,8 @@ 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. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ #include "sysdep.h" #include "bfd.h" @@ -31,40 +31,40 @@ #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1) static reloc_howto_type r_imm32 = -HOWTO (R_IMM32, 0, 2, 32, FALSE, 0, - complain_overflow_bitfield, 0, "r_imm32", TRUE, 0xffffffff, - 0xffffffff, FALSE); +HOWTO (R_IMM32, 0, 2, 32, false, 0, + complain_overflow_bitfield, 0, "r_imm32", true, 0xffffffff, + 0xffffffff, false); static reloc_howto_type r_imm4l = -HOWTO (R_IMM4L, 0, 0, 4, FALSE, 0, - complain_overflow_bitfield, 0, "r_imm4l", TRUE, 0xf, 0xf, FALSE); +HOWTO (R_IMM4L, 0, 0, 4, false, 0, + complain_overflow_bitfield, 0, "r_imm4l", true, 0xf, 0xf, false); static reloc_howto_type r_da = -HOWTO (R_IMM16, 0, 1, 16, FALSE, 0, - complain_overflow_bitfield, 0, "r_da", TRUE, 0x0000ffff, 0x0000ffff, - FALSE); +HOWTO (R_IMM16, 0, 1, 16, false, 0, + complain_overflow_bitfield, 0, "r_da", true, 0x0000ffff, 0x0000ffff, + false); static reloc_howto_type r_imm8 = -HOWTO (R_IMM8, 0, 0, 8, FALSE, 0, - complain_overflow_bitfield, 0, "r_imm8", TRUE, 0x000000ff, 0x000000ff, - FALSE); +HOWTO (R_IMM8, 0, 0, 8, false, 0, + complain_overflow_bitfield, 0, "r_imm8", true, 0x000000ff, 0x000000ff, + false); static reloc_howto_type r_rel16 = -HOWTO (R_REL16, 0, 1, 16, FALSE, 0, - complain_overflow_bitfield, 0, "r_rel16", TRUE, 0x0000ffff, 0x0000ffff, - TRUE); +HOWTO (R_REL16, 0, 1, 16, false, 0, + complain_overflow_bitfield, 0, "r_rel16", true, 0x0000ffff, 0x0000ffff, + true); static reloc_howto_type r_jr = -HOWTO (R_JR, 1, 0, 8, TRUE, 0, complain_overflow_signed, 0, - "r_jr", TRUE, 0xff, 0xff, TRUE); +HOWTO (R_JR, 1, 0, 8, true, 0, complain_overflow_signed, 0, + "r_jr", true, 0xff, 0xff, true); static reloc_howto_type r_disp7 = -HOWTO (R_DISP7, 0, 0, 7, TRUE, 0, complain_overflow_bitfield, 0, - "r_disp7", TRUE, 0x7f, 0x7f, TRUE); +HOWTO (R_DISP7, 0, 0, 7, true, 0, complain_overflow_bitfield, 0, + "r_disp7", true, 0x7f, 0x7f, true); static reloc_howto_type r_callr = -HOWTO (R_CALLR, 1, 1, 12, TRUE, 0, complain_overflow_signed, 0, - "r_callr", TRUE, 0xfff, 0xfff, TRUE); +HOWTO (R_CALLR, 1, 1, 12, true, 0, complain_overflow_signed, 0, + "r_callr", true, 0xfff, 0xfff, true); #define BADMAG(x) Z8KBADMAG(x) #define Z8K 1 /* Customize coffcode.h. */ @@ -85,7 +85,7 @@ rtype2howto (arelent *internal, struct internal_reloc *dst) switch (dst->r_type) { default: - abort (); + internal->howto = NULL; break; case R_IMM8: internal->howto = &r_imm8; @@ -118,18 +118,18 @@ rtype2howto (arelent *internal, struct internal_reloc *dst) static reloc_howto_type * coff_z8k_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, - bfd_reloc_code_real_type code) + bfd_reloc_code_real_type code) { switch (code) { - case BFD_RELOC_8: return & r_imm8; - case BFD_RELOC_16: return & r_da; - case BFD_RELOC_32: return & r_imm32; - case BFD_RELOC_8_PCREL: return & r_jr; - case BFD_RELOC_16_PCREL: return & r_rel16; - case BFD_RELOC_Z8K_DISP7: return & r_disp7; - case BFD_RELOC_Z8K_CALLR: return & r_callr; - case BFD_RELOC_Z8K_IMM4L: return & r_imm4l; + case BFD_RELOC_8: return & r_imm8; + case BFD_RELOC_16: return & r_da; + case BFD_RELOC_32: return & r_imm32; + case BFD_RELOC_8_PCREL: return & r_jr; + case BFD_RELOC_16_PCREL: return & r_rel16; + case BFD_RELOC_Z8K_DISP7: return & r_disp7; + case BFD_RELOC_Z8K_CALLR: return & r_callr; + case BFD_RELOC_Z8K_IMM4L: return & r_imm4l; default: BFD_FAIL (); return 0; } @@ -169,31 +169,38 @@ coff_z8k_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, static void reloc_processing (arelent *relent, - struct internal_reloc *reloc, - asymbol **symbols, - bfd *abfd, - asection *section) + struct internal_reloc *reloc, + asymbol **symbols, + bfd *abfd, + asection *section) { relent->address = reloc->r_vaddr; rtype2howto (relent, reloc); - if (reloc->r_symndx > 0) + if (reloc->r_symndx == -1) + relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; + else if (reloc->r_symndx >= 0 && reloc->r_symndx < obj_conv_table_size (abfd)) relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx]; else - relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; - + { + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: warning: illegal symbol index %ld in relocs"), + abfd, reloc->r_symndx); + relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; + } relent->addend = reloc->r_offset; relent->address -= section->vma; } static void extra_case (bfd *in_abfd, - struct bfd_link_info *link_info, - struct bfd_link_order *link_order, - arelent *reloc, - bfd_byte *data, - unsigned int *src_ptr, - unsigned int *dst_ptr) + struct bfd_link_info *link_info, + struct bfd_link_order *link_order, + arelent *reloc, + bfd_byte *data, + unsigned int *src_ptr, + unsigned int *dst_ptr) { asection * input_section = link_order->u.indirect.section; @@ -258,20 +265,17 @@ extra_case (bfd *in_abfd, + input_section->output_offset + input_section->output_section->vma); int gap = dst - dot - 1; /* -1, since we're in the odd byte of the - word and the pc's been incremented. */ + word and the pc's been incremented. */ if (gap & 1) abort (); gap /= 2; - if (gap > 128 || gap < -128) - { - if (! ((*link_info->callbacks->reloc_overflow) - (link_info, NULL, - bfd_asymbol_name (*reloc->sym_ptr_ptr), - reloc->howto->name, reloc->addend, input_section->owner, - input_section, reloc->address))) - abort (); - } + if (gap > 127 || gap < -128) + (*link_info->callbacks->reloc_overflow) + (link_info, NULL, bfd_asymbol_name (*reloc->sym_ptr_ptr), + reloc->howto->name, reloc->addend, input_section->owner, + input_section, reloc->address); + bfd_put_8 (in_abfd, gap, data + *dst_ptr); (*dst_ptr)++; (*src_ptr)++; @@ -286,24 +290,21 @@ extra_case (bfd *in_abfd, + input_section->output_offset + input_section->output_section->vma); int gap = dst - dot - 1; /* -1, since we're in the odd byte of the - word and the pc's been incremented. */ + word and the pc's been incremented. */ if (gap & 1) abort (); gap /= 2; if (gap > 0 || gap < -127) - { - if (! ((*link_info->callbacks->reloc_overflow) - (link_info, NULL, - bfd_asymbol_name (*reloc->sym_ptr_ptr), - reloc->howto->name, reloc->addend, input_section->owner, - input_section, reloc->address))) - abort (); - } + (*link_info->callbacks->reloc_overflow) + (link_info, NULL, bfd_asymbol_name (*reloc->sym_ptr_ptr), + reloc->howto->name, reloc->addend, input_section->owner, + input_section, reloc->address); + bfd_put_8 (in_abfd, - (bfd_get_8 ( in_abfd, data + *dst_ptr) & 0x80) + (-gap & 0x7f), - data + *dst_ptr); + (bfd_get_8 ( in_abfd, data + *dst_ptr) & 0x80) + (-gap & 0x7f), + data + *dst_ptr); (*dst_ptr)++; (*src_ptr)++; break; @@ -321,18 +322,15 @@ extra_case (bfd *in_abfd, if (gap & 1) abort (); if (gap > 4096 || gap < -4095) - { - if (! ((*link_info->callbacks->reloc_overflow) - (link_info, NULL, - bfd_asymbol_name (*reloc->sym_ptr_ptr), - reloc->howto->name, reloc->addend, input_section->owner, - input_section, reloc->address))) - abort (); - } + (*link_info->callbacks->reloc_overflow) + (link_info, NULL, bfd_asymbol_name (*reloc->sym_ptr_ptr), + reloc->howto->name, reloc->addend, input_section->owner, + input_section, reloc->address); + gap /= 2; bfd_put_16 (in_abfd, - (bfd_get_16 ( in_abfd, data + *dst_ptr) & 0xf000) | (-gap & 0x0fff), - data + *dst_ptr); + (bfd_get_16 ( in_abfd, data + *dst_ptr) & 0xf000) | (-gap & 0x0fff), + data + *dst_ptr); (*dst_ptr) += 2; (*src_ptr) += 2; break; @@ -348,14 +346,11 @@ extra_case (bfd *in_abfd, int gap = dst - dot - 2; if (gap > 32767 || gap < -32768) - { - if (! ((*link_info->callbacks->reloc_overflow) - (link_info, NULL, - bfd_asymbol_name (*reloc->sym_ptr_ptr), - reloc->howto->name, reloc->addend, input_section->owner, - input_section, reloc->address))) - abort (); - } + (*link_info->callbacks->reloc_overflow) + (link_info, NULL, bfd_asymbol_name (*reloc->sym_ptr_ptr), + reloc->howto->name, reloc->addend, input_section->owner, + input_section, reloc->address); + bfd_put_16 (in_abfd, (bfd_vma) gap, data + *dst_ptr); (*dst_ptr) += 2; (*src_ptr) += 2; @@ -371,6 +366,10 @@ extra_case (bfd *in_abfd, #define coff_bfd_reloc_type_lookup coff_z8k_reloc_type_lookup #define coff_bfd_reloc_name_lookup coff_z8k_reloc_name_lookup +#ifndef bfd_pe_print_pdata +#define bfd_pe_print_pdata NULL +#endif + #include "coffcode.h" #undef coff_bfd_get_relocated_section_contents @@ -380,4 +379,4 @@ extra_case (bfd *in_abfd, #undef coff_bfd_relax_section #define coff_bfd_relax_section bfd_coff_reloc16_relax_section -CREATE_BIG_COFF_TARGET_VEC (z8kcoff_vec, "coff-z8k", 0, 0, '_', NULL, COFF_SWAP_TABLE) +CREATE_BIG_COFF_TARGET_VEC (z8k_coff_vec, "coff-z8k", 0, 0, '_', NULL, COFF_SWAP_TABLE)