X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcpu-v850.c;h=319cb046449b489d0e3994e01f4088e9f52becc1;hb=c5e38e547e14e9f282c9d98a7c70272cecdcac10;hp=ce61caa756273f1f9b25b9d75e2452c96f568ebf;hpb=86aba9dbfa7eb9bf07dd611c85e3cff31ebaa740;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-v850.c b/bfd/cpu-v850.c
index ce61caa756..319cb04644 100644
--- a/bfd/cpu-v850.c
+++ b/bfd/cpu-v850.c
@@ -1,11 +1,12 @@
 /* BFD support for the NEC V850 processor
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2007
+   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 2 of the License, or
+   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,
@@ -15,84 +16,28 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "safe-ctype.h"
 
-static boolean scan PARAMS ((const struct bfd_arch_info *, const char *));
-
-static boolean
-scan (info, string)
-     const struct bfd_arch_info * info;
-     const char * string;
-{
-  const char *ptr_src;
-  const char *ptr_tst;
-  unsigned long number;
-  enum bfd_architecture arch;
-
-  /* First test for an exact match.  */
-  if (strcasecmp (string, info->printable_name) == 0)
-    return true;
-
-  /* See how much of the supplied string matches with the
-     architecture, eg the string m68k:68020 would match the m68k entry
-     up to the :, then we get left with the machine number.  */
-  for (ptr_src = string, ptr_tst = info->arch_name;
-       *ptr_src && *ptr_tst;
-       ptr_src++, ptr_tst++)
-    if (*ptr_src != *ptr_tst)
-      break;
-
-  /* Chewed up as much of the architecture as will match;
-     if there is a colon present skip it.  */
-  if (*ptr_src == ':')
-    ptr_src ++;
-
-  if (*ptr_src == 0)
-    /* Nothing more, then only keep this one if it is
-       the default machine for this architecture.  */
-    return info->the_default;
-
-  number = 0;
-  while (ISDIGIT (*ptr_src))
-    {
-      number = number * 10 + * ptr_src  - '0';
-      ptr_src ++;
-    }
-
-  switch (number)
-    {
-    case bfd_mach_v850e:  arch = bfd_arch_v850; break;
-    default:
-      return false;
-    }
-
-  if (arch != info->arch)
-    return false;
-
-  if (number != info->mach)
-    return false;
-
-  return true;
-}
-
 #define N(number, print, default, next)  \
 {  32, 32, 8, bfd_arch_v850, number, "v850", print, 2, default, \
-     bfd_default_compatible, scan, next }
+     bfd_default_compatible, bfd_default_scan, next }
 
 #define NEXT NULL
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N (bfd_mach_v850e,  "v850e",  false, NULL)
+  N (bfd_mach_v850e1, "v850e1", FALSE, & arch_info_struct[1]),
+  N (bfd_mach_v850e,  "v850e",  FALSE, NULL)
 };
 
 #undef  NEXT
 #define NEXT & arch_info_struct[0]
 
 const bfd_arch_info_type bfd_v850_arch =
-  N (bfd_mach_v850, "v850", true, NEXT);
+  N (bfd_mach_v850, "v850", TRUE, NEXT);