* readelf.c (get_machine_flags): Add detection of EF_MIPS_32BITMODE.

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

diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
index 10c72cf353932979b5759de9815cb90f8022e49f..ee6574b242d10a24b2b6057421c0223431ebe72b 100644 (file)
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -1,5 +1,6 @@
 /* bfd back-end for mips support
-   Copyright (C) 1990, 91, 92, 93, 94 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.
@@ -22,71 +23,77 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-static bfd_arch_info_type arch_info_struct[] = 
-{
-  {
-    32,        /* 32 bits in a word */
-    32,        /* 32 bits in an address */
-    8, /* 8 bits in a byte */
-    bfd_arch_mips,
-    3000,
-    "mips",
-    "mips:3000",
-    3,
-    true,
-    bfd_default_compatible, 
-    bfd_default_scan,
-    0,
-  },
-  {
-    32,        /* 32 bits in a word */
-    32,        /* 32 bits in an address */
-    8, /* 8 bits in a byte */
-    bfd_arch_mips,
-    6000,
-    "mips",
-    "mips:6000",
-    3,
-    false,
-    bfd_default_compatible, 
-    bfd_default_scan,
-    0,
-  },
-  {
-    64, /* 64 bits in a word */
-    64, /* 64 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_mips,
-    4000,
-    "mips",
-    "mips:4000",
-    3,
-    false,
-    bfd_default_compatible, 
-    bfd_default_scan ,
-    0,
-  },
-  {
-    64, /* 64 bits in a word */
-    64, /* 64 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_mips,
-    8000,
-    "mips",
-    "mips:8000",
-    3,
-    false,
-    bfd_default_compatible, 
-    bfd_default_scan ,
-    0,
+#define N(BITS_WORD, BITS_ADDR, NUMBER, PRINT, DEFAULT, NEXT)          \
+  {                                                    \
+    BITS_WORD, /*  bits in a word */                   \
+    BITS_ADDR, /* bits in an address */                        \
+    8, /* 8 bits in a byte */                          \
+    bfd_arch_mips,                                     \
+    NUMBER,                                            \
+    "mips",                                            \
+    PRINT,                                             \
+    3,                                                 \
+    DEFAULT,                                           \
+    bfd_default_compatible,                            \
+    bfd_default_scan,                                  \
+    NEXT,                                              \
   }
+
+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_mips32,
+  I_mips32_4k,
+  I_mips5,
+  I_mips64,
+  I_sb1,
 };
 
-void
-bfd_mips_arch ()
+#define NN(index) (&arch_info_struct[(index) + 1])
+
+static const bfd_arch_info_type arch_info_struct[] =
 {
-  register unsigned int i;
+  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),
+};
+
+/* The default architecture is mips:3000, but with a machine number of
+   zero.  This lets the linker distinguish between a default setting
+   of mips, and an explicit setting of mips:3000.  */
 
-  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_mips_arch =
+N (32, 32, 0, "mips", true, &arch_info_struct[0]);