X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fpc532-mach.c;h=4dbd32da2187e5f223627db6805f2daa8b40be39;hb=49f30d83f659591d7d2b14a18dc8308b3fdb8dd5;hp=73f4ac49e82725f796d03cfd4f04bad972a6cf5e;hpb=dc9e099fc0eced486ae2b49455c9da113c11f4ff;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c index 73f4ac49e8..4dbd32da21 100644 --- a/bfd/pc532-mach.c +++ b/bfd/pc532-mach.c @@ -1,38 +1,37 @@ /* BFD back-end for Mach3/532 a.out-ish binaries. - Copyright (C) 1990, 1991, 1992, 1994 Free Software Foundation, Inc. + Copyright (C) 1990-2016 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 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., 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Written by Ian Dall - * 19-Apr-94 - * - * Formerly part of aout-pc532-mach.c. Split out to allow more - * flexibility with multiple formats. - * - */ + 19-Apr-94 + + Formerly part of aout-pc532-mach.c. Split out to allow more + flexibility with multiple formats. */ + /* This architecture has N_TXTOFF and N_TXTADDR defined as if - * N_HEADER_IN_TEXT, but the a_text entry (text size) does not include the - * space for the header. So we have N_HEADER_IN_TEXT defined to - * 1 and specially define our own N_TXTSIZE - */ + N_HEADER_IN_TEXT, but the a_text entry (text size) does not include the + space for the header. So we have N_HEADER_IN_TEXT defined to + 1 and specially define our own N_TXTSIZE. */ #define N_HEADER_IN_TEXT(x) 1 -#define N_TXTSIZE(x) ((x).a_text) - +#define N_TXTSIZE(x) ((x)->a_text) #define TEXT_START_ADDR 0x10000 /* from old ld */ #define TARGET_PAGE_SIZE 0x1000 /* from old ld, 032 & 532 are really 512/4k */ @@ -40,80 +39,68 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Use a_entry of 0 to distinguish object files from OMAGIC executables */ #define N_TXTADDR(x) \ (N_MAGIC(x) == OMAGIC ? \ - ((x).a_entry < TEXT_START_ADDR? 0: TEXT_START_ADDR): \ + ((x)->a_entry < TEXT_START_ADDR? 0: TEXT_START_ADDR): \ (N_MAGIC(x) == NMAGIC? TEXT_START_ADDR: \ TEXT_START_ADDR + EXEC_BYTES_SIZE)) #define SEGMENT_SIZE TARGET_PAGE_SIZE -#define N_SHARED_LIB(x) 0 #define SEGMENT_SIZE TARGET_PAGE_SIZE #define DEFAULT_ARCH bfd_arch_ns32k - -#define MY(OP) CAT(pc532machaout_,OP) + +/* 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 (ns32k_aout_pc532mach_,OP) /* Must be the same as aout-ns32k.c */ -#define NAME(x,y) CAT3(ns32kaout,_32_,y) +#define NAME(x,y) CONCAT3 (ns32kaout,_32_,y) #define TARGETNAME "a.out-pc532-mach" -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libaout.h" #include "libbfd.h" #include "aout/aout64.h" -/* We can`t use the MYNS macro here for cpp reasons too subtle for me -- IWD */ +#define MY_bfd_reloc_type_lookup ns32k_aout_bfd_reloc_type_lookup -#define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup - -/* libaout doesn't use NAME for these ... */ +/* libaout doesn't use NAME for these ... */ #define MY_get_section_contents aout_32_get_section_contents #define MY_text_includes_header 1 #define MY_exec_header_not_counted 1 - -#define MYNSX(OP) CAT(ns32kaout_,OP) -reloc_howto_type * -MYNSX(bfd_reloc_type_lookup) - PARAMS((bfd *abfd AND - bfd_reloc_code_real_type code)); - -boolean -MYNSX(write_object_contents) - PARAMS((bfd *abfd)); - -static boolean -MY(write_object_contents) (abfd) -bfd *abfd; + +reloc_howto_type *MY_bfd_reloc_type_lookup + (bfd *abfd, bfd_reloc_code_real_type code); + +static bfd_boolean +MY(write_object_contents) (bfd *abfd) { struct external_exec exec_bytes; struct internal_exec *execp = exec_hdr (abfd); - -#if CHOOSE_RELOC_SIZE - CHOOSE_RELOC_SIZE(abfd); -#else + obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; -#endif - + BFD_ASSERT (bfd_get_arch (abfd) == bfd_arch_ns32k); switch (bfd_get_mach (abfd)) { case 32032: - N_SET_MACHTYPE (*execp, M_NS32032); + N_SET_MACHTYPE (execp, M_NS32032); break; case 32532: default: - N_SET_MACHTYPE (*execp, M_NS32532); + N_SET_MACHTYPE (execp, M_NS32532); break; } - N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags); - - WRITE_HEADERS(abfd, execp); - - return true; + N_SET_FLAGS (execp, aout_backend_info (abfd)->exec_hdr_flags); + + WRITE_HEADERS (abfd, execp); + + return TRUE; } #define MY_write_object_contents MY(write_object_contents)