S/390: Disassemble 31-bit binaries with "zarch" opcode set by default

Currently the disassembler for s390 (by default) assumes that a 31-bit
binary was compiled in "ESA" mode -- and then only disassembles a
limited opcode set.  The change upgrades the default to the full "zarch"
opcode set even for 31-bit binaries.

opcodes/
	* s390-dis.c (init_disasm): Default to full 'zarch' opcode
	availability even for 31-bit programs.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index bc42de4d74ba0fcb7d7c4ed62dca91f974b4157e..c96df92b04fe03485d23edb2a32552a60f5e5070 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-30  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+       * s390-dis.c (init_disasm): Default to full 'zarch' opcode
+       availability even for 31-bit programs.
+
 2013-10-15  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
 
        * arm-dis.c (neon_opcodes): Adjust print string for vshll.

diff --git a/opcodes/s390-dis.c b/opcodes/s390-dis.c
index ef73d85f9b60d6afc9d835653916ff4465e82fcf..c5397d67fd226dea7231ba54aea3b2844052c14f 100644 (file)
--- a/opcodes/s390-dis.c
+++ b/opcodes/s390-dis.c
@@ -65,17 +65,7 @@ init_disasm (struct disassemble_info *info)
     }
 
   if (!current_arch_mask)
-    switch (info->mach)
-      {
-      case bfd_mach_s390_31:
-       current_arch_mask = 1 << S390_OPCODE_ESA;
-       break;
-      case bfd_mach_s390_64:
-       current_arch_mask = 1 << S390_OPCODE_ZARCH;
-       break;
-      default:
-       abort ();
-      }
+    current_arch_mask = 1 << S390_OPCODE_ZARCH;
 
   init_flag = 1;
 }