X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fs390-dis.c;h=8745a8943739e10960973b7c07eb7aa71489caa5;hb=d85cdfabd5786958c709d586792a49860b4397ae;hp=f2ab4079ee83c29dc9cdf47cb5b58579d7e1a640;hpb=44f2a95d954b07d967045b7079e3f935abf85288;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/s390-dis.c b/opcodes/s390-dis.c
index f2ab4079ee..8745a89437 100644
--- a/opcodes/s390-dis.c
+++ b/opcodes/s390-dis.c
@@ -1,5 +1,5 @@
 /* s390-dis.c -- Disassemble S390 instructions
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of GDB, GAS and the GNU binutils.
@@ -29,11 +29,15 @@ static int init_flag = 0;
 static int opc_index[256];
 static int current_arch_mask = 0;
 
+static void init_disasm PARAMS ((struct disassemble_info *));
+static unsigned int s390_extract_operand
+  PARAMS ((unsigned char *, const struct s390_operand *));
+
 /* Set up index table for first opcode byte.  */
 
 static void
 init_disasm (info)
-     struct disassemble_info *info ATTRIBUTE_UNUSED;
+     struct disassemble_info *info;
 {
   const struct s390_opcode *opcode;
   const struct s390_opcode *opcode_end;
@@ -49,10 +53,10 @@ init_disasm (info)
     }
   switch (info->mach)
     {
-    case bfd_mach_s390_esa:
+    case bfd_mach_s390_31:
       current_arch_mask = 1 << S390_OPCODE_ESA;
       break;
-    case bfd_mach_s390_esame:
+    case bfd_mach_s390_64:
       current_arch_mask = 1 << S390_OPCODE_ESAME;
       break;
     default: