diff options
author | Alan Modra <amodra@gmail.com> | 2021-03-31 10:30:54 +1030 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2021-03-31 10:49:23 +1030 |
commit | 0a1b45a20eaa98d4d9026dc1fd17e79e741183af (patch) | |
tree | 059b2b296b4d60784a82cd6a52dae47dcac4d66a /bfd/mmo.c | |
parent | faa7a26040c617a6d29f601998b99a1da882c672 (diff) | |
download | gdb-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.zip gdb-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.tar.gz gdb-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.tar.bz2 |
Use bool in bfd
* sysdep.h: POISON_BFD_BOOLEAN: Define.
* aix5ppc-core.c, * aout-cris.c, * aout-ns32k.c, * aout-target.h,
* aoutx.h, * arc-got.h, * archive.c, * archive64.c, * archures.c,
* bfd-in.h, * bfd.c, * bfdwin.c, * binary.c, * cache.c,
* coff-alpha.c, * coff-arm.c, * coff-arm.h, * coff-bfd.c,
* coff-bfd.h, * coff-go32.c, * coff-i386.c, * coff-ia64.c,
* coff-mcore.c, * coff-mips.c, * coff-rs6000.c, * coff-sh.c,
* coff-stgo32.c, * coff-tic30.c, * coff-tic4x.c, * coff-tic54x.c,
* coff-x86_64.c, * coff-z80.c, * coff-z8k.c, * coff64-rs6000.c,
* coffcode.h, * coffgen.c, * cofflink.c, * compress.c,
* corefile.c, * cpu-aarch64.c, * cpu-aarch64.h, * cpu-alpha.c,
* cpu-arc.c, * cpu-arm.c, * cpu-arm.h, * cpu-avr.c, * cpu-bfin.c,
* cpu-bpf.c, * cpu-cr16.c, * cpu-cris.c, * cpu-crx.c,
* cpu-csky.c, * cpu-d10v.c, * cpu-d30v.c, * cpu-dlx.c,
* cpu-epiphany.c, * cpu-fr30.c, * cpu-frv.c, * cpu-ft32.c,
* cpu-h8300.c, * cpu-hppa.c, * cpu-i386.c, * cpu-ia64.c,
* cpu-iamcu.c, * cpu-ip2k.c, * cpu-iq2000.c, * cpu-k1om.c,
* cpu-l1om.c, * cpu-lm32.c, * cpu-m10200.c, * cpu-m10300.c,
* cpu-m32c.c, * cpu-m32r.c, * cpu-m68hc11.c, * cpu-m68hc12.c,
* cpu-m68k.c, * cpu-m9s12x.c, * cpu-m9s12xg.c, * cpu-mcore.c,
* cpu-mep.c, * cpu-metag.c, * cpu-microblaze.c, * cpu-mips.c,
* cpu-mmix.c, * cpu-moxie.c, * cpu-msp430.c, * cpu-mt.c,
* cpu-nds32.c, * cpu-nfp.c, * cpu-nios2.c, * cpu-ns32k.c,
* cpu-or1k.c, * cpu-pdp11.c, * cpu-pj.c, * cpu-powerpc.c,
* cpu-pru.c, * cpu-riscv.c, * cpu-rl78.c, * cpu-rs6000.c,
* cpu-rx.c, * cpu-s12z.c, * cpu-s390.c, * cpu-score.c,
* cpu-sh.c, * cpu-sparc.c, * cpu-spu.c, * cpu-tic30.c,
* cpu-tic4x.c, * cpu-tic54x.c, * cpu-tic6x.c, * cpu-tilegx.c,
* cpu-tilepro.c, * cpu-v850.c, * cpu-v850_rh850.c, * cpu-vax.c,
* cpu-visium.c, * cpu-wasm32.c, * cpu-xc16x.c, * cpu-xgate.c,
* cpu-xstormy16.c, * cpu-xtensa.c, * cpu-z80.c, * cpu-z8k.c,
* dwarf1.c, * dwarf2.c, * ecoff-bfd.h, * ecoff.c, * ecofflink.c,
* elf-attrs.c, * elf-bfd.h, * elf-eh-frame.c, * elf-hppa.h,
* elf-ifunc.c, * elf-m10200.c, * elf-m10300.c, * elf-nacl.c,
* elf-nacl.h, * elf-properties.c, * elf-s390-common.c,
* elf-s390.h, * elf-strtab.c, * elf-vxworks.c, * elf-vxworks.h,
* elf.c, * elf32-am33lin.c, * elf32-arc.c, * elf32-arm.c,
* elf32-arm.h, * elf32-avr.c, * elf32-avr.h, * elf32-bfin.c,
* elf32-bfin.h, * elf32-cr16.c, * elf32-cr16.h, * elf32-cris.c,
* elf32-crx.c, * elf32-csky.c, * elf32-csky.h, * elf32-d10v.c,
* elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c,
* elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c, * elf32-gen.c,
* elf32-h8300.c, * elf32-hppa.c, * elf32-hppa.h, * elf32-i386.c,
* elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c,
* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c,
* elf32-m68hc1x.c, * elf32-m68hc1x.h, * elf32-m68k.c,
* elf32-m68k.h, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c,
* elf32-metag.h, * elf32-microblaze.c, * elf32-mips.c,
* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
* elf32-nios2.c, * elf32-nios2.h, * elf32-or1k.c, * elf32-pj.c,
* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
* elf32-rx.c, * elf32-s12z.c, * elf32-s390.c, * elf32-score.c,
* elf32-score.h, * elf32-score7.c, * elf32-sh-relocs.h,
* elf32-sh.c, * elf32-sparc.c, * elf32-spu.c, * elf32-spu.h,
* elf32-tic6x.c, * elf32-tic6x.h, * elf32-tilegx.c,
* elf32-tilepro.c, * elf32-v850.c, * elf32-v850.h,
* elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c,
* elf32-xc16x.c, * elf32-xgate.c, * elf32-xstormy16.c,
* elf32-xtensa.c, * elf32-z80.c, * elf64-alpha.c, * elf64-bpf.c,
* elf64-gen.c, * elf64-hppa.c, * elf64-ia64-vms.c,
* elf64-mips.c, * elf64-mmix.c, * elf64-nfp.c, * elf64-ppc.c,
* elf64-ppc.h, * elf64-s390.c, * elf64-sparc.c,
* elf64-tilegx.c, * elf64-x86-64.c, * elfcode.h,
* elfcore.h, * elflink.c, * elfn32-mips.c, * elfnn-aarch64.c,
* elfnn-ia64.c, * elfnn-riscv.c, * elfxx-aarch64.c,
* elfxx-aarch64.h, * elfxx-ia64.c, * elfxx-ia64.h,
* elfxx-mips.c, * elfxx-mips.h, * elfxx-riscv.c, * elfxx-riscv.h,
* elfxx-sparc.c, * elfxx-sparc.h, * elfxx-target.h,
* elfxx-tilegx.c, * elfxx-tilegx.h, * elfxx-x86.c, * elfxx-x86.h,
* format.c, * genlink.h, * hash.c, * i386aout.c, * i386lynx.c,
* i386msdos.c, * ihex.c, * libaout.h, * libbfd-in.h,
* libbfd.c, * libcoff-in.h, * libecoff.h, * libpei.h,
* libxcoff.h, * linker.c, * mach-o-aarch64.c, * mach-o-arm.c,
* mach-o-i386.c, * mach-o-x86-64.c, * mach-o.c, * mach-o.h,
* merge.c, * mmo.c, * netbsd.h, * opncls.c, * pc532-mach.c,
* pdp11.c, * pe-arm.c, * pe-i386.c, * pe-mcore.c, * pe-sh.c,
* pe-x86_64.c, * peXXigen.c, * pef.c, * pei-arm.c, * pei-i386.c,
* pei-ia64.c, * pei-mcore.c, * pei-sh.c, * pei-x86_64.c,
* peicode.h, * plugin.c, * plugin.h, * ppcboot.c, * reloc.c,
* reloc16.c, * rs6000-core.c, * section.c, * simple.c, * som.c,
* som.h, * srec.c, * stabs.c, * syms.c, * targets.c, * tekhex.c,
* verilog.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c, * vms.h,
* wasm-module.c, * xcofflink.c, * xcofflink.h, * xsym.c,
* xsym.h: Replace bfd_boolean with bool, FALSE with false, and
TRUE with true throughout.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* libcoff.h: Regenerate.
Diffstat (limited to 'bfd/mmo.c')
-rw-r--r-- | bfd/mmo.c | 227 |
1 files changed, 113 insertions, 114 deletions
@@ -307,7 +307,7 @@ struct mmo_data_struct /* When we're reading bytes recursively, check this occasionally. Also holds write errors. */ - bfd_boolean have_error; + bool have_error; /* Max symbol length that may appear in the lop_stab table. Note that this table might just hold a subset of symbols for not-really large @@ -334,10 +334,10 @@ struct mmo_data_struct /* Whether we've calculated symbol consistency requirement yet. We do this when-needed, which must be at some time after all section contents is known. */ - bfd_boolean symbol_consistency_override_calculated; + bool symbol_consistency_override_calculated; /* Whether to consistency-check symbol values, in particular "Main". */ - bfd_boolean ignore_symbol_consistency; + bool ignore_symbol_consistency; }; typedef struct mmo_data_struct tdata_type; @@ -358,7 +358,7 @@ struct mmo_section_data_struct struct mmo_write_sec_info { asection *reg_section; - bfd_boolean retval; + bool retval; }; /* Used when trying to find a section corresponding to addr. */ @@ -368,7 +368,7 @@ struct mmo_find_sec_info bfd_vma addr; }; -static bfd_boolean mmo_bfd_copy_private_bfd_data (bfd *, bfd *); +static bool mmo_bfd_copy_private_bfd_data (bfd *, bfd *); static void mmo_write_section_unless_reg_contents (bfd *, asection *, void *); static void mmo_find_sec_w_addr (bfd *, asection *, void *); static void mmo_find_sec_w_addr_grow (bfd *, asection *, void *); @@ -377,8 +377,8 @@ static void mmo_get_symbol_info (bfd *, asymbol *, symbol_info *); static void mmo_print_symbol (bfd *, void *, asymbol *, bfd_print_symbol_type); static void mmo_init (void); -static bfd_boolean mmo_mkobject (bfd *); -static bfd_boolean mmo_scan (bfd *); +static bool mmo_mkobject (bfd *); +static bool mmo_scan (bfd *); static asection *mmo_decide_section (bfd *, bfd_vma); static asection *mmo_get_generic_spec_data_section (bfd *, int); static asection *mmo_get_spec_section (bfd *, int); @@ -388,48 +388,47 @@ static void mmo_xore_32 (asection *, bfd_vma vma, unsigned int); static void mmo_xore_16 (asection *, bfd_vma vma, unsigned int); static bfd_cleanup mmo_object_p (bfd *); static void mmo_map_set_sizes (bfd *, asection *, void *); -static bfd_boolean mmo_get_symbols (bfd *); -static bfd_boolean mmo_create_symbol (bfd *, const char *, bfd_vma, - enum mmo_sym_type, unsigned int); -static bfd_boolean mmo_get_section_contents (bfd *, asection *, void *, - file_ptr, bfd_size_type); +static bool mmo_get_symbols (bfd *); +static bool mmo_create_symbol (bfd *, const char *, bfd_vma, + enum mmo_sym_type, unsigned int); +static bool mmo_get_section_contents (bfd *, asection *, void *, + file_ptr, bfd_size_type); static long mmo_get_symtab_upper_bound (bfd *); static long mmo_canonicalize_symtab (bfd *, asymbol **); static void mmo_get_symbol_info (bfd *, asymbol *, symbol_info *); static void mmo_print_symbol (bfd *, void *, asymbol *, bfd_print_symbol_type); -static bfd_boolean mmo_set_section_contents (bfd *, sec_ptr, const void *, - file_ptr, bfd_size_type); +static bool mmo_set_section_contents (bfd *, sec_ptr, const void *, + file_ptr, bfd_size_type); static int mmo_sizeof_headers (bfd *, struct bfd_link_info *); -static bfd_boolean mmo_internal_write_header (bfd *); -static bfd_boolean mmo_internal_write_post (bfd *, int, asection *); -static bfd_boolean mmo_internal_add_3_sym (bfd *, struct mmo_symbol_trie *, +static bool mmo_internal_write_header (bfd *); +static bool mmo_internal_write_post (bfd *, int, asection *); +static bool mmo_internal_add_3_sym (bfd *, struct mmo_symbol_trie *, const struct mmo_symbol *); static unsigned int mmo_internal_3_length (bfd *, struct mmo_symbol_trie *); static void mmo_internal_3_dump (bfd *, struct mmo_symbol_trie *); static void mmo_beb128_out (bfd *, int, int); -static bfd_boolean mmo_internal_write_section (bfd *, asection *); +static bool mmo_internal_write_section (bfd *, asection *); static void mmo_write_tetra (bfd *, unsigned int); static void mmo_write_tetra_raw (bfd *, unsigned int); static void mmo_write_octa (bfd *, bfd_vma); static void mmo_write_octa_raw (bfd *, bfd_vma); -static bfd_boolean mmo_write_chunk (bfd *, const bfd_byte *, unsigned int); -static bfd_boolean mmo_flush_chunk (bfd *); -static bfd_boolean mmo_write_loc_chunk (bfd *, bfd_vma, const bfd_byte *, - unsigned int, bfd_vma *); -static bfd_boolean mmo_write_chunk_list (bfd *, mmo_data_list_type *); -static bfd_boolean mmo_write_loc_chunk_list (bfd *, mmo_data_list_type *); -static bfd_boolean mmo_write_symbols_and_terminator (bfd *); +static bool mmo_write_chunk (bfd *, const bfd_byte *, unsigned int); +static bool mmo_flush_chunk (bfd *); +static bool mmo_write_loc_chunk (bfd *, bfd_vma, const bfd_byte *, + unsigned int, bfd_vma *); +static bool mmo_write_chunk_list (bfd *, mmo_data_list_type *); +static bool mmo_write_loc_chunk_list (bfd *, mmo_data_list_type *); +static bool mmo_write_symbols_and_terminator (bfd *); static flagword mmo_sec_flags_from_bfd_flags (flagword); static flagword bfd_sec_flags_from_mmo_flags (flagword); static bfd_byte mmo_get_byte (bfd *); static void mmo_write_byte (bfd *, bfd_byte); -static bfd_boolean mmo_new_section_hook (bfd *, asection *); +static bool mmo_new_section_hook (bfd *, asection *); static int mmo_sort_mmo_symbols (const void *, const void *); -static bfd_boolean mmo_write_object_contents (bfd *); -static bfd_boolean mmo_write_section_description (bfd *, asection *); -static bfd_boolean mmo_has_leading_or_trailing_zero_tetra_p (bfd *, - asection *); +static bool mmo_write_object_contents (bfd *); +static bool mmo_write_section_description (bfd *, asection *); +static bool mmo_has_leading_or_trailing_zero_tetra_p (bfd *, asection *); static const char valid_mmo_symbol_character_set[] = @@ -491,11 +490,11 @@ mmo_make_section (bfd *abfd, const char *secname) static void mmo_init (void) { - static bfd_boolean inited = FALSE; + static bool inited = false; if (inited) return; - inited = TRUE; + inited = true; } /* Check whether an existing file is an mmo file. */ @@ -568,7 +567,7 @@ mmo_object_p (bfd *abfd) /* Set up the mmo tdata information. */ -static bfd_boolean +static bool mmo_mkobject (bfd *abfd) { mmo_init (); @@ -581,7 +580,7 @@ mmo_mkobject (bfd *abfd) initialize most. */ tdata_type *tdata = (tdata_type *) bfd_zalloc (abfd, sizeof (tdata_type)); if (tdata == NULL) - return FALSE; + return false; created = time (NULL); bfd_put_32 (abfd, created, tdata->created); @@ -589,10 +588,10 @@ mmo_mkobject (bfd *abfd) abfd->tdata.mmo_data = tdata; } - return TRUE; + return true; } -static bfd_boolean +static bool mmo_section_has_contents (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p ATTRIBUTE_UNUSED) { /* The point is to match what --extract-symbols does (well, negated). */ @@ -606,7 +605,7 @@ mmo_section_has_contents (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void *p ATT known. However, calculating symbol consistency at the time the private BFD data is initialized is too late for some uses. */ -static bfd_boolean +static bool mmo_ignore_symbol_consistency (bfd *abfd) { if (!abfd->tdata.mmo_data->symbol_consistency_override_calculated) @@ -614,25 +613,25 @@ mmo_ignore_symbol_consistency (bfd *abfd) abfd->tdata.mmo_data->ignore_symbol_consistency = bfd_sections_find_if (abfd, mmo_section_has_contents, NULL) == NULL; - abfd->tdata.mmo_data->symbol_consistency_override_calculated = TRUE; + abfd->tdata.mmo_data->symbol_consistency_override_calculated = true; } return abfd->tdata.mmo_data->ignore_symbol_consistency; } -static bfd_boolean +static bool mmo_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd) { if (bfd_get_flavour (ibfd) != bfd_target_mmo_flavour || bfd_get_flavour (obfd) != bfd_target_mmo_flavour) - return TRUE; + return true; /* Copy the time the copied-from file was created. If people want the time the file was last *modified*, they have that in the normal file information. */ memcpy (obfd->tdata.mmo_data->created, ibfd->tdata.mmo_data->created, sizeof (obfd->tdata.mmo_data->created)); - return TRUE; + return true; } /* Helper functions for mmo_decide_section, used through @@ -786,7 +785,7 @@ mmo_write_tetra_raw (bfd *abfd, unsigned int value) bfd_put_32 (abfd, value, buf); if (bfd_bwrite (buf, 4, abfd) != 4) - abfd->tdata.mmo_data->have_error = TRUE; + abfd->tdata.mmo_data->have_error = true; } /* Write a 32-bit word to output file; lop_quote if necessary. */ @@ -821,10 +820,10 @@ mmo_write_octa_raw (bfd *abfd, bfd_vma value) /* Write quoted contents. Intended to be called multiple times in sequence, followed by a call to mmo_flush_chunk. */ -static INLINE bfd_boolean +static INLINE bool mmo_write_chunk (bfd *abfd, const bfd_byte *loc, unsigned int len) { - bfd_boolean retval = TRUE; + bool retval = true; struct mmo_data_struct *mmop = abfd->tdata.mmo_data; /* Fill up a tetra from bytes remaining from a previous chunk. */ @@ -866,14 +865,14 @@ mmo_write_chunk (bfd *abfd, const bfd_byte *loc, unsigned int len) } if (! retval) - mmop->have_error = TRUE; + mmop->have_error = true; return retval; } /* Flush remaining bytes, from a previous mmo_write_chunk, zero-padded to 4 bytes. */ -static INLINE bfd_boolean +static INLINE bool mmo_flush_chunk (bfd *abfd) { if (abfd->tdata.mmo_data->byte_no != 0) @@ -890,12 +889,12 @@ mmo_flush_chunk (bfd *abfd) /* Same, but from a list. */ -static INLINE bfd_boolean +static INLINE bool mmo_write_chunk_list (bfd *abfd, mmo_data_list_type *datap) { for (; datap != NULL; datap = datap->next) if (! mmo_write_chunk (abfd, datap->data, datap->size)) - return FALSE; + return false; return mmo_flush_chunk (abfd); } @@ -904,7 +903,7 @@ mmo_write_chunk_list (bfd *abfd, mmo_data_list_type *datap) mmo_flush_chunk after calling this function. The location is only output if different than *LAST_VMAP, which is updated after this call. */ -static bfd_boolean +static bool mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc, unsigned int len, bfd_vma *last_vmap) { @@ -953,7 +952,7 @@ mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc, " address %#" PRIx64 ""), abfd, (uint64_t) vma); bfd_set_error (bfd_error_bad_value); - return FALSE; + return false; } /* We always write the location as 64 bits; no use saving bytes @@ -971,7 +970,7 @@ mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc, /* Same, but from a list. */ -static INLINE bfd_boolean +static INLINE bool mmo_write_loc_chunk_list (bfd *abfd, mmo_data_list_type *datap) { /* Get an address different than the address of the first chunk. */ @@ -980,7 +979,7 @@ mmo_write_loc_chunk_list (bfd *abfd, mmo_data_list_type *datap) for (; datap != NULL; datap = datap->next) if (! mmo_write_loc_chunk (abfd, datap->where, datap->data, datap->size, &last_vma)) - return FALSE; + return false; return mmo_flush_chunk (abfd); } @@ -1177,7 +1176,7 @@ mmo_get_byte (bfd *abfd) if (! abfd->tdata.mmo_data->have_error && bfd_bread (abfd->tdata.mmo_data->buf, 4, abfd) != 4) { - abfd->tdata.mmo_data->have_error = TRUE; + abfd->tdata.mmo_data->have_error = true; /* A value somewhat safe against tripping on some inconsistency when mopping up after this error. */ @@ -1201,13 +1200,13 @@ mmo_write_byte (bfd *abfd, bfd_byte value) { if (! abfd->tdata.mmo_data->have_error && bfd_bwrite (abfd->tdata.mmo_data->buf, 4, abfd) != 4) - abfd->tdata.mmo_data->have_error = TRUE; + abfd->tdata.mmo_data->have_error = true; } } /* Create a symbol. */ -static bfd_boolean +static bool mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum mmo_sym_type sym_type, unsigned int serno) { @@ -1215,11 +1214,11 @@ mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum n = (struct mmo_symbol *) bfd_alloc (abfd, sizeof (struct mmo_symbol)); if (n == NULL) - return FALSE; + return false; n->name = bfd_alloc (abfd, strlen (symname) + 1); if (n->name == NULL) - return FALSE; + return false; strcpy (n->name, symname); @@ -1249,15 +1248,15 @@ mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum " is not `Main'\n"), abfd); bfd_set_error (bfd_error_bad_value); - return FALSE; + return false; } - return TRUE; + return true; } /* Read in symbols. */ -static bfd_boolean +static bool mmo_get_symbols (bfd *abfd) { /* @@ -1363,7 +1362,7 @@ SUBSECTION /* Check first if we have a bad hair day. */ if (abfd->tdata.mmo_data->have_error) - return FALSE; + return false; if (m & MMO3_LEFT) /* Traverse left trie. */ @@ -1396,8 +1395,8 @@ SUBSECTION " 0x%02X 0x%02X after symbol name starting with `%s'\n"), abfd, c, c2, abfd->tdata.mmo_data->lop_stab_symbol); bfd_set_error (bfd_error_bad_value); - abfd->tdata.mmo_data->have_error = TRUE; - return FALSE; + abfd->tdata.mmo_data->have_error = true; + return false; } else c = c2; @@ -1451,7 +1450,7 @@ SUBSECTION abfd->tdata.mmo_data->lop_stab_symbol + 1, addr, sym_type, serno)) - abfd->tdata.mmo_data->have_error = TRUE; + abfd->tdata.mmo_data->have_error = true; } if (m & MMO3_MIDDLE) @@ -1581,12 +1580,12 @@ mmo_map_set_sizes (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, /* Read the mmo file and turn it into sections. */ -static bfd_boolean +static bool mmo_scan (bfd *abfd) { unsigned int i; unsigned int lineno = 1; - bfd_boolean error = FALSE; + bool error = false; bfd_vma vma = 0; asection *sec = NULL; asection *non_spec_sec = NULL; @@ -2061,7 +2060,7 @@ mmo_scan (bfd *abfd) bfd_set_error (bfd_error_bad_value); error_return: - error = TRUE; + error = true; done: /* Mark the .text and .data section with their normal attribute if they contain anything. This is not redundant wrt. mmo_decide_section, @@ -2072,14 +2071,14 @@ mmo_scan (bfd *abfd) && (bfd_section_flags (sec) & SEC_HAS_CONTENTS) && !bfd_set_section_flags (sec, (bfd_section_flags (sec) | SEC_ALLOC | SEC_LOAD | SEC_CODE))) - error = TRUE; + error = true; sec = bfd_get_section_by_name (abfd, MMO_DATA_SECTION_NAME); if (sec != NULL && (bfd_section_flags (sec) & SEC_HAS_CONTENTS) && !bfd_set_section_flags (sec, (bfd_section_flags (sec) | SEC_ALLOC | SEC_LOAD | SEC_DATA))) - error = TRUE; + error = true; /* Free whatever resources we took. */ for (i = 0; i < sizeof (file_names) / sizeof (file_names[0]); i++) @@ -2090,7 +2089,7 @@ mmo_scan (bfd *abfd) /* A hook to set up object file dependent section information. For mmo, we point out the shape of allocated section contents. */ -static bfd_boolean +static bool mmo_new_section_hook (bfd *abfd, asection *newsect) { if (!newsect->used_by_bfd) @@ -2100,7 +2099,7 @@ mmo_new_section_hook (bfd *abfd, asection *newsect) newsect->used_by_bfd = bfd_zalloc (abfd, sizeof (struct mmo_section_data_struct)); if (!newsect->used_by_bfd) - return FALSE; + return false; } /* Always align to at least 32-bit words. */ @@ -2111,7 +2110,7 @@ mmo_new_section_hook (bfd *abfd, asection *newsect) /* We already have section contents loaded for sections that have contents. */ -static bfd_boolean +static bool mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED, asection *sec, void * location, @@ -2134,7 +2133,7 @@ mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED, while (loc == NULL && (chunk_size /= 2) != 0); if (chunk_size == 0) - return FALSE; + return false; memcpy (location, loc, chunk_size); @@ -2142,7 +2141,7 @@ mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED, bytes_to_do -= chunk_size; offset += chunk_size; } - return TRUE; + return true; } /* Return the amount of memory needed to read the symbol table. */ @@ -2322,19 +2321,19 @@ mmo_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, /* Write the (section-neutral) file preamble. */ -static bfd_boolean +static bool mmo_internal_write_header (bfd *abfd) { const char lop_pre_bfd[] = { LOP, LOP_PRE, 1, 1}; if (bfd_bwrite (lop_pre_bfd, 4, abfd) != 4) - return FALSE; + return false; /* Copy creation time of original file. */ if (bfd_bwrite (abfd->tdata.mmo_data->created, 4, abfd) != 4) - return FALSE; + return false; - return TRUE; + return true; } /* Write the LOP_POST record, with global register initializations. @@ -2342,7 +2341,7 @@ mmo_internal_write_header (bfd *abfd) registers at DATA. The Z = 255 field is filled in with the start-address. */ -static bfd_boolean +static bool mmo_internal_write_post (bfd *abfd, int z, asection *sec) { int i; @@ -2354,7 +2353,7 @@ mmo_internal_write_post (bfd *abfd, int z, asection *sec) bfd_byte *data = mmo_get_loc (sec, i * 8, 8); if (bfd_bwrite (data, 8, abfd) != 8) - return FALSE; + return false; } /* For Z == $255, we always emit the start location; supposedly Main, @@ -2425,25 +2424,25 @@ bfd_sec_flags_from_mmo_flags (flagword flags) /* Return TRUE iff the leading or trailing tetrabyte in SEC is defined and is 0. */ -static bfd_boolean +static bool mmo_has_leading_or_trailing_zero_tetra_p (bfd *abfd, asection *sec) { bfd_vma secaddr = bfd_section_vma (sec); if (sec->size < 4) - return FALSE; + return false; if (bfd_get_32 (abfd, mmo_get_loc (sec, secaddr, 4)) == 0 && bfd_get_32 (abfd, mmo_get_loc (sec, secaddr + sec->size - 4, 4)) == 0) - return TRUE; + return true; - return FALSE; + return false; } /* Write a section. */ -static bfd_boolean +static bool mmo_internal_write_section (bfd *abfd, asection *sec) { /* We do it differently depending on what section this is: @@ -2473,7 +2472,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) || mmo_has_leading_or_trailing_zero_tetra_p (abfd, sec))) { if (!mmo_write_section_description (abfd, sec)) - return FALSE; + return false; } /* FIXME: Output source file name and line number. */ @@ -2492,7 +2491,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) || mmo_has_leading_or_trailing_zero_tetra_p (abfd, sec))) { if (!mmo_write_section_description (abfd, sec)) - return FALSE; + return false; } return mmo_write_loc_chunk_list (abfd, mmo_section_data (sec)->head); @@ -2503,7 +2502,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) /* This would normally be an abort call since this can't happen, but we don't do that. */ bfd_set_error (bfd_error_bad_value); - return FALSE; + return false; } else if (startswith (sec->name, MMIX_OTHER_SPEC_SECTION_PREFIX)) { @@ -2519,7 +2518,7 @@ mmo_internal_write_section (bfd *abfd, asection *sec) && sec->size != 0) { if (!mmo_write_section_description (abfd, sec)) - return FALSE; + return false; /* Writing a LOP_LOC ends the LOP_SPEC data, and makes data actually loaded. */ @@ -2532,12 +2531,12 @@ mmo_internal_write_section (bfd *abfd, asection *sec) } /* Some section without contents. */ - return TRUE; + return true; } /* Write the description of a section, extended-mmo-style. */ -static bfd_boolean +static bool mmo_write_section_description (bfd *abfd, asection *sec) { /* Keep the following document-comment formatted the way it is. */ @@ -2645,12 +2644,12 @@ EXAMPLE mmo_sec_flags_from_bfd_flags (bfd_section_flags (sec))); mmo_write_octa (abfd, sec->size); mmo_write_octa (abfd, bfd_section_vma (sec)); - return TRUE; + return true; } /* We save up all data before output. */ -static bfd_boolean +static bool mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec, const void *location, file_ptr offset, bfd_size_type bytes_to_do) @@ -2670,7 +2669,7 @@ mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec, while (loc == NULL && (chunk_size /= 2) != 0); if (chunk_size == 0) - return FALSE; + return false; memcpy (loc, location, chunk_size); @@ -2678,12 +2677,12 @@ mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec, bytes_to_do -= chunk_size; offset += chunk_size; } - return TRUE; + return true; } /* Add a symbol to a trie-tree. */ -static bfd_boolean +static bool mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp, const struct mmo_symbol *symp) { @@ -2735,11 +2734,11 @@ mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp, (_("%pB: invalid symbol table: duplicate symbol `%s'\n"), abfd, trie->sym.name); bfd_set_error (bfd_error_bad_value); - return FALSE; + return false; } memcpy (&trie->sym, symp, sizeof *symp); - return TRUE; + return true; } /* Find out the length of the serialized version of a trie in bytes. */ @@ -2907,7 +2906,7 @@ mmo_internal_3_dump (bfd *abfd, struct mmo_symbol_trie *trie) /* Write symbols in mmo format. Also write the lop_end terminator. */ -static bfd_boolean +static bool mmo_write_symbols_and_terminator (bfd *abfd) { int count = bfd_get_symcount (abfd); @@ -2936,7 +2935,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) symbols. Make sure we have room for it. */ table = bfd_alloc (abfd, (count + 1) * sizeof (asymbol *)); if (table == NULL) - return FALSE; + return false; if (count != 0) memcpy (table, orig_table, count * sizeof (asymbol *)); @@ -2980,7 +2979,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) " than the start address %s\n"), abfd, vmas_main, vmas_start); bfd_set_error (bfd_error_bad_value); - return FALSE; + return false; } break; } @@ -3050,7 +3049,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) sym.serno = serno++; if (! mmo_internal_add_3_sym (abfd, &root, &sym)) - return FALSE; + return false; } } } @@ -3093,7 +3092,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) root.right = NULL; if (! mmo_internal_add_3_sym (abfd, &root, &sym)) - return FALSE; + return false; root.symchar = ':'; root.middle = root.left; @@ -3109,7 +3108,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) /* Put out the lop_stab mark. */ bfd_put_32 (abfd, (LOP << 24) | (LOP_STAB << 16), buf); if (bfd_bwrite (buf, 4, abfd) != 4) - return FALSE; + return false; /* Dump out symbols. */ mmo_internal_3_dump (abfd, &root); @@ -3126,7 +3125,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) abfd, trie_len, (abfd->tdata.mmo_data->byte_no + 3)/4); bfd_set_error (bfd_error_bad_value); - return FALSE; + return false; } /* Dump out remaining bytes in the buffer and handle I/O errors by @@ -3139,7 +3138,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) if (abfd->tdata.mmo_data->have_error || bfd_bwrite (abfd->tdata.mmo_data->buf, 4, abfd) != 4) - return FALSE; + return false; } bfd_put_32 (abfd, (LOP << 24) | (LOP_END << 16) | trie_len, buf); @@ -3178,7 +3177,7 @@ mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p) " contents\n"), abfd, sec); bfd_set_error (bfd_error_bad_value); - infop->retval = FALSE; + infop->retval = false; return; } @@ -3191,23 +3190,23 @@ mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p) /* Do the actual output of a file. Assumes mmo_set_section_contents is already called. */ -static bfd_boolean +static bool mmo_write_object_contents (bfd *abfd) { struct mmo_write_sec_info wsecinfo; /* First, there are a few words of preamble. */ if (! mmo_internal_write_header (abfd)) - return FALSE; + return false; wsecinfo.reg_section = NULL; - wsecinfo.retval = TRUE; + wsecinfo.retval = true; bfd_map_over_sections (abfd, mmo_write_section_unless_reg_contents, &wsecinfo); if (! wsecinfo.retval) - return FALSE; + return false; if (wsecinfo.reg_section != NULL) { @@ -3241,15 +3240,15 @@ mmo_write_object_contents (bfd *abfd) " length %" PRId64 ": %#" PRIx64), abfd, (int64_t) sec->size, (uint64_t) sec->vma); - return FALSE; + return false; } if (! mmo_internal_write_post (abfd, z, sec)) - return FALSE; + return false; } else if (! mmo_internal_write_post (abfd, 255, NULL)) - return FALSE; + return false; return mmo_write_symbols_and_terminator (abfd); } |