X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Faout-cris.c;h=30ab2b5f4943c774e94d095507e81a37b75c3f16;hb=fad3d2c1b268735fe6bfa280a8e4e260fb0196a7;hp=a531bcbe97ebf25adc3360915384caad51bfe584;hpb=b16885a1320f3718c716b66b3858bbe1ccfa2095;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c index a531bcbe97..30ab2b5f49 100644 --- a/bfd/aout-cris.c +++ b/bfd/aout-cris.c @@ -1,32 +1,32 @@ /* BFD backend for CRIS a.out binaries. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000-2020 Free Software Foundation, Inc. Contributed by Axis Communications AB. Written by Hans-Peter Nilsson. -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 3 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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. */ /* See info in the file PORTING for documentation of these macros and functions. Beware; some of the information there is outdated. */ #define N_HEADER_IN_TEXT(x) 0 -#define BYTES_IN_WORD 4 -#define N_TXTOFF(x) 32 +#define N_TXTOFF(x) 32 #define ENTRY_CAN_BE_ZERO -#define TEXT_START_ADDR 0 +#define TEXT_START_ADDR 0 /* Without reading symbols to get the text start symbol, there is no way to know where the text segment starts in an a.out file. Defaulting to @@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ after text, but with those, we don't have any choice besides reading symbol info, and luckily there's no pressing need for correctness for those vma:s at this time. */ -#define N_TXTADDR(x) ((x).a_entry & ~0xffff) +#define N_TXTADDR(x) ((x)->a_entry & ~(bfd_vma) 0xffff) /* If you change this to 4, you can not link to an address N*4+2. */ #define SEGMENT_SIZE 2 @@ -47,8 +47,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ adata(abfd).zmagic_disk_block_size, even though the exec_header is *not* included in the text segment. A simple workaround is to #define ZMAGIC_DISK_BLOCK_SIZE, which is used if defined; otherwise - TARGET_PAGE_SIZE is used. */ -#define ZMAGIC_DISK_BLOCK_SIZE N_TXTOFF (0) + TARGET_PAGE_SIZE is used. */ +#define ZMAGIC_DISK_BLOCK_SIZE N_TXTOFF (0) /* It seems odd at first to set a page-size this low, but gives greater freedom in where things can be linked. The drawback is that you have @@ -56,72 +56,66 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define TARGET_PAGE_SIZE SEGMENT_SIZE #define TARGETNAME "a.out-cris" -/* N_SHARED_LIB gets this reasonable default as of 1999-07-12, but we - have to work with 2.9.1. Note that N_SHARED_LIB is used in a - SUN-specific context, not applicable to CRIS. */ -#define N_SHARED_LIB(x) 0 - /* The definition here seems not used; just provided as a convention. */ #define DEFAULT_ARCH bfd_arch_cris -/* ??? Spacing might be essential for the parameters in this macro. - Do Not Change. */ -#define MY(OP) CAT (cris_aout_,OP) -#define NAME(x,y) CAT3(cris_aout,_32_,y) +/* Do not "beautify" the CONCAT* macro args. Traditional C will not + remove whitespace added here, and thus will fail to concatenate + the tokens. */ +#define MY(OP) CONCAT2 (cris_aout_,OP) +#define NAME(x, y) CONCAT3 (cris_aout,_32_,y) +#include "sysdep.h" #include "bfd.h" /* Version 1 of the header. */ #define MY_exec_hdr_flags 1 -#define MY_write_object_contents MY(write_object_contents) -static boolean MY(write_object_contents) PARAMS ((bfd *)); +#define MY_write_object_contents MY (write_object_contents) +static bfd_boolean MY (write_object_contents) (bfd *); /* Forward this, so we can use a pointer to it in PARAMS. */ struct reloc_ext_external; -#define MY_swap_ext_reloc_out MY(swap_ext_reloc_out) -static void MY(swap_ext_reloc_out) PARAMS ((bfd *, arelent *, - struct reloc_ext_external *)); +#define MY_swap_ext_reloc_out MY (swap_ext_reloc_out) +static void MY (swap_ext_reloc_out) (bfd *, arelent *, struct reloc_ext_external *); -#define MY_swap_ext_reloc_in MY(swap_ext_reloc_in) -static void MY(swap_ext_reloc_in) PARAMS ((bfd *, struct - reloc_ext_external *, - arelent *, asymbol **, - bfd_size_type)); +#define MY_swap_ext_reloc_in MY (swap_ext_reloc_in) +static void MY (swap_ext_reloc_in) (bfd *, struct reloc_ext_external *, + arelent *, asymbol **, bfd_size_type); -#define MY_set_sizes MY(set_sizes) -static boolean MY(set_sizes) PARAMS ((bfd *)); +#define MY_set_sizes MY (set_sizes) +static bfd_boolean MY (set_sizes) (bfd *); -/* To set back reloc_size to ext, we make MY(set_sizes) be called +/* To set back reloc_size to ext, we make MY (set_sizes) be called through this construct. Note that MY_set_arch_mach is only called through SET_ARCH_MACH. The default bfd_default_set_arch_mach will not call set_sizes. */ #define MY_set_arch_mach NAME (aout, set_arch_mach) -#define SET_ARCH_MACH(BFD, EXEC) \ - MY_set_arch_mach (BFD, DEFAULT_ARCH, N_MACHTYPE (EXEC)) +#define SET_ARCH_MACH(BFD, EXECP) \ + MY_set_arch_mach (BFD, DEFAULT_ARCH, N_MACHTYPE (EXECP)) /* These macros describe the binary layout of the reloc information we use in a file. */ -#define RELOC_EXT_BITS_EXTERN_LITTLE 0x80 -#define RELOC_EXT_BITS_TYPE_LITTLE 3 +#define RELOC_EXT_BITS_EXTERN_LITTLE 0x80 +#define RELOC_EXT_BITS_TYPE_LITTLE 3 #define RELOC_EXT_BITS_TYPE_SH_LITTLE 0 #ifndef MY_get_section_contents #define MY_get_section_contents aout_32_get_section_contents #endif +#define MACHTYPE_OK(mtype) ((mtype) == M_CRIS) + /* Include generic functions (some are overridden above). */ #include "aout32.c" #include "aout-target.h" - /* We need our own version to set header flags. */ -static boolean -MY(write_object_contents) (abfd) - bfd *abfd; +static bfd_boolean +MY (write_object_contents) (bfd *abfd) { struct external_exec exec_bytes; struct internal_exec *execp = exec_hdr (abfd); @@ -134,31 +128,29 @@ MY(write_object_contents) (abfd) /* Setting N_SET_MACHTYPE and using N_SET_FLAGS is not performed by the default definition. */ - if (bfd_get_arch(abfd) == bfd_arch_cris) - N_SET_MACHTYPE(*execp, M_CRIS); + if (bfd_get_arch (abfd) == bfd_arch_cris) + N_SET_MACHTYPE (execp, M_CRIS); - N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags); + N_SET_FLAGS (execp, aout_backend_info (abfd)->exec_hdr_flags); WRITE_HEADERS (abfd, execp); - return true; + return TRUE; } - /* We need our own for these reasons: - - Assert that a normal 8, 16 or 32 reloc is output. - - Fix what seems to be a weak-bug (perhaps there for valid reasons). */ + - Assert that a normal 8, 16 or 32 reloc is output. + - Fix what seems to be a weak-bug (perhaps there for valid reasons). */ static void -MY(swap_ext_reloc_out) (abfd, g, natptr) - bfd *abfd; - arelent *g; - struct reloc_ext_external *natptr; +MY (swap_ext_reloc_out) (bfd *abfd, + arelent *g, + struct reloc_ext_external *natptr) { int r_index; int r_extern; unsigned int r_type; - unsigned int r_addend; + bfd_vma r_addend; asymbol *sym = *(g->sym_ptr_ptr); asection *output_section = sym->section->output_section; @@ -177,14 +169,14 @@ MY(swap_ext_reloc_out) (abfd, g, natptr) from the abs section, or as a symbol which has an abs value. check for that here. */ - if (bfd_is_abs_section (bfd_get_section (sym))) + if (bfd_is_abs_section (bfd_asymbol_section (sym))) { r_extern = 0; r_index = N_ABS; } else if ((sym->flags & BSF_SECTION_SYM) == 0) { - if (bfd_is_und_section (bfd_get_section (sym)) + if (bfd_is_und_section (bfd_asymbol_section (sym)) /* Remember to check for weak symbols; they count as global. */ || (sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0) r_extern = 1; @@ -204,9 +196,10 @@ MY(swap_ext_reloc_out) (abfd, g, natptr) We may change this later, but assert this for the moment. */ if (r_type > 2) { - (*_bfd_error_handler) (_("%s: Invalid relocation type exported: %d"), - bfd_get_filename (abfd), r_type); - + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type exported: %#x"), + abfd, r_type); + bfd_set_error (bfd_error_wrong_format); } @@ -221,16 +214,14 @@ MY(swap_ext_reloc_out) (abfd, g, natptr) PUT_WORD (abfd, r_addend, natptr->r_addend); } - /* We need our own to assert that a normal 8, 16 or 32 reloc is input. */ static void -MY(swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount) - bfd *abfd; - struct reloc_ext_external *bytes; - arelent *cache_ptr; - asymbol **symbols; - bfd_size_type symcount; +MY (swap_ext_reloc_in) (bfd *abfd, + struct reloc_ext_external *bytes, + arelent *cache_ptr, + asymbol **symbols, + bfd_size_type symcount) { unsigned int r_index; int r_extern; @@ -249,20 +240,21 @@ MY(swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount) if (r_type > 2) { - (*_bfd_error_handler) (_("%s: Invalid relocation type imported: %d"), - bfd_get_filename (abfd), r_type); - - bfd_set_error(bfd_error_wrong_format); + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type imported: %#x"), + abfd, r_type); + + bfd_set_error (bfd_error_wrong_format); } - + cache_ptr->howto = howto_table_ext + r_type; if (r_extern && r_index > symcount) { - (*_bfd_error_handler) - (_("%s: Bad relocation record imported: %d"), - bfd_get_filename (abfd), r_index); - + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: bad relocation record imported: %d"), abfd, r_index); + bfd_set_error (bfd_error_wrong_format); /* We continue, so we can catch further errors. */ @@ -275,21 +267,19 @@ MY(swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount) MOVE_ADDRESS (GET_SWORD (abfd, bytes->r_addend)); } - /* We use the same as the default, except that we also set "obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;", to avoid changing NAME (aout, set_arch_mach) in aoutx. */ -static boolean -MY(set_sizes) (abfd) - bfd *abfd; +static bfd_boolean +MY (set_sizes) (bfd *abfd) { /* Just as the default in aout-target.h (with some #ifdefs folded)... */ - adata(abfd).page_size = TARGET_PAGE_SIZE; - adata(abfd).segment_size = SEGMENT_SIZE; - adata(abfd).zmagic_disk_block_size = ZMAGIC_DISK_BLOCK_SIZE; - adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE; + adata (abfd).page_size = TARGET_PAGE_SIZE; + adata (abfd).segment_size = SEGMENT_SIZE; + adata (abfd).zmagic_disk_block_size = ZMAGIC_DISK_BLOCK_SIZE; + adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE; /* ... except for that we have the extended reloc. The alternative would be to add a check on bfd_arch_cris in NAME (aout, @@ -297,13 +287,6 @@ MY(set_sizes) (abfd) target-specific things should not be added there. */ obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE; - - return true; -} -/* - * Local variables: - * eval: (c-set-style "gnu") - * indent-tabs-mode: t - * End: - */ + return TRUE; +}