From 63b4cc53dc41c755f8b30d85edf29c153f76eba3 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 29 Mar 2021 09:52:56 +1030 Subject: TRUE/FALSE simplification There is really no need to write code like "foo != 0 ? TRUE : FALSE" unless we had stupidly defined FALSE as something other than 0 or TRUE as something other than 1. The simpler "foo != 0" does just as well. Similarly "(condition == TRUE)" or "(condition == FALSE) can be simplified to "(condition)" and "(!condition)" respectively. I'll note that there is reason to use "integer_expression != 0" when assigning a bfd_boolean rather than the simpler "integer_expression", if you expect the variable to have 0 or 1 value. It's probably even a good idea to not rely on implicit conversion if bfd_boolean were _Bool. bfd/ * aoutx.h (aout_link_write_symbols): Don't cast boolean expression to bfd_boolean. * elf32-or1k.c (or1k_set_got_and_rela_sizes): Dont compare booleans against FALSE. * elf32-arc.c (name_for_global_symbol): Don't compare boolean to TRUE. (is_reloc_PC_relative): Don't use "boolean_condition ? TRUE : FALSE". (is_reloc_SDA_relative, is_reloc_for_GOT): Likewise. (is_reloc_for_PLT, is_reloc_for_TLS): Likewise. * elf32-arm.c (stm32l4xx_need_create_replacing_stub): Likewise. * elf32-nds32.c (insert_nds32_elf_blank): Likewise. * elf32-rx.c (rx_set_section_contents): Likewise. * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Likewise. * elfxx-mips.c (_bfd_mips_elf_ignore_undef_symbol): Likewise. * mach-o.c (bfd_mach_o_read_command): Likewise. * targets.c (bfd_get_target_info): Likewise. binutils/ * dlltool.c (main): Don't use "boolean_condition ? TRUE : FALSE". * dwarf.c (read_and_display_attr_value): Likewise. (display_debug_str_offsets): Likewise. * objdump.c (dump_bfd): Likewise. * readelf.c (dump_section_as_strings): Likewise. (dump_section_as_bytes): Likewise. gas/ * atof-generic.c (FALSE, TRUE): Don't define. * config/obj-elf.h (FALSE, TRUE): Don't define. * config/obj-som.h (FALSE, TRUE): Don't define. * config/tc-hppa.h (FALSE, TRUE): Don't define. * config/tc-pdp11.c (FALSE, TRUE): Don't define. * config/tc-iq2000.h (obj_fix_adjustable): Delete. * config/tc-m32r.h (TC_FIX_ADJUSTABLE): Delete. * config/tc-mt.h (obj_fix_adjustable): Delete. * config/tc-nds32.h (TC_FIX_ADJUSTABLE): Delete. * config/tc-arc.c (parse_opcode_flags): Simplify boolean expression. (relaxable_flag, relaxable_operand, assemble_insn): Likewise. (tokenize_extregister): Likewise. * config/tc-csky.c (parse_opcode, get_operand_value): Likewise. (parse_operands_op, parse_operands, md_assemble): Likewise. * config/tc-d10v.c (build_insn): Likewise. * config/tc-score.c (s3_gen_insn_frag): Likewise. * config/tc-score7.c (s7_gen_insn_frag, s7_relax_frag): Likewise. * config/tc-tic6x.c (tic6x_update_features, md_assemble): Likewise. * config/tc-z80.c (emit_byte): Likewise. include/ * opcode/aarch64.h (alias_opcode_p): Simplify boolean expression. (opcode_has_alias, pseudo_opcode_p, optional_operand_p): Likewise. (opcode_has_special_coder): Likewise. ld/ * emultempl/aix.em (gld${EMULATION_NAME}_before_allocation): Simplify boolean expression. * lexsup.c (parse_args): Likewise. * pe-dll.c (pe_dll_id_target): Likewise. opcodes/ * aarch64-opc.c (vector_qualifier_p): Simplify boolean expression. (fp_qualifier_p, get_data_pattern): Likewise. (aarch64_get_operand_modifier_from_value): Likewise. (aarch64_extend_operator_p, aarch64_shift_operator_p): Likewise. (operand_variant_qualifier_p): Likewise. (qualifier_value_in_range_constraint_p): Likewise. (aarch64_get_qualifier_esize): Likewise. (aarch64_get_qualifier_nelem): Likewise. (aarch64_get_qualifier_standard_value): Likewise. (get_lower_bound, get_upper_bound): Likewise. (aarch64_find_best_match, match_operands_qualifier): Likewise. (aarch64_print_operand): Likewise. * aarch64-opc.h (operand_has_inserter, operand_has_extractor): Likewise. (operand_need_sign_extension, operand_need_shift_by_two): Likewise. (operand_need_shift_by_four, operand_maybe_stack_pointer): Likewise. * arm-dis.c (print_insn_mve, print_insn_thumb32): Likewise. * tic6x-dis.c (tic6x_check_fetch_packet_header): Likewise. (print_insn_tic6x): Likewise. --- binutils/ChangeLog | 9 +++++++++ binutils/dlltool.c | 2 +- binutils/dwarf.c | 8 ++++---- binutils/objdump.c | 2 +- binutils/readelf.c | 4 ++-- 5 files changed, 17 insertions(+), 8 deletions(-) (limited to 'binutils') diff --git a/binutils/ChangeLog b/binutils/ChangeLog index f532e1c..8928e23 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,14 @@ 2021-03-29 Alan Modra + * dlltool.c (main): Don't use "boolean_condition ? TRUE : FALSE". + * dwarf.c (read_and_display_attr_value): Likewise. + (display_debug_str_offsets): Likewise. + * objdump.c (dump_bfd): Likewise. + * readelf.c (dump_section_as_strings): Likewise. + (dump_section_as_bytes): Likewise. + +2021-03-29 Alan Modra + * objdump.c (process_links): Use type int. * readelf.c (request_dump): Don't increment do_dump, set it. * windint.h (target_is_bigendian): Use type bfd_boolean. diff --git a/binutils/dlltool.c b/binutils/dlltool.c index ca31df9..b7fdebc 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -3957,7 +3957,7 @@ main (int ac, char **av) bfd_get_target_info (mtable[machine].how_bfd_target, NULL, NULL, &u, NULL); if (u != -1) - leading_underscore = (u != 0 ? TRUE : FALSE); + leading_underscore = u != 0; } if (!dll_name && exp_name) diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 74f28f5..23ee705 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -2727,8 +2727,8 @@ read_and_display_attr_value (unsigned long attribute, case DW_FORM_strx4: if (!do_loc) { - const char * suffix = strrchr (section->name, '.'); - bfd_boolean dwo = (suffix && strcmp (suffix, ".dwo") == 0) ? TRUE : FALSE; + const char *suffix = strrchr (section->name, '.'); + bfd_boolean dwo = suffix && strcmp (suffix, ".dwo") == 0; if (do_wide) /* We have already displayed the form name. */ @@ -7545,8 +7545,8 @@ display_debug_str_offsets (struct dwarf_section *section, unsigned char *end = start + section->size; unsigned char *curr = start; - const char * suffix = strrchr (section->name, '.'); - bfd_boolean dwo = (suffix && strcmp (suffix, ".dwo") == 0) ? TRUE : FALSE; + const char *suffix = strrchr (section->name, '.'); + bfd_boolean dwo = suffix && strcmp (suffix, ".dwo") == 0; if (dwo) load_debug_section_with_follow (str_dwo, file); diff --git a/binutils/objdump.c b/binutils/objdump.c index 7d8f9d7..0d76fb7 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -4950,7 +4950,7 @@ dump_bfd (bfd *abfd, bfd_boolean is_mainfile) { if (!print_debugging_info (stdout, dhandle, abfd, syms, bfd_demangle, - dump_debugging_tags ? TRUE : FALSE)) + dump_debugging_tags != 0)) { non_fatal (_("%s: printing debugging information failed"), bfd_get_filename (abfd)); diff --git a/binutils/readelf.c b/binutils/readelf.c index c995911..8b32dab 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -14454,7 +14454,7 @@ dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata) real_start = start = (unsigned char *) get_section_contents (section, filedata); if (start == NULL) /* PR 21820: Do not fail if the section was empty. */ - return (section->sh_size == 0 || section->sh_type == SHT_NOBITS) ? TRUE : FALSE; + return section->sh_size == 0 || section->sh_type == SHT_NOBITS; num_bytes = section->sh_size; @@ -14670,7 +14670,7 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, real_start = start = (unsigned char *) get_section_contents (section, filedata); if (start == NULL) /* PR 21820: Do not fail if the section was empty. */ - return (section->sh_size == 0 || section->sh_type == SHT_NOBITS) ? TRUE : FALSE; + return section->sh_size == 0 || section->sh_type == SHT_NOBITS; section_size = section->sh_size; -- cgit v1.1