* mips-dis.c (print_insn_args): Print $fcc only for FP

	instructions, use $cc elsewise.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 35d9a3d..fde7b80 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,6 +1,12 @@
 2006-04-28  Thiemo Seufer  <ths@mips.com>
             Nigel Stevens  <nigel@mips.com>
 
+       * mips-dis.c (print_insn_args): Print $fcc only for FP
+       instructions, use $cc elsewise.
+
+2006-04-28  Thiemo Seufer  <ths@mips.com>
+            Nigel Stevens  <nigel@mips.com>
+
        * opcodes/mips-dis.c (mips16_to_32_reg_map, mips16_reg_names):
        Map MIPS16 registers to O32 names.
        (print_mips16_insn_arg): Use mips16_reg_names.

diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index 5001f06..416be37 100644 (file)
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -1072,7 +1072,9 @@ print_insn_args (const char *d,
          break;
 
        case 'N':
-         (*info->fprintf_func) (info->stream, "$fcc%ld",
+         (*info->fprintf_func) (info->stream,
+                                ((opp->pinfo & (FP_D | FP_S)) != 0
+                                 ? "$fcc%ld" : "$cc%ld"),
                                 (l >> OP_SH_BCC) & OP_MASK_BCC);
          break;