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

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

diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
index d5b1a5000c5dc884b995d8f111b1584b3a1d0eb7..888d863124e640e116b82673a2f3b3fe7795eed0 100644 (file)
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -1,5 +1,6 @@
 /* bfd back-end for mips support
 /* bfd back-end for mips support

-   Copyright (C) 1990, 91-97, 1998 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 2000
+   Free Software Foundation, Inc.

    Written by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
    Written by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -38,92 +39,54 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
     NEXT,                                              \
   }
 
     NEXT,                                              \
   }
 

-enum {
-I_mips3000, 
-I_mips3900, 
-I_mips4000, 
-I_mips4010, 
-I_mips4100, 
-  /* start-sanitize-vr4xxx */
-I_mips4121,
-  /* end-sanitize-vr4xxx */
-I_mips4300, 
-I_mips4400, 
-I_mips4600, 
-I_mips4650, 
-I_mips5000, 
-I_mips6000, 
-I_mips8000, 
-I_mips10000,
-  /* start-sanitize-tx19 */
-I_mips1900,
-  /* end-sanitize-tx19 */
-  /* start-sanitize-vr4320 */
-I_mips4320,
-  /* end-sanitize-vr4320 */
-  /* start-sanitize-tx49 */
-I_mips4900,
-  /* end-sanitize-tx49 */
-  /* start-sanitize-cygnus */
-I_mips5400,
-  /* end-sanitize-cygnus */
-  /* start-sanitize-r5900 */
-I_mips5900,
-  /* end-sanitize-r5900 */
-  /* start-sanitize-sky */
-I_dvp_dma,
-I_dvp_vif,
-I_dvp_vu,
-I_dvp_gif,
-  /* end-sanitize-sky */
-I_mips16
+enum
+{
+  I_mips3000,
+  I_mips3900,
+  I_mips4000,
+  I_mips4010,
+  I_mips4100,
+  I_mips4111,
+  I_mips4300,
+  I_mips4400,
+  I_mips4600,
+  I_mips4650,
+  I_mips5000,
+  I_mips6000,
+  I_mips8000,
+  I_mips10000,
+  I_mips12000,
+  I_mips16,
+  I_mips5,
+  I_mipsisa32,
+  I_mipsisa64,
+  I_sb1,

 };
 
 };
 

+#define NN(index) (&arch_info_struct[(index) + 1])

 
 

-#define NN(index) (&arch_info_struct[(index)+1])
-
-static const bfd_arch_info_type arch_info_struct[] = 
+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)),
-  /* start-sanitize-vr4xxx */
-  N (64, 64, bfd_mach_mips4121, "mips:4121", false, NN(I_mips4121)),
-  /* end-sanitize-vr4xxx */
-  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)),
-
-  /* start-sanitize-tx19 */
-  N (32, 32, bfd_mach_mips1900, "mips:1900", false, NN(I_mips1900)),
-  /* end-sanitize-tx19 */
-  /* start-sanitize-vr4320 */
-  N (64, 64, bfd_mach_mips4320, "mips:4320", false, NN(I_mips4320)),
-  /* end-sanitize-vr4320 */
-  /* start-sanitize-tx49 */
-  N (64, 64, bfd_mach_mips4900, "mips:4900", false, NN(I_mips4900)),
-  /* end-sanitize-tx49 */
-  /* start-sanitize-cygnus */
-  N (64, 64, bfd_mach_mips5400, "mips:5400", false, NN(I_mips5400)),
-  /* end-sanitize-cygnus */
-  /* start-sanitize-r5900 */
-  N (64, 32, bfd_mach_mips5900, "mips:5900", false, NN(I_mips5900)),
-  /* end-sanitize-r5900 */
-  /* start-sanitize-sky */
-  N (32, 32, bfd_mach_dvp_dma,  "dvp:dma",   false, NN(I_dvp_dma)),
-  N (32, 32, bfd_mach_dvp_vif,  "dvp:vif",   false, NN(I_dvp_vif)),
-  N (32, 32, bfd_mach_dvp_vu,   "dvp:vu",    false, NN(I_dvp_vu)),
-  N (32, 32, bfd_mach_dvp_gif,  "dvp:gif",   false, NN(I_dvp_gif)),
-  /* end-sanitize-sky */
-
-  N (64, 64, bfd_mach_mips16,   "mips:16",   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_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 (64, 64, bfd_mach_mips5,    "mips:mips5",     false, NN(I_mips5)),
+  N (32, 32, bfd_mach_mipsisa32,  "mips:isa32",   false, NN(I_mipsisa32)),
+  N (64, 64, bfd_mach_mipsisa64,  "mips:isa64",   false, NN(I_mipsisa64)),
+  N (64, 64, bfd_mach_mips_sb1, "mips:sb1",       false, 0),

 };
 
 /* The default architecture is mips:3000, but with a machine number of
 };
 
 /* The default architecture is mips:3000, but with a machine number of