X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fpc532-mach.c;h=dfd19843c79735ba4407b08aac689a505dce1124;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=ccd858fe4857c49c4be8a8b59db2cae7b6fa9232;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c
index ccd858fe48..dfd19843c7 100644
--- a/bfd/pc532-mach.c
+++ b/bfd/pc532-mach.c
@@ -1,99 +1,106 @@
+/* BFD back-end for Mach3/532 a.out-ish binaries.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.
+
+   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 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.
+
+   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.  */
+
+
 /* 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 PAGE_SIZE 0x1000       /* from old ld,  032 & 532 are really 512/4k */
+#define TARGET_PAGE_SIZE 0x1000       /* from old ld,  032 & 532 are really 512/4k */
 
 /* 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): \
-      (N_MAGIC(x) == NMAGIC? TEXT_START_ADDR: \
-        TEXT_START_ADDR + EXEC_BYTES_SIZE))
-
-#define ARCH 32
+  (N_MAGIC(x) == OMAGIC ? \
+   ((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	PAGE_SIZE
+#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
 
-#define N_SHARED_LIB(x) 0
-#define SEGMENT_SIZE PAGE_SIZE
+#define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define DEFAULT_ARCH bfd_arch_ns32k
 
-#define MY(OP) CAT(pc532mach_,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) CONCAT3 (ns32kaout,_32_,y)
 
 #define TARGETNAME "a.out-pc532-mach"
 
-#include "bfd.h"
 #include "sysdep.h"
-#include "aout-ns32k.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 ns32kaout_bfd_reloc_type_lookup
+#define MY_bfd_reloc_type_lookup ns32k_aout_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
 
-/* Forward declaration. Defined in aout-target.h */
-static boolean MY(set_sizes)();
+#define MY_text_includes_header 1
 
-static CONST struct aout_backend_data MY(backend_data) = {
-  0,				/* zmagic contiguous */
-  1,				/* text incl header */
-  0,
-  0,				/* text vma? */
-  MY(set_sizes),
-  1,				/* exec header is not counted */
-};
+#define MY_exec_header_not_counted 1
 
-#define MY_backend_data &MY(backend_data)
+reloc_howto_type *MY_bfd_reloc_type_lookup
+  (bfd *abfd, bfd_reloc_code_real_type code);
 
-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);
 
-#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);
-    break;
-  case 32532:
-  default:
-    N_SET_MACHTYPE (*execp, M_NS32532);
-    break;
-  }
-  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
-
-  WRITE_HEADERS(abfd, execp);
-
-  return true;
+
+  BFD_ASSERT (bfd_get_arch (abfd) == bfd_arch_ns32k);
+  switch (bfd_get_mach (abfd))
+    {
+    case 32032:
+      N_SET_MACHTYPE (execp, M_NS32032);
+      break;
+    case 32532:
+    default:
+      N_SET_MACHTYPE (execp, M_NS32532);
+      break;
+    }
+  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)