Changeset 609 for branches/GNU/src/binutils/bfd/cpu-h8300.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/cpu-h8300.c (modified) (6 diffs, 1 prop)

branches/GNU/src/binutils/bfd/cpu-h8300.c

@@ -1 @@
-/* BFD library support routines for the Hitachi H8/300 architecture.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2000
+/* BFD library support routines for the Renesas H8/300 architecture.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
-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 2 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
@@ -24 +24 @@
 #include "libbfd.h"
 
-int bfd_default_scan_num_mach ();
+static bfd_boolean h8300_scan
+  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 *));
 
-static boolean
+static bfd_boolean
 h8300_scan (info, string)
      const struct bfd_arch_info *info;
@@ -32 +35 @@
 {
   if (*string != 'h' && *string != 'H')
-    return false;
+    return FALSE;
 
   string++;
   if (*string != '8')
-    return false;
+    return FALSE;
 
   string++;
@@ -43 +46 @@
 
   if (*string != '3')
-    return false;
+    return FALSE;
   string++;
   if (*string != '0')
-    return false;
+    return FALSE;
   string++;
   if (*string != '0')
-    return false;
+    return FALSE;
   string++;
   if (*string == '-')
     string++;
+
+  /* In ELF linker scripts, we typically express the architecture/machine
+     as architecture:machine.
+
+     So if we've matched so far and encounter a colon, try to match the
+     string following the colon.  */
+  if (*string == ':')
+    {
+      string++;
+      return h8300_scan (info, string);
+    }
+
   if (*string == 'h' || *string == 'H')
     {
+      string++;
+      if (*string == 'n' || *string == 'N')
+        return (info->mach == bfd_mach_h8300hn);
+
       return (info->mach == bfd_mach_h8300h);
     }
   else if (*string == 's' || *string == 'S')
     {
+      string++;
+      if (*string == 'n' || *string == 'N')
+        return (info->mach == bfd_mach_h8300sn);
+
       return (info->mach == bfd_mach_h8300s);
     }
   else
-    {
-      return info->mach == bfd_mach_h8300;
-    }
+    return info->mach == bfd_mach_h8300;
 }
 
@@ -77 +98 @@
 {
   /* It's really not a good idea to mix and match modes.  */
-  if (in->mach != out->mach)
+  if (in->arch != out->arch || in->mach != out->mach)
     return 0;
   else
@@ -83 +104 @@
 }
 
-static const bfd_arch_info_type h8300_info_struct =
+static const bfd_arch_info_type h8300sn_info_struct =
 {
-  16,                           /* 16 bits in a word */
-  16,                           /* 16 bits in an address */
-  8,                            /* 8 bits in a byte */
+  32,                           /* 32 bits in a word.  */
+  32,                           /* 32 bits in an address.  */
+  8,                            /* 8 bits in a byte.  */
   bfd_arch_h8300,
-  bfd_mach_h8300,
-  "h8300",                      /* arch_name  */
-  "h8300",                      /* printable name */
+  bfd_mach_h8300sn,
+  "h8300sn",                    /* Architecture name.  */
+  "h8300sn",                    /* Printable name.  */
   1,
-  true,                         /* the default machine */
+  FALSE,                        /* The default machine.  */
   compatible,
   h8300_scan,
-#if 0
-  local_bfd_reloc_type_lookup,
-#endif
-  0,
+  0
+};
+
+
+static const bfd_arch_info_type h8300hn_info_struct =
+{
+  32,                           /* 32 bits in a word.  */
+  32,                           /* 32 bits in an address.  */
+  8,                            /* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300hn,
+  "h8300hn",                    /* Architecture name.  */
+  "h8300hn",                    /* Printable name.  */
+  1,
+  FALSE,                        /* The default machine.  */
+  compatible,
+  h8300_scan,
+  &h8300sn_info_struct
+};
+
+static const bfd_arch_info_type h8300s_info_struct =
+{
+  32,                           /* 32 bits in a word.  */
+  32,                           /* 32 bits in an address.  */
+  8,                            /* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300s,
+  "h8300s",                     /* Architecture name.  */
+  "h8300s",                     /* Printable name.  */
+  1,
+  FALSE,                        /* The default machine.  */
+  compatible,
+  h8300_scan,
+  & h8300hn_info_struct
 };
 
 static const bfd_arch_info_type h8300h_info_struct =
 {
-  32,                           /* 32 bits in a word */
-  32,                           /* 32 bits in an address */
-  8,                            /* 8 bits in a byte */
+  32,                           /* 32 bits in a word.  */
+  32,                           /* 32 bits in an address.  */
+  8,                            /* 8 bits in a byte.  */
   bfd_arch_h8300,
   bfd_mach_h8300h,
-  "h8300h",                     /* arch_name  */
-  "h8300h",                     /* printable name */
+  "h8300h",                     /* Architecture name.  */
+  "h8300h",                     /* Printable name.  */
   1,
-  false,                        /* the default machine */
+  FALSE,                        /* The default machine.  */
   compatible,
   h8300_scan,
-#if 0
-  local_bfd_reloc_type_lookup,
-#endif
-  &h8300_info_struct,
+  &h8300s_info_struct
 };
 
 const bfd_arch_info_type bfd_h8300_arch =
 {
-  32,                           /* 32 bits in a word */
-  32,                           /* 32 bits in an address */
-  8,                            /* 8 bits in a byte */
+  16,                           /* 16 bits in a word.  */
+  16,                           /* 16 bits in an address.  */
+  8,                            /* 8 bits in a byte.  */
   bfd_arch_h8300,
-  bfd_mach_h8300s,
-  "h8300s",                     /* arch_name  */
-  "h8300s",                     /* printable name */
+  bfd_mach_h8300,
+  "h8300",                      /* Architecture name.  */
+  "h8300",                      /* Printable name.  */
   1,
-  false,                        /* the default machine */
+  TRUE,                         /* The default machine.  */
   compatible,
   h8300_scan,
-#if 0
-  local_bfd_reloc_type_lookup,
-#endif
-  &h8300h_info_struct,
+  &h8300h_info_struct
 };