s/struct _serial_t/struct serial/

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

diff --git a/bfd/cpu-v850.c b/bfd/cpu-v850.c
index 084b08959bfaa2e5ccb7553e8eceb10e53b06d7c..5eb5b742ad92885ceadab6a1b83d66a35fc8ab8a 100644 (file)
--- a/bfd/cpu-v850.c
+++ b/bfd/cpu-v850.c
@@ -1,5 +1,5 @@
 /* BFD support for the NEC V850 processor
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -21,7 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-static boolean 
+#include <ctype.h>
+
+static boolean
 scan (info, string)
      const struct bfd_arch_info * info;
      const char * string;
@@ -39,9 +41,9 @@ scan (info, string)
      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; 
+  for (ptr_src = string, ptr_tst = info->arch_name;
        *ptr_src && *ptr_tst;
-       ptr_src++, ptr_tst++) 
+       ptr_src++, ptr_tst++)
     {
       if (*ptr_src != *ptr_tst) break;
     }
@@ -50,7 +52,7 @@ scan (info, string)
      colons */
   if (*ptr_src == ':')
     ptr_src++;
-  
+
   if (*ptr_src == 0)
     {
       /* nothing more, then only keep this one if it is the default
@@ -59,26 +61,21 @@ scan (info, string)
     }
 
   number = 0;
-  while (isdigit (*ptr_src))
+  while (isdigit ((unsigned char) *ptr_src))
     {
       number = number * 10 + * ptr_src  - '0';
       ptr_src++;
     }
 
-  switch (number) 
+  switch (number)
     {
-/* start-sanitize-v850e */
     case bfd_mach_v850e:  arch = bfd_arch_v850; break;
-/* end-sanitize-v850e */
-/* start-sanitize-v850eq */
-    case bfd_mach_v850eq: arch = bfd_arch_v850; break;
-/* end-sanitize-v850eq */
-
-    default:  
+    case bfd_mach_v850ea: arch = bfd_arch_v850; break;
+    default:
       return false;
     }
 
-  if (arch != info->arch) 
+  if (arch != info->arch)
     return false;
 
   if (number != info->mach)
@@ -88,17 +85,19 @@ scan (info, string)
 }
 
 #define N(number, print, default, next)  \
-{  32, 32, 8, bfd_arch_v850, number, "v850", print, 2, default, bfd_default_compatible, scan, next }
+{  32, 32, 8, bfd_arch_v850, number, "v850", print, 2, default, \
+     bfd_default_compatible, scan, next }
 
-static const bfd_arch_info_type arch_info_struct[2] = 
+#define NEXT NULL
+
+static const bfd_arch_info_type arch_info_struct[] =
 {
-/* start-sanitize-v850e */
-  N( bfd_mach_v850e, "v850e", false, & arch_info_struct[1] ),
-/* end-sanitize-v850e */
-/* start-sanitize-v850eq */
-  N( bfd_mach_v850eq, "v850eq", false, NULL ),
-/* end-sanitize-v850eq */
+  N (bfd_mach_v850e,  "v850e",  false, &arch_info_struct[1]),
+  N (bfd_mach_v850ea, "v850ea", false, NULL)
 };
 
+#undef NEXT
+#define NEXT &arch_info_struct[0]
+
 const bfd_arch_info_type bfd_v850_arch =
-  N( bfd_mach_v850, "v850", true, & arch_info_struct[0] );
+  N (bfd_mach_v850, "v850", true, NEXT);