X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fs390-dis.c;h=37ed2e7d8865dfa7724ecaf61df4d9137a6440bc;hb=02cbf7671a314a663a5abbb606d2ee73cb795bb9;hp=b9eeb7976b7a6b362eccdc685eadbdd4a10745c4;hpb=6844b2c2db8ce07c7f000d9bd132d6b9b83709b8;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/s390-dis.c b/opcodes/s390-dis.c
index b9eeb7976b..37ed2e7d88 100644
--- a/opcodes/s390-dis.c
+++ b/opcodes/s390-dis.c
@@ -166,6 +166,8 @@ print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
 
   if (status == 0)
     {
+      const struct s390_opcode *op;
+
       /* Find the first match in the opcode table.  */
       opcode_end = s390_opcodes + s390_num_opcodes;
       for (opcode = s390_opcodes + opc_index[(int) buffer[0]];
@@ -178,6 +180,7 @@ print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
 	  /* Check architecture.  */
 	  if (!(opcode->modes & current_arch_mask))
 	    continue;
+
 	  /* Check signature of the opcode.  */
 	  if ((buffer[1] & opcode->mask[1]) != opcode->opcode[1]
 	      || (buffer[2] & opcode->mask[2]) != opcode->opcode[2]
@@ -186,6 +189,28 @@ print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
 	      || (buffer[5] & opcode->mask[5]) != opcode->opcode[5])
 	    continue;
 
+	  /* Advance to an opcode with a more specific mask.  */
+	  for (op = opcode + 1; op < opcode_end; op++)
+	    {
+	      if ((buffer[0] & op->mask[0]) != op->opcode[0])
+		break;
+
+	      if ((buffer[1] & op->mask[1]) != op->opcode[1]
+		  || (buffer[2] & op->mask[2]) != op->opcode[2]
+		  || (buffer[3] & op->mask[3]) != op->opcode[3]
+		  || (buffer[4] & op->mask[4]) != op->opcode[4]
+		  || (buffer[5] & op->mask[5]) != op->opcode[5])
+		continue;
+
+	      if (((int)opcode->mask[0] + opcode->mask[1] +
+		   opcode->mask[2] + opcode->mask[3] +
+		   opcode->mask[4] + opcode->mask[5]) <
+		  ((int)op->mask[0] + op->mask[1] +
+		   op->mask[2] + op->mask[3] +
+		   op->mask[4] + op->mask[5]))
+		opcode = op;
+	    }
+
 	  /* The instruction is valid.  */
 	  if (opcode->operands[0] != 0)
 	    (*info->fprintf_func) (info->stream, "%s\t", opcode->name);