Changeset 609 for branches/GNU/src/binutils/bfd/cpu-mips.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/cpu-mips.c (modified) (8 diffs, 1 prop)

branches/GNU/src/binutils/bfd/cpu-mips.c

@@ -1 +1 @@
 /* bfd back-end for mips support
-   Copyright 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 2000
+   Copyright 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2002
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support.
@@ -24 +24 @@
 #include "libbfd.h"
 
+static const bfd_arch_info_type *mips_compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
+
+/* The default routine tests bits_per_word, which is wrong on mips as
+   mips word size doesn't correlate with reloc size.  */
+
+static const bfd_arch_info_type *
+mips_compatible (a, b)
+     const bfd_arch_info_type *a;
+     const bfd_arch_info_type *b;
+{
+  if (a->arch != b->arch)
+    return NULL;
+
+  /* Machine compatibility is checked in
+     _bfd_mips_elf_merge_private_bfd_data.  */
+
+  return a;
+}
+
 #define N(BITS_WORD, BITS_ADDR, NUMBER, PRINT, DEFAULT, NEXT)           \
   {                                                     \
@@ -35 +55 @@
     3,                                                  \
     DEFAULT,                                            \
-    bfd_default_compatible,                             \
+    mips_compatible,                                    \
     bfd_default_scan,                                   \
     NEXT,                                               \
@@ -48 +68 @@
   I_mips4100,
   I_mips4111,
+  I_mips4120,
   I_mips4300,
   I_mips4400,
@@ -53 +74 @@
   I_mips4650,
   I_mips5000,
+  I_mips5400,
+  I_mips5500,
   I_mips6000,
   I_mips8000,
@@ -58 +81 @@
   I_mips12000,
   I_mips16,
-  I_mips32,
-  I_mips32_4k,
   I_mips5,
-  I_mips64,
+  I_mipsisa32,
+  I_mipsisa32r2,
+  I_mipsisa64,
   I_sb1,
 };
@@ -69 +92 @@
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N (32, 32, bfd_mach_mips3000, "mips:3000",      false, NN(I_mips3000)),
-  N (32, 32, bfd_mach_mips3900, "mips:3900",      false, NN(I_mips3900)),
-  N (64, 64, bfd_mach_mips4000, "mips:4000",      false, NN(I_mips4000)),
-  N (64, 64, bfd_mach_mips4010, "mips:4010",      false, NN(I_mips4010)),
-  N (64, 64, bfd_mach_mips4100, "mips:4100",      false, NN(I_mips4100)),
-  N (64, 64, bfd_mach_mips4111, "mips:4111",      false, NN(I_mips4111)),
-  N (64, 64, bfd_mach_mips4300, "mips:4300",      false, NN(I_mips4300)),
-  N (64, 64, bfd_mach_mips4400, "mips:4400",      false, NN(I_mips4400)),
-  N (64, 64, bfd_mach_mips4600, "mips:4600",      false, NN(I_mips4600)),
-  N (64, 64, bfd_mach_mips4650, "mips:4650",      false, NN(I_mips4650)),
-  N (64, 64, bfd_mach_mips5000, "mips:5000",      false, NN(I_mips5000)),
-  N (32, 32, bfd_mach_mips6000, "mips:6000",      false, NN(I_mips6000)),
-  N (64, 64, bfd_mach_mips8000, "mips:8000",      false, NN(I_mips8000)),
-  N (64, 64, bfd_mach_mips10000,"mips:10000",     false, NN(I_mips10000)),
-  N (64, 64, bfd_mach_mips12000,"mips:12000",     false, NN(I_mips12000)),
-  N (64, 64, bfd_mach_mips16,   "mips:16",        false, NN(I_mips16)),
-  N (32, 32, bfd_mach_mips32,   "mips:mips32",    false, NN(I_mips32)),
-  N (32, 32, bfd_mach_mips32_4k,"mips:mips32-4k", false, NN(I_mips32_4k)),
-  N (64, 64, bfd_mach_mips5,    "mips:mips5",     false, NN(I_mips5)),
-  N (64, 64, bfd_mach_mips64,   "mips:mips64",    false, NN(I_mips64)),
-  N (64, 64, bfd_mach_mips_sb1, "mips:sb1",       false, 0),
+  N (32, 32, bfd_mach_mips3000, "mips:3000",      FALSE, NN(I_mips3000)),
+  N (32, 32, bfd_mach_mips3900, "mips:3900",      FALSE, NN(I_mips3900)),
+  N (64, 64, bfd_mach_mips4000, "mips:4000",      FALSE, NN(I_mips4000)),
+  N (64, 64, bfd_mach_mips4010, "mips:4010",      FALSE, NN(I_mips4010)),
+  N (64, 64, bfd_mach_mips4100, "mips:4100",      FALSE, NN(I_mips4100)),
+  N (64, 64, bfd_mach_mips4111, "mips:4111",      FALSE, NN(I_mips4111)),
+  N (64, 64, bfd_mach_mips4120, "mips:4120",      FALSE, NN(I_mips4120)),
+  N (64, 64, bfd_mach_mips4300, "mips:4300",      FALSE, NN(I_mips4300)),
+  N (64, 64, bfd_mach_mips4400, "mips:4400",      FALSE, NN(I_mips4400)),
+  N (64, 64, bfd_mach_mips4600, "mips:4600",      FALSE, NN(I_mips4600)),
+  N (64, 64, bfd_mach_mips4650, "mips:4650",      FALSE, NN(I_mips4650)),
+  N (64, 64, bfd_mach_mips5000, "mips:5000",      FALSE, NN(I_mips5000)),
+  N (64, 64, bfd_mach_mips5400, "mips:5400",      FALSE, NN(I_mips5400)),
+  N (64, 64, bfd_mach_mips5500, "mips:5500",      FALSE, NN(I_mips5500)),
+  N (32, 32, bfd_mach_mips6000, "mips:6000",      FALSE, NN(I_mips6000)),
+  N (64, 64, bfd_mach_mips8000, "mips:8000",      FALSE, NN(I_mips8000)),
+  N (64, 64, bfd_mach_mips10000,"mips:10000",     FALSE, NN(I_mips10000)),
+  N (64, 64, bfd_mach_mips12000,"mips:12000",     FALSE, NN(I_mips12000)),
+  N (64, 64, bfd_mach_mips16,   "mips:16",        FALSE, NN(I_mips16)),
+  N (64, 64, bfd_mach_mips5,    "mips:mips5",     FALSE, NN(I_mips5)),
+  N (32, 32, bfd_mach_mipsisa32,  "mips:isa32",   FALSE, NN(I_mipsisa32)),
+  N (32, 32, bfd_mach_mipsisa32r2,"mips:isa32r2", FALSE, NN(I_mipsisa32r2)),
+  N (64, 64, bfd_mach_mipsisa64,  "mips:isa64",   FALSE, NN(I_mipsisa64)),
+  N (64, 64, bfd_mach_mips_sb1, "mips:sb1",       FALSE, 0),
 };
 
@@ -97 +123 @@
 
 const bfd_arch_info_type bfd_mips_arch =
-N (32, 32, 0, "mips", true, &arch_info_struct[0]);
+N (32, 32, 0, "mips", TRUE, &arch_info_struct[0]);