X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fcris-dis.c;h=f6c63cb280dd153d7e4206d0f5077ded9349e3f1;hb=cdedc9f07ffc714ec3c38f57db2b68fa9ccd3d32;hp=075cca7d07206f4009cc4b29047a28d815102de3;hpb=47b0e7ad8c60ea4b45b22ad5cb376f068991bc88;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/cris-dis.c b/opcodes/cris-dis.c
index 075cca7d07..f6c63cb280 100644
--- a/opcodes/cris-dis.c
+++ b/opcodes/cris-dis.c
@@ -651,7 +651,8 @@ format_sup_reg (unsigned int regno,
 static unsigned
 bytes_to_skip (unsigned int insn,
 	       const struct cris_opcode *matchedp,
-	       enum cris_disass_family distype)
+	       enum cris_disass_family distype,
+	       const struct cris_opcode *prefix_matchedp)
 {
   /* Each insn is a word plus "immediate" operands.  */
   unsigned to_skip = 2;
@@ -660,7 +661,8 @@ bytes_to_skip (unsigned int insn,
 
   for (s = template; *s; s++)
     if ((*s == 's' || *s == 'N' || *s == 'Y')
-	&& (insn & 0x400) && (insn & 15) == 15)
+	&& (insn & 0x400) && (insn & 15) == 15
+	&& prefix_matchedp == NULL)
       {
 	/* Immediate via [pc+], so we have to check the size of the
 	   operand.  */
@@ -880,7 +882,7 @@ print_with_operands (const struct cris_opcode *opcodep,
       case 'S':
       case 's':
 	/* Any "normal" memory operand.  */
-	if ((insn & 0x400) && (insn & 15) == 15)
+	if ((insn & 0x400) && (insn & 15) == 15 && prefix_opcodep == NULL)
 	  {
 	    /* We're looking at [pc+], i.e. we need to output an immediate
 	       number, where the size can depend on different things.  */
@@ -1448,7 +1450,7 @@ print_insn_cris_generic (bfd_vma memaddr,
 	  advance += 2;
 
 	  /* If to print data as offsets, then shortcut here.  */
-	  (*info->fprintf_func) (info->stream, "case %d%s: -> ",
+	  (*info->fprintf_func) (info->stream, "case %ld%s: -> ",
 				 case_offset + no_of_case_offsets
 				 - case_offset_counter,
 				 case_offset_counter == 1 ? "/default" :
@@ -1495,7 +1497,7 @@ print_insn_cris_generic (bfd_vma memaddr,
 	      /* If it's a prefix, put it into the prefix vars and get the
 		 main insn.  */
 	      prefix_size = bytes_to_skip (prefix_insn, matchedp,
-					   disdata->distype);
+					   disdata->distype, NULL);
 	      prefix_opcodep = matchedp;
 
 	      insn = bufp[prefix_size] + bufp[prefix_size + 1] * 256;
@@ -1520,14 +1522,16 @@ print_insn_cris_generic (bfd_vma memaddr,
 
 	  if (matchedp == NULL)
 	    {
-	      (*info->fprintf_func) (info->stream, "??0x%lx", insn);
+	      (*info->fprintf_func) (info->stream, "??0x%x", insn);
 	      advance += 2;
 
 	      info->insn_type = dis_noninsn;
 	    }
 	  else
 	    {
-	      advance += bytes_to_skip (insn, matchedp, disdata->distype);
+	      advance
+		+= bytes_to_skip (insn, matchedp, disdata->distype,
+				  prefix_opcodep);
 
 	      /* The info_type and assorted fields will be set according
 		 to the operands.   */