X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-i960.c;h=e77a411adb902f3289573a16e3369337e166fafa;hb=a5a58ba4dea996f5de695836aa73e00e5e2a80cb;hp=74ec2183742895a4b9c4eae4c63ebeeacaa3a1ee;hpb=ae115e5114deb0326333c80f7af9e689b2e7d01f;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cpu-i960.c b/bfd/cpu-i960.c
index 74ec218374..e77a411adb 100644
--- 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 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1993, 1994, 1996, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -18,162 +19,164 @@ 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 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 */
 
-static boolean
+static bfd_boolean
 scan_960_mach (ap, string)
-     CONST bfd_arch_info_type *ap;
-     CONST char *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 (strncmp ("80960", string, 5) == 0)
+    {
+      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;
-  else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char */
-    return false;
-  else if (string[0] == 'k' && string[1] == 'b')
+  else if (strcasecmp (string, "ka_sa") == 0)
+    machine = bfd_mach_i960_ka_sa;
+  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;
+  else if (string[0] == 'k' && string[1] == 'b')
+    { 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')
-    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')
-    machine = bfd_mach_i960_ca;
+    { machine = bfd_mach_i960_ca; fail_because_not_80960 = FALSE; }
   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;
-  /* start-sanitize-i960xl */
-  else if (string[0] == 'x' && string[1] == 'l')
-    machine = bfd_mach_i960_xl;
-  /* end-sanitize-i960xl */
+  else if (string[0] == 'j' && string[1] == 'x')
+    machine = bfd_mach_i960_jx;
+  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
    to its info structure */
 
-static CONST bfd_arch_info_type *
+static const bfd_arch_info_type *
 compatible (a,b)
-     CONST bfd_arch_info_type *a;
-     CONST bfd_arch_info_type *b;
+     const bfd_arch_info_type *a;
+     const bfd_arch_info_type *b;
 {
 
   /* The i960 has distinct subspecies which may not interbreed:
-	CORE CA          
+	CORE CA
 	CORE KA KB MC XA
-     start-sanitize-i960xl
-	CORE XL
-     end-sanitize-i960xl
+	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*/
 #define CA 	bfd_mach_i960_ca    /*6*/
-#define MAX_ARCH ((int)CA)
-
-/* start-sanitize-i960xl */
-#define XL	bfd_mach_i960_xl    /*7*/
-#undef MAX_ARCH
-#define MAX_ARCH ((int)XL)
-/* end-sanitize-i960xl */
+#define JX	bfd_mach_i960_jx    /*7*/
+#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 },
-      { CORE,	CORE,	KA,	KB,	MC,	XA,	CA },
-      { KA,	KA,	KA,	KB,	MC,	XA,	ERROR },
-      { KB,	KB,	KB,	KB,	MC,	XA,	ERROR },
-      { MC,	MC,	MC,	MC,	MC,	XA,	ERROR },
-      { XA,	XA,	XA,	XA,	XA,	XA,	ERROR },
-      { CA,	CA,	ERROR,	ERROR,	ERROR,	ERROR,	CA },
-      /* start-sanitize-i960xl */
-      { XL,	ERROR,  ERROR,	ERROR,	ERROR,	ERROR,	ERROR,  XL },
-      /* end-sanitize-i960xl */
+      { ERROR,	CORE,	KA,	KB,	MC,	XA,	CA,	JX,	HX },
+      { CORE,	CORE,	KA,	KB,	MC,	XA,	CA,	JX,	HX },
+      { KA,	KA,	KA,	KB,	MC,	XA,	ERROR,	ERROR,	ERROR},
+      { KB,	KB,	KB,	KB,	MC,	XA,	ERROR, 	ERROR,	ERROR},
+      { MC,	MC,	MC,	MC,	MC,	XA,	ERROR,	ERROR,	ERROR},
+      { XA,	XA,	XA,	XA,	XA,	XA,	ERROR,	ERROR,	ERROR},
+      { CA,	CA,	ERROR,	ERROR,	ERROR,	ERROR,	CA,	ERROR,	ERROR},
+      { JX,	JX,	ERROR,	ERROR,	ERROR,	ERROR,	ERROR,  JX,	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;
     }
-  else 
+  else
     {
     return (a->mach  ==  matrix[a->mach][b->mach]) ?  a : b;
     }
 }
 
+#define N(a,b,d,n) \
+{ 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach,n,}
 
-
-int bfd_default_scan_num_mach();
-#define N(a,b,d) \
-{ 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach,0,}
-
-static bfd_arch_info_type arch_info_struct[] = 
-{ 
-  N(bfd_mach_i960_core, "i960:core", true),
-  N(bfd_mach_i960_ka_sa,"i960:ka_sa",false),
-  N(bfd_mach_i960_kb_sb,"i960:kb_sb",false),
-  N(bfd_mach_i960_mc,   "i960:mc",   false),
-  N(bfd_mach_i960_xa,   "i960:xa",   false),
-  N(bfd_mach_i960_ca,   "i960:ca",   false),
-  /* start-sanitize-i960xl */
-  N(bfd_mach_i960_xl,   "i960:xl",   false),
-  /* end-sanitize-i960xl */
+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),
 };
 
-
-void
-bfd_i960_arch ()
-{
-  unsigned int i;
-  for (i = 0; i < sizeof(arch_info_struct)/sizeof (*arch_info_struct); i++)  {
-    bfd_arch_linkin(arch_info_struct + i);
-  }
-}
+const bfd_arch_info_type bfd_i960_arch =
+  N(bfd_mach_i960_core, "i960:core", TRUE, &arch_info_struct[0]);