* Makefile.am (libbfd.h): Add "Extracted from.." comment.

[deliverable/binutils-gdb.git] / bfd / cpu-z8k.c

diff --git a/bfd/cpu-z8k.c b/bfd/cpu-z8k.c
index 88570232be12ad4f97d6e3a95a2fb9622f57e0c7..0afdfc7560a34a99508a603a321b4e55e6511b57 100644 (file)
--- a/bfd/cpu-z8k.c
+++ b/bfd/cpu-z8k.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for the Z800n architecture.
 /* BFD library support routines for the Z800n architecture.

-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1994, 2000, 2001 Free Software Foundation, Inc.

    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -16,186 +16,178 @@ 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
 
 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 

+static boolean scan_mach
+  PARAMS ((const struct bfd_arch_info *, const char *));
+static const bfd_arch_info_type *compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));

 
 

-/* 
+#if 0                          /* not used currently */
+/*

 Relocations for the Z8K
 
 */
 Relocations for the Z8K
 
 */

-static bfd_reloc_status_type 
-DEFUN(howto16_callback,(abfd, reloc_entry, symbol_in, data,
-                       ignore_input_section, ignore_bfd),
-      bfd *abfd AND
-      arelent *reloc_entry AND
-      struct symbol_cache_entry *symbol_in AND
-      PTR data AND
-      asection *ignore_input_section AND
-      bfd *ignore_bfd)
+static bfd_reloc_status_type
+howto16_callback (abfd, reloc_entry, symbol_in, data,
+                 ignore_input_section, ignore_bfd)
+     bfd *abfd;
+     arelent *reloc_entry;
+     struct symbol_cache_entry *symbol_in;
+     PTR data;
+     asection *ignore_input_section;
+     bfd *ignore_bfd;

 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;
 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;

-  long x = bfd_get_16(abfd, (bfd_byte *)data + addr);
+  long x = bfd_get_16 (abfd, (bfd_byte *) data + addr);

 
 

-  HOWTO_PREPARE(relocation, symbol_in);
+  HOWTO_PREPARE (relocation, symbol_in);

 
   x = (x + relocation + reloc_entry->addend);
 
 
   x = (x + relocation + reloc_entry->addend);
 

-  bfd_put_16(abfd, x, (bfd_byte *)data + addr);
+  bfd_put_16 (abfd, x, (bfd_byte *) data + addr);

   return bfd_reloc_ok;
 }
 
   return bfd_reloc_ok;
 }
 

-
-static bfd_reloc_status_type 
-DEFUN(howto8_callback,(abfd, reloc_entry, symbol_in, data,
-                      ignore_input_section, ignore_bfd),
-      bfd *abfd AND
-      arelent *reloc_entry AND
-      struct symbol_cache_entry *symbol_in AND
-      PTR data AND
-      asection *ignore_input_section AND
-      bfd *ignore_bfd)
+static bfd_reloc_status_type
+howto8_callback (abfd, reloc_entry, symbol_in, data,
+                ignore_input_section, ignore_bfd)
+     bfd *abfd;
+     arelent *reloc_entry;
+     struct symbol_cache_entry *symbol_in;
+     PTR data;
+     asection *ignore_input_section;
+     bfd *ignore_bfd;

 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;
 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;

-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
+  long x = bfd_get_8 (abfd, (bfd_byte *) data + addr);

 
 

-  HOWTO_PREPARE(relocation, symbol_in);
+  HOWTO_PREPARE (relocation, symbol_in);

 
   x = (x + relocation + reloc_entry->addend);
 
 
   x = (x + relocation + reloc_entry->addend);
 

-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
+  bfd_put_8 (abfd, x, (bfd_byte *) data + addr);

   return bfd_reloc_ok;
 }
 
   return bfd_reloc_ok;
 }
 

-
-static bfd_reloc_status_type 
-DEFUN(howto8_FFnn_callback,(abfd, reloc_entry, symbol_in, data,
-                           ignore_input_section, ignore_bfd),
-      bfd *abfd AND
-      arelent *reloc_entry AND
-      struct symbol_cache_entry *symbol_in AND
-      PTR data AND
-      asection *ignore_input_section AND
-      bfd *ignore_bfd)
+static bfd_reloc_status_type
+howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data,
+                     ignore_input_section, ignore_bfd)
+     bfd *abfd;
+     arelent *reloc_entry;
+     struct symbol_cache_entry *symbol_in;
+     PTR data;
+     asection *ignore_input_section;
+     bfd *ignore_bfd;

 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;
 
 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;
 

-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-  abort();
-  HOWTO_PREPARE(relocation, symbol_in);
+  long x = bfd_get_8 (abfd, (bfd_byte *) data + addr);
+  abort ();
+  HOWTO_PREPARE (relocation, symbol_in);

 
   x = (x + relocation + reloc_entry->addend);
 
 
   x = (x + relocation + reloc_entry->addend);
 

-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
+  bfd_put_8 (abfd, x, (bfd_byte *) data + addr);

   return bfd_reloc_ok;
 }
 
   return bfd_reloc_ok;
 }
 

-static bfd_reloc_status_type 
-DEFUN(howto8_pcrel_callback,(abfd, reloc_entry, symbol_in, data,
-                            ignore_input_section, ignore_bfd),
-      bfd *abfd AND
-      arelent *reloc_entry AND
-      struct symbol_cache_entry *symbol_in AND
-      PTR data AND
-      asection *ignore_input_section AND
-      bfd *ignore_bfd)
+static bfd_reloc_status_type
+howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
+                      ignore_input_section, ignore_bfd)
+     bfd *abfd;
+     arelent *reloc_entry;
+     struct symbol_cache_entry *symbol_in;
+     PTR data;
+     asection *ignore_input_section;
+     bfd *ignore_bfd;

 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;
 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;

