aboutsummaryrefslogtreecommitdiff
path: root/bfd/ihex.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2021-03-31 10:30:54 +1030
committerAlan Modra <amodra@gmail.com>2021-03-31 10:49:23 +1030
commit0a1b45a20eaa98d4d9026dc1fd17e79e741183af (patch)
tree059b2b296b4d60784a82cd6a52dae47dcac4d66a /bfd/ihex.c
parentfaa7a26040c617a6d29f601998b99a1da882c672 (diff)
downloadfsf-binutils-gdb-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.zip
fsf-binutils-gdb-0a1b45a20eaa98d4d9026dc1fd17e79e741183af.tar.gz
fsf-binutils-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/ihex.c')
-rw-r--r--bfd/ihex.c92
1 files changed, 46 insertions, 46 deletions
diff --git a/bfd/ihex.c b/bfd/ihex.c
index 13dd106..93a703a 100644
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -160,44 +160,44 @@ struct ihex_data_struct
static void
ihex_init (void)
{
- static bfd_boolean inited;
+ static bool inited;
if (! inited)
{
- inited = TRUE;
+ inited = true;
hex_init ();
}
}
/* Create an ihex object. */
-static bfd_boolean
+static bool
ihex_mkobject (bfd *abfd)
{
struct ihex_data_struct *tdata;
tdata = (struct ihex_data_struct *) bfd_alloc (abfd, sizeof (* tdata));
if (tdata == NULL)
- return FALSE;
+ return false;
abfd->tdata.ihex_data = tdata;
tdata->head = NULL;
tdata->tail = NULL;
- return TRUE;
+ return true;
}
/* Read a byte from a BFD. Set *ERRORPTR if an error occurred.
Return EOF on error or end of file. */
static INLINE int
-ihex_get_byte (bfd *abfd, bfd_boolean *errorptr)
+ihex_get_byte (bfd *abfd, bool *errorptr)
{
bfd_byte c;
if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1)
{
if (bfd_get_error () != bfd_error_file_truncated)
- *errorptr = TRUE;
+ *errorptr = true;
return EOF;
}
@@ -207,7 +207,7 @@ ihex_get_byte (bfd *abfd, bfd_boolean *errorptr)
/* Report a problem in an Intel Hex file. */
static void
-ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error)
+ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bool error)
{
if (c == EOF)
{
@@ -236,14 +236,14 @@ ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error)
/* Read an Intel hex file and turn it into sections. We create a new
section for each contiguous set of bytes. */
-static bfd_boolean
+static bool
ihex_scan (bfd *abfd)
{
bfd_vma segbase;
bfd_vma extbase;
asection *sec;
unsigned int lineno;
- bfd_boolean error;
+ bool error;
bfd_byte *buf = NULL;
size_t bufsize;
int c;
@@ -257,7 +257,7 @@ ihex_scan (bfd *abfd)
extbase = 0;
sec = NULL;
lineno = 1;
- error = FALSE;
+ error = false;
bufsize = 0;
while ((c = ihex_get_byte (abfd, &error)) != EOF)
@@ -382,7 +382,7 @@ ihex_scan (bfd *abfd)
if (abfd->start_address == 0)
abfd->start_address = addr;
free (buf);
- return TRUE;
+ return true;
case 2:
/* An extended address record. */
@@ -474,11 +474,11 @@ ihex_scan (bfd *abfd)
goto error_return;
free (buf);
- return TRUE;
+ return true;
error_return:
free (buf);
- return FALSE;
+ return false;
}
/* Try to recognize an Intel Hex file. */
@@ -539,21 +539,21 @@ ihex_object_p (bfd *abfd)
/* Read the contents of a section in an Intel Hex file. */
-static bfd_boolean
+static bool
ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
{
int c;
bfd_byte *p;
bfd_byte *buf = NULL;
size_t bufsize;
- bfd_boolean error;
+ bool error;
if (bfd_seek (abfd, section->filepos, SEEK_SET) != 0)
goto error_return;
p = contents;
bufsize = 0;
- error = FALSE;
+ error = false;
while ((c = ihex_get_byte (abfd, &error)) != EOF)
{
unsigned char hdr[8];
@@ -600,7 +600,7 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
{
/* We've read everything in the section. */
free (buf);
- return TRUE;
+ return true;
}
/* Skip the checksum. */
@@ -617,16 +617,16 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
}
free (buf);
- return TRUE;
+ return true;
error_return:
free (buf);
- return FALSE;
+ return false;
}
/* Get the contents of a section in an Intel Hex file. */
-static bfd_boolean
+static bool
ihex_get_section_contents (bfd *abfd,
asection *section,
void * location,
@@ -637,21 +637,21 @@ ihex_get_section_contents (bfd *abfd,
{
section->used_by_bfd = bfd_alloc (abfd, section->size);
if (section->used_by_bfd == NULL)
- return FALSE;
+ return false;
if (! ihex_read_section (abfd, section,
(bfd_byte *) section->used_by_bfd))
- return FALSE;
+ return false;
}
memcpy (location, (bfd_byte *) section->used_by_bfd + offset,
(size_t) count);
- return TRUE;
+ return true;
}
/* Set the contents of a section in an Intel Hex file. */
-static bfd_boolean
+static bool
ihex_set_section_contents (bfd *abfd,
asection *section,
const void * location,
@@ -665,15 +665,15 @@ ihex_set_section_contents (bfd *abfd,
if (count == 0
|| (section->flags & SEC_ALLOC) == 0
|| (section->flags & SEC_LOAD) == 0)
- return TRUE;
+ return true;
n = (struct ihex_data_list *) bfd_alloc (abfd, sizeof (* n));
if (n == NULL)
- return FALSE;
+ return false;
data = (bfd_byte *) bfd_alloc (abfd, count);
if (data == NULL)
- return FALSE;
+ return false;
memcpy (data, location, (size_t) count);
n->data = data;
@@ -704,12 +704,12 @@ ihex_set_section_contents (bfd *abfd,
tdata->tail = n;
}
- return TRUE;
+ return true;
}
/* Write a record out to an Intel Hex file. */
-static bfd_boolean
+static bool
ihex_write_record (bfd *abfd,
size_t count,
unsigned int addr,
@@ -746,14 +746,14 @@ ihex_write_record (bfd *abfd,
total = 9 + count * 2 + 4;
if (bfd_bwrite (buf, (bfd_size_type) total, abfd) != total)
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
/* Write out an Intel Hex file. */
-static bfd_boolean
+static bool
ihex_write_object_contents (bfd *abfd)
{
bfd_vma segbase;
@@ -786,7 +786,7 @@ ihex_write_object_contents (bfd *abfd)
" out of range for Intel Hex file"),
abfd, (uint64_t) where);
bfd_set_error (bfd_error_bad_value);
- return FALSE;
+ return false;
}
where &= 0xffffffff;
#endif
@@ -816,7 +816,7 @@ ihex_write_object_contents (bfd *abfd)
addr[0] = (bfd_byte)(segbase >> 12) & 0xff;
addr[1] = (bfd_byte)(segbase >> 4) & 0xff;
if (! ihex_write_record (abfd, 2, 0, 2, addr))
- return FALSE;
+ return false;
}
else
{
@@ -831,7 +831,7 @@ ihex_write_object_contents (bfd *abfd)
addr[0] = 0;
addr[1] = 0;
if (! ihex_write_record (abfd, 2, 0, 2, addr))
- return FALSE;
+ return false;
segbase = 0;
}
@@ -844,12 +844,12 @@ ihex_write_object_contents (bfd *abfd)
" out of range for Intel Hex file"),
abfd, (uint64_t) where);
bfd_set_error (bfd_error_bad_value);
- return FALSE;
+ return false;
}
addr[0] = (bfd_byte)(extbase >> 24) & 0xff;
addr[1] = (bfd_byte)(extbase >> 16) & 0xff;
if (! ihex_write_record (abfd, 2, 0, 4, addr))
- return FALSE;
+ return false;
}
}
@@ -860,7 +860,7 @@ ihex_write_object_contents (bfd *abfd)
now = 0x10000 - rec_addr;
if (! ihex_write_record (abfd, now, rec_addr, 0, p))
- return FALSE;
+ return false;
where += now;
p += now;
@@ -882,7 +882,7 @@ ihex_write_object_contents (bfd *abfd)
startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
startbuf[3] = (bfd_byte)start & 0xff;
if (! ihex_write_record (abfd, 4, 0, 3, startbuf))
- return FALSE;
+ return false;
}
else
{
@@ -891,20 +891,20 @@ ihex_write_object_contents (bfd *abfd)
startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
startbuf[3] = (bfd_byte)start & 0xff;
if (! ihex_write_record (abfd, 4, 0, 5, startbuf))
- return FALSE;
+ return false;
}
}
if (! ihex_write_record (abfd, 0, 0, 1, NULL))
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
/* Set the architecture for the output file. The architecture is
irrelevant, so we ignore errors about unknown architectures. */
-static bfd_boolean
+static bool
ihex_set_arch_mach (bfd *abfd,
enum bfd_architecture arch,
unsigned long mach)
@@ -912,9 +912,9 @@ ihex_set_arch_mach (bfd *abfd,
if (! bfd_default_set_arch_mach (abfd, arch, mach))
{
if (arch != bfd_arch_unknown)
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
/* Get the size of the headers, for the linker. */