* elflink.c (_bfd_elf_merge_symbol): Use local var holding value

[binutils-gdb.git] / opcodes / bfin-dis.c

diff --git a/opcodes/bfin-dis.c b/opcodes/bfin-dis.c
index a475c23911b8c0868fc991341cf0e547af2192d6..5022228cac2021bda2cf2ff5e5595d954c3d2c6a 100644 (file)
--- a/opcodes/bfin-dis.c
+++ b/opcodes/bfin-dis.c
@@ -1,5 +1,5 @@
 /* Disassemble ADI Blackfin Instructions.
-   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
    Free Software Foundation, Inc.
 
    This file is part of libopcodes.
@@ -19,9 +19,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+#include "sysdep.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "opcode/bfin.h"
 
@@ -162,16 +161,7 @@ fmtconst (const_forms_t cf, TIword x, bfd_vma pc, disassemble_info *outf)
     x <<= constant_formats[cf].scale;
 
   if (constant_formats[cf].decimal)
-    {
-      if (constant_formats[cf].leading)
-       {
-         char ps[10];
-         sprintf (ps, "%%%ii", constant_formats[cf].leading);
-         sprintf (buf, ps, x);
-       }
-      else
-       sprintf (buf, "%li", x);
-    }
+    sprintf (buf, "%*li", constant_formats[cf].leading, x);
   else
     {
       if (constant_formats[cf].issigned && x < 0)
@@ -490,7 +480,7 @@ static const enum machine_registers decode_allregs[] =
 
 /* (arch.pm)arch_disassembler_functions.  */
 #ifndef OUTS
-#define OUTS(p, txt) ((p) ? (((txt)[0]) ? (p->fprintf_func)(p->stream, "%s", txt) :0) :0)
+#define OUTS(p, txt) (p)->fprintf_func ((p)->stream, "%s", txt)
 #endif
 
 static void
@@ -3010,13 +3000,16 @@ decode_dsp32mac_0 (TIword iw0, TIword iw1, disassemble_info *outf)
        {
          if (MM)
            OUTS (outf, " (M)");
-         MM = 0;
          OUTS (outf, ", ");
        }
     }
 
   if (w0 == 1 || op0 != 3)
     {
+      /* Clear MM option since it only matters for MAC1, and if we made
+         it this far, we've already shown it or we want to ignore it.  */
+      MM = 0;
+
       if (w0)
        OUTS (outf, P ? dregs (dst) : dregs_lo (dst));
 
@@ -4781,9 +4774,9 @@ print_insn_bfin (bfd_vma pc, disassemble_info *outf)
       int len;
 
       parallel = 1;
-      outf->fprintf_func (outf->stream, " || ");
+      OUTS (outf, " || ");
       len = _print_insn_bfin (pc + 4, outf);
-      outf->fprintf_func (outf->stream, " || ");
+      OUTS (outf, " || ");
       if (len != 2)
        legal = 0;
       len = _print_insn_bfin (pc + 6, outf);
@@ -4794,7 +4787,7 @@ print_insn_bfin (bfd_vma pc, disassemble_info *outf)
        count = 8;
       else
        {
-         outf->fprintf_func (outf->stream, ";\t\t/* ILLEGAL PARALLEL INSTRUCTION */");
+         OUTS (outf, ";\t\t/* ILLEGAL PARALLEL INSTRUCTION */");
          comment = 1;
          count = 0;
        }
@@ -4802,7 +4795,7 @@ print_insn_bfin (bfd_vma pc, disassemble_info *outf)
     }
 
   if (!comment)
-    outf->fprintf_func (outf->stream, ";");
+    OUTS (outf, ";");
 
   if (count == 0)
     return 2;