-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-  abort();
-  HOWTO_PREPARE(relocation, symbol_in);
+  long x = bfd_get_8 (abfd, (bfd_byte *) data + addr);
+  abort ();
+  HOWTO_PREPARE (relocation, symbol_in);

 
   x = (x + relocation + reloc_entry->addend);
 
 
   x = (x + relocation + reloc_entry->addend);
 

-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
+  bfd_put_8 (abfd, x, (bfd_byte *) data + addr);

   return bfd_reloc_ok;
 }
 
   return bfd_reloc_ok;
 }
 

-
-

 static reloc_howto_type howto_16
 static reloc_howto_type howto_16

-  = NEWHOWTO(howto16_callback,"abs16",1,false,false);
+= NEWHOWTO (howto16_callback, "abs16", 1, false, false);

 static reloc_howto_type howto_8
 static reloc_howto_type howto_8

-  = NEWHOWTO(howto8_callback,"abs8",0,false,false);
+= NEWHOWTO (howto8_callback, "abs8", 0, false, false);

 
 static reloc_howto_type howto_8_FFnn
 
 static reloc_howto_type howto_8_FFnn

-  = NEWHOWTO(howto8_FFnn_callback,"ff00+abs8",0,false,false);
+= NEWHOWTO (howto8_FFnn_callback, "ff00+abs8", 0, false, false);

 
 static reloc_howto_type howto_8_pcrel
 
 static reloc_howto_type howto_8_pcrel

-  = NEWHOWTO(howto8_pcrel_callback,"pcrel8",0,false,true);
+= NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, false, true);

 
 

-
-static CONST struct reloc_howto_struct *
-DEFUN(local_bfd_reloc_type_lookup,(arch, code),
- CONST struct bfd_arch_info *arch AND
- bfd_reloc_code_real_type code)
+static reloc_howto_type *
+local_bfd_reloc_type_lookup (arch, code)
+     const struct bfd_arch_info *arch;
+     bfd_reloc_code_real_type code;

 {
 {

-  switch (code) {
-  case BFD_RELOC_16:
-    return &howto_16;
-  case BFD_RELOC_8_FFnn:
-    return &howto_8_FFnn;
-  case BFD_RELOC_8:
-    return &howto_8;
-  case BFD_RELOC_8_PCREL:
-    return &howto_8_pcrel;
-  }
-  return (reloc_howto_type *)NULL;
+  switch (code)
+    {
+    case BFD_RELOC_16:
+      return &howto_16;
+    case BFD_RELOC_8_FFnn:
+      return &howto_8_FFnn;
+    case BFD_RELOC_8:
+      return &howto_8;
+    case BFD_RELOC_8_PCREL:
+      return &howto_8_pcrel;
+    default:
+      return (reloc_howto_type *) NULL;
+    }

 }
 }

+#endif

 
 

-int bfd_default_scan_num_mach();
-
-static boolean 
-DEFUN(scan_mach,(info, string),
-CONST struct bfd_arch_info *info AND
-CONST char *string)
+static boolean
+scan_mach (info, string)
+     const struct bfd_arch_info *info;
+     const char *string;

 {
 {

-  if (strcmp(string,"z8001") == 0 || strcmp(string,"z8k") == 0) 
-  {
-    return bfd_mach_z8001 == info->mach;
-  }
-  if (strcmp(string,"z8002") == 0) 
-  {
-    return bfd_mach_z8002 == info->mach;
-  }
+  if (strcmp (string, "z8001") == 0 || strcmp (string, "z8k") == 0)
+    {
+      return bfd_mach_z8001 == info->mach;
+    }
+  if (strcmp (string, "z8002") == 0)
+    {
+      return bfd_mach_z8002 == info->mach;
+    }

   return false;
 }
 
   return false;
 }
 

-

 /* This routine is provided two arch_infos and returns whether
    they'd be compatible */
 
 /* This routine is provided two arch_infos and returns whether
    they'd be compatible */
 

-CONST bfd_arch_info_type *
-DEFUN(compatible,(a,b),
-      CONST bfd_arch_info_type *a AND
-      CONST bfd_arch_info_type *b)
+static const bfd_arch_info_type *
+compatible (a, b)
+     const bfd_arch_info_type *a;
+     const bfd_arch_info_type *b;

 {
   if (a->arch != b->arch || a->mach != b->mach)
 {
   if (a->arch != b->arch || a->mach != b->mach)

-   return NULL;
+    return NULL;

   return a;
 }
 
   return a;
 }
 

-
-static bfd_arch_info_type arch_info_struct[] = 
-{ 
-{ 32, 16, 8,bfd_arch_z8k, bfd_mach_z8002,"z8k","z8002",1,0,compatible,scan_mach,0,},
-{ 32, 32, 8,bfd_arch_z8k, bfd_mach_z8001,"z8k","z8001",1,1,compatible,scan_mach,0,},
-  };
-
-
-
-void
-DEFUN_VOID(bfd_z8k_arch)
+static const bfd_arch_info_type arch_info_struct[] =

 {
 {

-  bfd_arch_linkin(&arch_info_struct[0]);
-  bfd_arch_linkin(&arch_info_struct[1]);
-}
-
+  {32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, false, compatible, scan_mach, 0,},
+};

 
 

+const bfd_arch_info_type bfd_z8k_arch =
+{
+  32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, true, compatible, scan_mach, &arch_info_struct[0],
+};