From c88d112e6eab8c3af367b9b3de95b3366ee51445 Mon Sep 17 00:00:00 2001 From: Tsukasa OI Date: Fri, 26 Aug 2022 10:42:46 +0000 Subject: [PATCH] RISC-V: Make `is_addiw' parameter bool Because we widely use `bool' type, this commit makes this parameter `bool' in the process of tidying. opcodes/ChangeLog: * riscv-dis.c (maybe_print_address): Change `is_addiw' type from `int' to `bool'. (print_insn_args): Use boolean values. --- opcodes/riscv-dis.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 7322db10d24..d4c1a5505b1 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -172,7 +172,7 @@ arg_print (struct disassemble_info *info, unsigned long val, static void maybe_print_address (struct riscv_private_data *pd, int base_reg, int offset, - int is_addiw) + bool is_addiw) { if (pd->hi_addr[base_reg] != (bfd_vma)-1) { @@ -243,10 +243,10 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info case 'o': case 'j': if (((l & MASK_C_ADDI) == MATCH_C_ADDI) && rd != 0) - maybe_print_address (pd, rd, EXTRACT_CITYPE_IMM (l), 0); + maybe_print_address (pd, rd, EXTRACT_CITYPE_IMM (l), false); if (info->mach == bfd_mach_riscv64 && ((l & MASK_C_ADDIW) == MATCH_C_ADDIW) && rd != 0) - maybe_print_address (pd, rd, EXTRACT_CITYPE_IMM (l), 1); + maybe_print_address (pd, rd, EXTRACT_CITYPE_IMM (l), true); print (info->stream, dis_style_immediate, "%d", (int)EXTRACT_CITYPE_IMM (l)); break; @@ -406,7 +406,7 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info case 'b': case 's': if ((l & MASK_JALR) == MATCH_JALR) - maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), 0); + maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), false); print (info->stream, dis_style_register, "%s", riscv_gpr_names[rs1]); break; @@ -436,21 +436,21 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info break; case 'o': - maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), 0); + maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), false); /* Fall through. */ case 'j': if (((l & MASK_ADDI) == MATCH_ADDI && rs1 != 0) || (l & MASK_JALR) == MATCH_JALR) - maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), 0); + maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), false); if (info->mach == bfd_mach_riscv64 && ((l & MASK_ADDIW) == MATCH_ADDIW) && rs1 != 0) - maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), 1); + maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), true); print (info->stream, dis_style_immediate, "%d", (int)EXTRACT_ITYPE_IMM (l)); break; case 'q': - maybe_print_address (pd, rs1, EXTRACT_STYPE_IMM (l), 0); + maybe_print_address (pd, rs1, EXTRACT_STYPE_IMM (l), false); print (info->stream, dis_style_address_offset, "%d", (int)EXTRACT_STYPE_IMM (l)); break;