From: Chris Demetriou <cgd@google.com>
Date: Thu, 2 Jan 2003 22:04:55 +0000 (+0000)
Subject: 2003-01-02  Chris Demetriou  <cgd@broadcom.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=440cc0bc1a3338bfbd5e098cb65483bc50c0bd57;p=binutils-gdb.git

2003-01-02  Chris Demetriou  <cgd@broadcom.com>

        * mips-dis.c (print_insn_args): Use position extracted by "+A"
        to calculate size for "+B".  Redo code for "+C" so it shares
        the same style as "+A" and "+B" now do.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 342eb91e43b..18a16d36fc1 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-02  Chris Demetriou  <cgd@broadcom.com>
+
+	* mips-dis.c (print_insn_args): Use position extracted by "+A"
+	to calculate size for "+B".  Redo code for "+C" so it shares
+	the same style as "+A" and "+B" now do.
+
 2003-01-02  Chris Demetriou  <cgd@broadcom.com>
 
 	* mips-dis.c: Update copyright years.
diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index cbf87ce8ccc..176ffeb4694 100644
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -672,6 +672,9 @@ print_insn_args (d, l, pc, info)
      struct disassemble_info *info;
 {
   int op, delta;
+  unsigned int lsb, msb, msbd;
+
+  lsb = 0;
 
   for (; *d != '\0'; d++)
     {
@@ -697,21 +700,18 @@ print_insn_args (d, l, pc, info)
 	      return;
 
 	    case 'A':
-	      (*info->fprintf_func) (info->stream, "0x%x",
-				     (l >> OP_SH_SHAMT) & OP_MASK_SHAMT);
+	      lsb = (l >> OP_SH_SHAMT) & OP_MASK_SHAMT;
+	      (*info->fprintf_func) (info->stream, "0x%x", lsb);
 	      break;
 	
 	    case 'B':
-	      (*info->fprintf_func) (info->stream, "0x%x",
-				     (((l >> OP_SH_INSMSB) & OP_MASK_INSMSB)
-				      - ((l >> OP_SH_SHAMT) & OP_MASK_SHAMT)
-				      + 1));
+	      msb = (l >> OP_SH_INSMSB) & OP_MASK_INSMSB;
+	      (*info->fprintf_func) (info->stream, "0x%x", msb - lsb + 1);
 	      break;
 
 	    case 'C':
-	      (*info->fprintf_func) (info->stream, "0x%x",
-				     (((l >> OP_SH_EXTMSBD) & OP_MASK_EXTMSBD)
-				      + 1));
+	      msbd = (l >> OP_SH_EXTMSBD) & OP_MASK_EXTMSBD;
+	      (*info->fprintf_func) (info->stream, "0x%x", msbd + 1);
 	      break;
 
 	    case 'D':