* elf64-x86-64.c (elf64_86_64_size_info): Remove, we can use the

[binutils.git] / bfd / cpu-alpha.c

diff --git a/bfd/cpu-alpha.c b/bfd/cpu-alpha.c
index 0251c6f7b1f6bd9a31d21d42c7c292fc75301efe..93fc69ce61709c90d7aea2dae756003545f90144 100644 (file)
--- a/bfd/cpu-alpha.c
+++ b/bfd/cpu-alpha.c
@@ -1,5 +1,5 @@
 /* BFD support for the Alpha architecture.
-   Copyright 1992 Free Software Foundation, Inc.
+   Copyright 1992, 1993, 1998, 2000 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -15,29 +15,37 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 
-static bfd_arch_info_type arch_info_struct = 
-  {
-    64,        /* 32 bits in a word */
-    64,        /* 32 bits in an address */
-    8, /* 8 bits in a byte */
-    bfd_arch_alpha,
-    0, /* only 1 machine */
-    "alpha",
-    "alpha",
-    3,
-    true, /* the one and only */
-    bfd_default_compatible, 
-    bfd_default_scan ,
-    0,
-  };
-
-void DEFUN_VOID(bfd_alpha_arch)
+#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_alpha,                                    \
+    NUMBER,                                            \
+    "alpha",                                           \
+    PRINT,                                             \
+    3,                                                 \
+    DEFAULT,                                           \
+    bfd_default_compatible,                            \
+    bfd_default_scan,                                  \
+    NEXT,                                              \
+  }
+
+#define NN(index) (&arch_info_struct[index])
+
+/* These exist only so that we can resonably disassemble PALcode.  */
+static const bfd_arch_info_type arch_info_struct[] =
 {
-  bfd_arch_linkin(&arch_info_struct);
-}
+  N (64, 64, bfd_mach_alpha_ev4, "alpha:ev4", false, NN(1)),
+  N (64, 64, bfd_mach_alpha_ev5, "alpha:ev5", false, NN(2)),
+  N (64, 64, bfd_mach_alpha_ev6, "alpha:ev6", false, 0),
+};
+
+const bfd_arch_info_type bfd_alpha_arch =
+  N (64, 64, 0, "alpha", true, NN(0));