* config/obj-coff.c: Fix formatting.

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

diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c
index 44adf9217ff801690d53a12d7d6f75638566b570..dff2f88ebe1c300d52701531a1db2da472377294 100644 (file)
--- a/bfd/cpu-sh.c
+++ b/bfd/cpu-sh.c
@@ -1,5 +1,6 @@
 /* BFD library support routines for the Hitachi-SH architecture.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1997, 1998, 2000, 2001
+   Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -22,18 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-
-static boolean 
-scan_mach (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  if (strcasecmp (info->printable_name, string) == 0)
-    return true;
-  return false;
-}
-
-
 #if 0
 /* This routine is provided two arch_infos and returns whether
    they'd be compatible */
@@ -49,12 +38,47 @@ compatible (a,b)
 }
 #endif
 
-#define SH_NEXT &arch_info_struct[0]
-#define SH3_NEXT &arch_info_struct[1]
-#define SH3E_NEXT NULL
+#define SH_NEXT      &arch_info_struct[0]
+#define SH2_NEXT     &arch_info_struct[1]
+#define SH_DSP_NEXT  &arch_info_struct[2]
+#define SH3_NEXT     &arch_info_struct[3]
+#define SH3_DSP_NEXT &arch_info_struct[4]
+#define SH3E_NEXT    &arch_info_struct[5]
+#define SH4_NEXT     NULL
+#undef  SH4_NEXT
+#define SH4_NEXT     &arch_info_struct[6]
+#define SH64_NEXT    NULL
 
-static const bfd_arch_info_type arch_info_struct[] = 
+static const bfd_arch_info_type arch_info_struct[] =
 {
+  {
+    32,                                /* 32 bits in a word */
+    32,                                /* 32 bits in an address */
+    8,                         /* 8 bits in a byte */
+    bfd_arch_sh,
+    bfd_mach_sh2,
+    "sh",                      /* arch_name  */
+    "sh2",                     /* printable name */
+    1,
+    false,                     /* not the default */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH2_NEXT
+  },
+  {
+    32,                                /* 32 bits in a word */
+    32,                                /* 32 bits in an address */
+    8,                         /* 8 bits in a byte */
+    bfd_arch_sh,
+    bfd_mach_sh_dsp,
+    "sh",                      /* arch_name  */
+    "sh-dsp",                  /* printable name */
+    1,
+    false,                     /* not the default */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH_DSP_NEXT
+  },
   {
     32,                                /* 32 bits in a word */
     32,                                /* 32 bits in an address */
@@ -66,9 +90,23 @@ static const bfd_arch_info_type arch_info_struct[] =
     1,
     false,                     /* not the default */
     bfd_default_compatible,
-    scan_mach,
+    bfd_default_scan,
     SH3_NEXT
   },
+  {
+    32,                                /* 32 bits in a word */
+    32,                                /* 32 bits in an address */
+    8,                         /* 8 bits in a byte */
+    bfd_arch_sh,
+    bfd_mach_sh3_dsp,
+    "sh",                      /* arch_name  */
+    "sh3-dsp",                 /* printable name */
+    1,
+    false,                     /* not the default */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH3_DSP_NEXT
+  },
   {
     32,                                /* 32 bits in a word */
     32,                                /* 32 bits in an address */
@@ -80,9 +118,37 @@ static const bfd_arch_info_type arch_info_struct[] =
     1,
     false,                     /* not the default */
     bfd_default_compatible,
-    scan_mach,
+    bfd_default_scan,
     SH3E_NEXT
   },
+  {
+    32,                                /* 32 bits in a word */
+    32,                                /* 32 bits in an address */
+    8,                         /* 8 bits in a byte */
+    bfd_arch_sh,
+    bfd_mach_sh4,
+    "sh",                      /* arch_name  */
+    "sh4",                     /* printable name */
+    1,
+    false,                     /* not the default */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH4_NEXT
+  },
+  {
+    64,                                /* 64 bits in a word */
+    64,                                /* 64 bits in an address */
+    8,                         /* 8 bits in a byte */
+    bfd_arch_sh,
+    bfd_mach_sh5,
+    "sh",                      /* arch_name  */
+    "sh5",                     /* printable name */
+    1,
+    false,                     /* not the default */
+    bfd_default_compatible,
+    bfd_default_scan,
+    SH64_NEXT
+  },
 };
 
 const bfd_arch_info_type bfd_sh_arch =
@@ -97,6 +163,6 @@ const bfd_arch_info_type bfd_sh_arch =
   1,
   true,                                /* the default machine */
   bfd_default_compatible,
-  scan_mach,
+  bfd_default_scan,
   SH_NEXT
 };