diff options
| -rw-r--r-- | opcodes/ChangeLog | 10 | ||||
| -rw-r--r-- | opcodes/bfin-dis.c | 42 |
2 files changed, 31 insertions, 21 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 4598078..0e8e850 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,15 @@ 2014-08-14 Mike Frysinger <vapier@gentoo.org> + * bfin-dis.c (struct private): Change int's to bfd_boolean's. + (decode_LOGI2op_0, decode_COMPI2opD_0, decode_COMPI2opP_0, + decode_dagMODik_0, decode_LDIMMhalf_0, decode_linkage_0): + Change assignment of 1 to priv->comment to TRUE. + (print_insn_bfin): Change legal to a bfd_boolean. Change + assignment of 0/1 with priv comment and parallel and legal + to FALSE/TRUE. + +2014-08-14 Mike Frysinger <vapier@gentoo.org> + * bfin-dis.c (OUT): Define. (decode_CC2stat_0): Declare new op_names array. Replace multiple if statements with a single one. diff --git a/opcodes/bfin-dis.c b/opcodes/bfin-dis.c index ba33152..56336be 100644 --- a/opcodes/bfin-dis.c +++ b/opcodes/bfin-dis.c @@ -45,7 +45,7 @@ typedef unsigned int bu32; struct private { TIword iw0; - int comment, parallel; + bfd_boolean comment, parallel; }; typedef enum @@ -1569,7 +1569,7 @@ decode_LOGI2op_0 (TIword iw0, disassemble_info *outf) OUTS (outf, ");\t\t/* bit"); OUTS (outf, imm7d (src)); OUTS (outf, " */"); - priv->comment = 1; + priv->comment = TRUE; } else if (opc == 1) { @@ -1580,7 +1580,7 @@ decode_LOGI2op_0 (TIword iw0, disassemble_info *outf) OUTS (outf, ");\t\t/* bit"); OUTS (outf, imm7d (src)); OUTS (outf, " */"); - priv->comment = 1; + priv->comment = TRUE; } else if (opc == 2) { @@ -1591,7 +1591,7 @@ decode_LOGI2op_0 (TIword iw0, disassemble_info *outf) OUTS (outf, ");\t\t/* bit"); OUTS (outf, imm7d (src)); OUTS (outf, " */"); - priv->comment = 1; + priv->comment = TRUE; } else if (opc == 3) { @@ -1602,7 +1602,7 @@ decode_LOGI2op_0 (TIword iw0, disassemble_info *outf) OUTS (outf, ");\t\t/* bit"); OUTS (outf, imm7d (src)); OUTS (outf, " */"); - priv->comment = 1; + priv->comment = TRUE; } else if (opc == 4) { @@ -1613,7 +1613,7 @@ decode_LOGI2op_0 (TIword iw0, disassemble_info *outf) OUTS (outf, ");\t\t/* bit"); OUTS (outf, imm7d (src)); OUTS (outf, " */"); - priv->comment = 1; + priv->comment = TRUE; } else if (opc == 5) { @@ -1771,7 +1771,7 @@ decode_COMPI2opD_0 (TIword iw0, disassemble_info *outf) OUTS (outf, "("); OUTS (outf, imm32 (*pval)); OUTS (outf, ") */"); - priv->comment = 1; + priv->comment = TRUE; } else if (op == 1) { @@ -1781,7 +1781,7 @@ decode_COMPI2opD_0 (TIword iw0, disassemble_info *outf) OUTS (outf, ";\t\t/* ("); OUTS (outf, imm7d (src)); OUTS (outf, ") */"); - priv->comment = 1; + priv->comment = TRUE; } else return 0; @@ -1827,7 +1827,7 @@ decode_COMPI2opP_0 (TIword iw0, disassemble_info *outf) OUTS (outf, "("); OUTS (outf, imm32 (*pval)); OUTS (outf, ") */"); - priv->comment = 1; + priv->comment = TRUE; } else if (op == 1) { @@ -1837,7 +1837,7 @@ decode_COMPI2opP_0 (TIword iw0, disassemble_info *outf) OUTS (outf, ";\t\t/* ("); OUTS (outf, imm7d (src)); OUTS (outf, ") */"); - priv->comment = 1; + priv->comment = TRUE; } else return 0; @@ -2043,7 +2043,7 @@ decode_dagMODik_0 (TIword iw0, disassemble_info *outf) else if (op == 2 || op == 3) OUTS (outf, "4"); OUTS (outf, ") */"); - priv->comment = 1; + priv->comment = TRUE; } return 2; @@ -2743,7 +2743,7 @@ decode_LDIMMhalf_0 (TIword iw0, TIword iw1, disassemble_info *outf) } OUTS (outf, " */"); - priv->comment = 1; + priv->comment = TRUE; } if (S == 1 || Z == 1) { @@ -2754,7 +2754,7 @@ decode_LDIMMhalf_0 (TIword iw0, TIword iw1, disassemble_info *outf) OUTS (outf, "("); OUTS (outf, imm32 (*pval)); OUTS (outf, ") */"); - priv->comment = 1; + priv->comment = TRUE; } return 4; } @@ -2919,7 +2919,7 @@ decode_linkage_0 (TIword iw0, TIword iw1, disassemble_info *outf) OUTS (outf, ";\t\t/* ("); OUTS (outf, uimm16s4d (framesize)); OUTS (outf, ") */"); - priv->comment = 1; + priv->comment = TRUE; } else if (R == 1) OUTS (outf, "UNLINK"); @@ -4771,8 +4771,8 @@ print_insn_bfin (bfd_vma pc, disassemble_info *outf) struct private priv; int count; - priv.parallel = 0; - priv.comment = 0; + priv.parallel = FALSE; + priv.comment = FALSE; outf->private_data = &priv; count = _print_insn_bfin (pc, outf); @@ -4784,29 +4784,29 @@ print_insn_bfin (bfd_vma pc, disassemble_info *outf) if (count == 4 && (priv.iw0 & 0xc000) == 0xc000 && (priv.iw0 & BIT_MULTI_INS) && ((priv.iw0 & 0xe800) != 0xe800 /* Not Linkage. */ )) { - int legal = 1; + bfd_boolean legal = TRUE; int len; - priv.parallel = 1; + priv.parallel = TRUE; OUTS (outf, " || "); len = _print_insn_bfin (pc + 4, outf); if (len == -1) return -1; OUTS (outf, " || "); if (len != 2) - legal = 0; + legal = FALSE; len = _print_insn_bfin (pc + 6, outf); if (len == -1) return -1; if (len != 2) - legal = 0; + legal = FALSE; if (legal) count = 8; else { OUTS (outf, ";\t\t/* ILLEGAL PARALLEL INSTRUCTION */"); - priv.comment = 1; + priv.comment = TRUE; count = 0; } } |