* Makefile.am: Run "make dep-am".

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

diff --git a/bfd/cpu-i960.c b/bfd/cpu-i960.c
index 2374b2fdf370f291e0b546a3279c19168c7586ce..a7c45002ea1af2d80aa0e056faa0ff7add919273 100644 (file)
--- a/bfd/cpu-i960.c
+++ b/bfd/cpu-i960.c
@@ -1,5 +1,6 @@
 /* BFD library support routines for the i960 architecture.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1993, 1994, 1996, 1999, 2000, 2001
+   Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -18,11 +19,14 @@ 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"
 #include "sysdep.h"
 #include "libbfd.h"
 
+static boolean scan_960_mach
+  PARAMS ((const bfd_arch_info_type *, const char *));
+static const bfd_arch_info_type *compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
 
 /* This routine is provided a string, and tries to work out if it
    could possibly refer to the i960 machine pointed at in the
@@ -34,21 +38,17 @@ scan_960_mach (ap, string)
      const char *string;
 {
   unsigned long machine;
-  int i;
   int fail_because_not_80960 = false;
-  
-  for (i = 0; i < strlen (string); i ++)
-    string[i] = tolower (string[i]);
 
   /* Look for the string i960 at the front of the string.  */
-  if (strncmp ("i960", string, 4) == 0)
+  if (strncasecmp ("i960", string, 4) == 0)
     {
       string += 4;
 
       /* i960 on it's own means core to us.  */
       if (* string == 0)
        return ap->mach == bfd_mach_i960_core;
-      
+
       /* "i960:*" is valid, anything else is not.  */
       if (* string != ':')
        return false;
@@ -68,16 +68,16 @@ scan_960_mach (ap, string)
   /* No match, can't be us.  */
   else
     return false;
-  
+
   if (* string == '\0')
     return false;
-  
+
   if (string[0] == 'c' && string[1] == 'o' && string[2] == 'r' &&
       string[3] == 'e' && string[4] == '\0')
     machine = bfd_mach_i960_core;
-  else if (strcmp (string, "ka_sa") == 0)
+  else if (strcasecmp (string, "ka_sa") == 0)
     machine = bfd_mach_i960_ka_sa;
-  else if (strcmp (string, "kb_sb") == 0)
+  else if (strcasecmp (string, "kb_sb") == 0)
     machine = bfd_mach_i960_kb_sb;
   else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char.  */
     return false;
@@ -104,15 +104,13 @@ scan_960_mach (ap, string)
 
   if (fail_because_not_80960)
     return false;
-  
+
   if (machine == ap->mach)
     return true;
-  
+
   return false;
 }
 
-
-
 /* This routine is provided two arch_infos and works out the i960
    machine which would be compatible with both and returns a pointer
    to its info structure */
@@ -124,17 +122,17 @@ compatible (a,b)
 {
 
   /* The i960 has distinct subspecies which may not interbreed:
-       CORE CA          
+       CORE CA
        CORE KA KB MC XA
        CORE HX JX
      Any architecture on the same line is compatible, the one on
-     the right is the least restrictive.  
-     
+     the right is the least restrictive.
+
      We represent this information in an array, each machine to a side */
 
 #define ERROR  0
-#define CORE   bfd_mach_i960_core  /*1*/  
-#define KA     bfd_mach_i960_ka_sa /*2*/ 
+#define CORE   bfd_mach_i960_core  /*1*/
+#define KA     bfd_mach_i960_ka_sa /*2*/
 #define KB     bfd_mach_i960_kb_sb /*3*/
 #define MC     bfd_mach_i960_mc    /*4*/
 #define XA     bfd_mach_i960_xa    /*5*/
@@ -143,7 +141,7 @@ compatible (a,b)
 #define HX     bfd_mach_i960_hx    /*8*/
 #define MAX_ARCH ((int)HX)
 
-  static CONST unsigned long matrix[MAX_ARCH+1][MAX_ARCH+1] = 
+  static const unsigned long matrix[MAX_ARCH+1][MAX_ARCH+1] =
     {
       { ERROR, CORE,   KA,     KB,     MC,     XA,     CA,     JX,     HX },
       { CORE,  CORE,   KA,     KB,     MC,     XA,     CA,     JX,     HX },
@@ -156,25 +154,21 @@ compatible (a,b)
       { HX,    HX,     ERROR,  ERROR,  ERROR,  ERROR,  ERROR,  HX,     HX },
     };
 
-
-  if (a->arch != b->arch || matrix[a->mach][b->mach] == ERROR) 
+  if (a->arch != b->arch || matrix[a->mach][b->mach] == ERROR)
     {
     return NULL;
     }
-  else 
+  else
     {
     return (a->mach  ==  matrix[a->mach][b->mach]) ?  a : b;
     }
 }
 
-
-
-int bfd_default_scan_num_mach();
 #define N(a,b,d,n) \
 { 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach,n,}
 
-static const bfd_arch_info_type arch_info_struct[] = 
-{ 
+static const bfd_arch_info_type arch_info_struct[] =
+{
   N(bfd_mach_i960_ka_sa,"i960:ka_sa",false, &arch_info_struct[1]),
   N(bfd_mach_i960_kb_sb,"i960:kb_sb",false, &arch_info_struct[2]),
   N(bfd_mach_i960_mc,   "i960:mc",   false, &arch_info_struct[3]),