bfd/

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

diff --git a/bfd/cpu-i960.c b/bfd/cpu-i960.c
index 7fb2c7ebc5c16c96da41a3b1ae64983e9fef903d..a6c8eb256e76a10f39b7d4c83a83ba3781d2f2ca 100644 (file)
--- a/bfd/cpu-i960.c
+++ b/bfd/cpu-i960.c
@@ -1,82 +1,99 @@
 /* BFD library support routines for the i960 architecture.
 /* 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, 2002, 2006,
+   2007 Free Software Foundation, Inc.

    Hacked by Steve Chamberlain of Cygnus Support.
 
    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 3 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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 

-
-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 
 #include "libbfd.h"
 

+static bfd_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
    info_struct pointer */
 
 
 /* This routine is provided a string, and tries to work out if it
    could possibly refer to the i960 machine pointed at in the
    info_struct pointer */
 

-static boolean
+static bfd_boolean

 scan_960_mach (ap, string)
      const bfd_arch_info_type *ap;
      const char *string;
 {
   unsigned long machine;
 scan_960_mach (ap, string)
      const bfd_arch_info_type *ap;
      const char *string;
 {
   unsigned long machine;

+  int fail_because_not_80960 = FALSE;
+
+  /* Look for the string i960 at the front of the string.  */
+  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;
+
+      string ++;
+    }
+  /* In some bfds the cpu-id is written as "80960KA", "80960KB",
+     "80960CA" or "80960MC".  */
+  else if (CONST_STRNEQ (string, "80960"))
+    {
+      string += 5;
+
+      /* Set this to TRUE here.  If a correct matching postfix
+        is detected below it will be reset to FALSE.  */
+      fail_because_not_80960 = TRUE;
+    }
+  /* No match, can't be us.  */
+  else
+    return FALSE;
+
+  if (* string == '\0')
+    return FALSE;

 
 

-  /* Look for the string i960, or somesuch at the front of the string  */
-
-  if (strncmp("i960",string,4) == 0) {
-    string+=4;
-  }
-  else {
-    /* no match, can be us */
-    return false;
-  }
-  if (string[0] == 0) {
-    /* i960 on it's own means core to us*/
-    if (ap->mach == bfd_mach_i960_core) return true;
-    return false;
-  }
-
-  if (string[0] != ':') {
-    return false;
-  }
-  string++;
-  if (string[0] == '\0')
-    return false;

   if (string[0] == 'c' && string[1] == 'o' && string[2] == 'r' &&
       string[3] == 'e' && string[4] == '\0')
     machine = bfd_mach_i960_core;
   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;
     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;
     machine = bfd_mach_i960_kb_sb;

-  else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char */
-    return false;
+  else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char.  */
+    return FALSE;

   else if (string[0] == 'k' && string[1] == 'b')
   else if (string[0] == 'k' && string[1] == 'b')

-    machine = bfd_mach_i960_kb_sb;
+    { machine = bfd_mach_i960_kb_sb; fail_because_not_80960 = FALSE; }

   else if (string[0] == 's' && string[1] == 'b')
     machine = bfd_mach_i960_kb_sb;
   else if (string[0] == 'm' && string[1] == 'c')
   else if (string[0] == 's' && string[1] == 'b')
     machine = bfd_mach_i960_kb_sb;
   else if (string[0] == 'm' && string[1] == 'c')

-    machine = bfd_mach_i960_mc;
+    { machine = bfd_mach_i960_mc; fail_because_not_80960 = FALSE; }

   else if (string[0] == 'x' && string[1] == 'a')
     machine = bfd_mach_i960_xa;
   else if (string[0] == 'c' && string[1] == 'a')
   else if (string[0] == 'x' && string[1] == 'a')
     machine = bfd_mach_i960_xa;
   else if (string[0] == 'c' && string[1] == 'a')

-    machine = bfd_mach_i960_ca;
+    { machine = bfd_mach_i960_ca; fail_because_not_80960 = FALSE; }

   else if (string[0] == 'k' && string[1] == 'a')
   else if (string[0] == 'k' && string[1] == 'a')

-    machine = bfd_mach_i960_ka_sa;
+    { machine = bfd_mach_i960_ka_sa; fail_because_not_80960 = FALSE; }

   else if (string[0] == 's' && string[1] == 'a')
     machine = bfd_mach_i960_ka_sa;
   else if (string[0] == 'j' && string[1] == 'x')
   else if (string[0] == 's' && string[1] == 'a')
     machine = bfd_mach_i960_ka_sa;
   else if (string[0] == 'j' && string[1] == 'x')


@@ -84,12 +101,16 @@ scan_960_mach (ap, string)
   else if (string[0] == 'h' && string[1] == 'x')
     machine = bfd_mach_i960_hx;
   else
   else if (string[0] == 'h' && string[1] == 'x')
     machine = bfd_mach_i960_hx;
   else

-    return false;
-  if (machine == ap->mach)   return true;
-  return false;
-}
+    return FALSE;
+
+  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
 
 /* This routine is provided two arch_infos and works out the i960
    machine which would be compatible with both and returns a pointer


@@ -102,17 +123,17 @@ compatible (a,b)
 {
 
   /* The i960 has distinct subspecies which may not interbreed:
 {
 
   /* 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
        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
      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*/
 #define KB     bfd_mach_i960_kb_sb /*3*/
 #define MC     bfd_mach_i960_mc    /*4*/
 #define XA     bfd_mach_i960_xa    /*5*/


@@ -121,7 +142,7 @@ compatible (a,b)
 #define HX     bfd_mach_i960_hx    /*8*/
 #define MAX_ARCH ((int)HX)
 
 #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 },
     {
       { ERROR, CORE,   KA,     KB,     MC,     XA,     CA,     JX,     HX },
       { CORE,  CORE,   KA,     KB,     MC,     XA,     CA,     JX,     HX },


@@ -134,33 +155,29 @@ compatible (a,b)
       { HX,    HX,     ERROR,  ERROR,  ERROR,  ERROR,  ERROR,  HX,     HX },
     };
 
       { 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;
     }
     {
     return NULL;
     }

-  else 
+  else

     {
     return (a->mach  ==  matrix[a->mach][b->mach]) ?  a : b;
     }
 }
 
     {
     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,}
 
 #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[] = 
-{ 
-  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]),
-  N(bfd_mach_i960_xa,   "i960:xa",   false, &arch_info_struct[4]),
-  N(bfd_mach_i960_ca,   "i960:ca",   false, &arch_info_struct[5]),
-  N(bfd_mach_i960_jx,   "i960:jx",   false, &arch_info_struct[6]),
-  N(bfd_mach_i960_hx,  "i960:hx",   false, 0),
+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]),
+  N(bfd_mach_i960_xa,   "i960:xa",   FALSE, &arch_info_struct[4]),
+  N(bfd_mach_i960_ca,   "i960:ca",   FALSE, &arch_info_struct[5]),
+  N(bfd_mach_i960_jx,   "i960:jx",   FALSE, &arch_info_struct[6]),
+  N(bfd_mach_i960_hx,  "i960:hx",   FALSE, 0),

 };
 
 const bfd_arch_info_type bfd_i960_arch =
 };
 
 const bfd_arch_info_type bfd_i960_arch =

-  N(bfd_mach_i960_core, "i960:core", true, &arch_info_struct[0]);
+  N(bfd_mach_i960_core, "i960:core", TRUE, &arch_info_struct[0]);