From: Maciej W. Rozycki <macro@linux-mips.org>
Date: Tue, 6 Jul 2010 00:06:04 +0000 (+0000)
Subject: 	* mips-dis.c (print_insn_mips): Correct branch instruction type
X-Git-Tag: gdb_7_2-2010-07-07-branchpoint~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c680e7f672a30b81ccffb8e2d1bcd01bca659c55;p=thirdparty%2Fbinutils-gdb.git

	* mips-dis.c (print_insn_mips): Correct branch instruction type
	determination.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 2832bebe9ad..db9f65e8e7a 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-06  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* mips-dis.c (print_insn_mips): Correct branch instruction type
+	determination.
+
 2010-07-06  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* mips-dis.c (print_mips16_insn_arg): Remove branch instruction
diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index 01e446c56aa..c0cfed671ed 100644
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -1404,7 +1404,8 @@ print_insn_mips (bfd_vma memaddr,
 	      /* Figure out instruction type and branch delay information.  */
 	      if ((op->pinfo & INSN_UNCOND_BRANCH_DELAY) != 0)
 	        {
-		  if ((info->insn_type & INSN_WRITE_GPR_31) != 0)
+		  if ((op->pinfo & (INSN_WRITE_GPR_31
+				    | INSN_WRITE_GPR_D)) != 0)
 		    info->insn_type = dis_jsr;
 		  else
 		    info->insn_type = dis_branch;
@@ -1413,7 +1414,7 @@ print_insn_mips (bfd_vma memaddr,
 	      else if ((op->pinfo & (INSN_COND_BRANCH_DELAY
 				     | INSN_COND_BRANCH_LIKELY)) != 0)
 		{
-		  if ((info->insn_type & INSN_WRITE_GPR_31) != 0)
+		  if ((op->pinfo & INSN_WRITE_GPR_31) != 0)
 		    info->insn_type = dis_condjsr;
 		  else
 		    info->insn_type = dis_condbranch;