From fd3619828e94a24a92cddec42cbc0ab33352eeb4 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 16 Sep 2019 20:25:17 +0930 Subject: bfd_section_* macros This large patch removes the unnecessary bfd parameter from various bfd section macros and functions. The bfd is hardly ever used and if needed for the bfd_set_section_* or bfd_rename_section functions can be found via section->owner except for the com, und, abs, and ind std_section special sections. Those sections shouldn't be modified anyway. The patch also removes various bfd_get_section_ macros, replacing their use with bfd_section_, and adds bfd_set_section_lma. I've also fixed a minor bug in gas where compressed section renaming was done directly rather than calling bfd_rename_section. This would have broken bfd_get_section_by_name and similar functions, but that hardly mattered at such a late stage in gas processing. bfd/ * bfd-in.h (bfd_get_section_name, bfd_get_section_vma), (bfd_get_section_lma, bfd_get_section_alignment), (bfd_get_section_size, bfd_get_section_flags), (bfd_get_section_userdata): Delete. (bfd_section_name, bfd_section_size, bfd_section_vma), (bfd_section_lma, bfd_section_alignment): Lose bfd parameter. (bfd_section_flags, bfd_section_userdata): New. (bfd_is_com_section): Rename parameter. * section.c (bfd_set_section_userdata, bfd_set_section_vma), (bfd_set_section_alignment, bfd_set_section_flags, bfd_rename_section), (bfd_set_section_size): Delete bfd parameter, rename section parameter. (bfd_set_section_lma): New. * bfd-in2.h: Regenerate. * mach-o.c (bfd_mach_o_init_section_from_mach_o): Delete bfd param, update callers. * aoutx.h, * bfd.c, * coff-alpha.c, * coff-arm.c, * coff-mips.c, * coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c, * compress.c, * ecoff.c, * elf-eh-frame.c, * elf-hppa.h, * elf-ifunc.c, * elf-m10200.c, * elf-m10300.c, * elf-properties.c, * elf-s390-common.c, * elf-vxworks.c, * elf.c, * elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c, * elf32-csky.c, * elf32-d10v.c, * elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c, * elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c, * elf32-ppc.c, * elf32-pru.c, * elf32-rl78.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-visium.c, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c, * elf64-bpf.c, * elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mmix.c, * elf64-ppc.c, * elf64-s390.c, * elf64-sparc.c, * elf64-x86-64.c, * elflink.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-mips.c, * elfxx-sparc.c, * elfxx-tilegx.c, * elfxx-x86.c, * i386msdos.c, * linker.c, * mach-o.c, * mmo.c, * opncls.c, * pdp11.c, * pei-x86_64.c, * peicode.h, * reloc.c, * section.c, * syms.c, * vms-alpha.c, * xcofflink.c: Update throughout for bfd section macro and function changes. binutils/ * addr2line.c, * bucomm.c, * coffgrok.c, * dlltool.c, * nm.c, * objcopy.c, * objdump.c, * od-elf32_avr.c, * od-macho.c, * od-xcoff.c, * prdbg.c, * rdcoff.c, * rddbg.c, * rescoff.c, * resres.c, * size.c, * srconv.c, * strings.c, * windmc.c: Update throughout for bfd section macro and function changes. gas/ * as.c, * as.h, * dw2gencfi.c, * dwarf2dbg.c, * ecoff.c, * read.c, * stabs.c, * subsegs.c, * subsegs.h, * write.c, * config/obj-coff-seh.c, * config/obj-coff.c, * config/obj-ecoff.c, * config/obj-elf.c, * config/obj-macho.c, * config/obj-som.c, * config/tc-aarch64.c, * config/tc-alpha.c, * config/tc-arc.c, * config/tc-arm.c, * config/tc-avr.c, * config/tc-bfin.c, * config/tc-bpf.c, * config/tc-d10v.c, * config/tc-d30v.c, * config/tc-epiphany.c, * config/tc-fr30.c, * config/tc-frv.c, * config/tc-h8300.c, * config/tc-hppa.c, * config/tc-i386.c, * config/tc-ia64.c, * config/tc-ip2k.c, * config/tc-iq2000.c, * config/tc-lm32.c, * config/tc-m32c.c, * config/tc-m32r.c, * config/tc-m68hc11.c, * config/tc-mep.c, * config/tc-microblaze.c, * config/tc-mips.c, * config/tc-mmix.c, * config/tc-mn10200.c, * config/tc-mn10300.c, * config/tc-msp430.c, * config/tc-mt.c, * config/tc-nds32.c, * config/tc-or1k.c, * config/tc-ppc.c, * config/tc-pru.c, * config/tc-rl78.c, * config/tc-rx.c, * config/tc-s12z.c, * config/tc-s390.c, * config/tc-score.c, * config/tc-score7.c, * config/tc-sh.c, * config/tc-sparc.c, * config/tc-spu.c, * config/tc-tic4x.c, * config/tc-tic54x.c, * config/tc-tic6x.c, * config/tc-tilegx.c, * config/tc-tilepro.c, * config/tc-v850.c, * config/tc-visium.c, * config/tc-wasm32.c, * config/tc-xc16x.c, * config/tc-xgate.c, * config/tc-xstormy16.c, * config/tc-xtensa.c, * config/tc-z8k.c: Update throughout for bfd section macro and function changes. * write.c (compress_debug): Use bfd_rename_section. gdb/ * aarch64-linux-tdep.c, * arm-tdep.c, * auto-load.c, * coff-pe-read.c, * coffread.c, * corelow.c, * dbxread.c, * dicos-tdep.c, * dwarf2-frame.c, * dwarf2read.c, * elfread.c, * exec.c, * fbsd-tdep.c, * gcore.c, * gdb_bfd.c, * gdb_bfd.h, * hppa-tdep.c, * i386-cygwin-tdep.c, * i386-fbsd-tdep.c, * i386-linux-tdep.c, * jit.c, * linux-tdep.c, * machoread.c, * maint.c, * mdebugread.c, * minidebug.c, * mips-linux-tdep.c, * mips-sde-tdep.c, * mips-tdep.c, * mipsread.c, * nto-tdep.c, * objfiles.c, * objfiles.h, * osabi.c, * ppc-linux-tdep.c, * ppc64-tdep.c, * record-btrace.c, * record-full.c, * remote.c, * rs6000-aix-tdep.c, * rs6000-tdep.c, * s390-linux-tdep.c, * s390-tdep.c, * solib-aix.c, * solib-dsbt.c, * solib-frv.c, * solib-spu.c, * solib-svr4.c, * solib-target.c, * spu-linux-nat.c, * spu-tdep.c, * symfile-mem.c, * symfile.c, * symmisc.c, * symtab.c, * target.c, * windows-nat.c, * xcoffread.c, * cli/cli-dump.c, * compile/compile-object-load.c, * mi/mi-interp.c: Update throughout for bfd section macro and function changes. * gcore (gcore_create_callback): Use bfd_set_section_lma. * spu-tdep.c (spu_overlay_new_objfile): Likewise. gprof/ * corefile.c, * symtab.c: Update throughout for bfd section macro and function changes. ld/ * ldcref.c, * ldctor.c, * ldelf.c, * ldlang.c, * pe-dll.c, * emultempl/aarch64elf.em, * emultempl/aix.em, * emultempl/armcoff.em, * emultempl/armelf.em, * emultempl/cr16elf.em, * emultempl/cskyelf.em, * emultempl/m68hc1xelf.em, * emultempl/m68kelf.em, * emultempl/mipself.em, * emultempl/mmix-elfnmmo.em, * emultempl/mmo.em, * emultempl/msp430.em, * emultempl/nios2elf.em, * emultempl/pe.em, * emultempl/pep.em, * emultempl/ppc64elf.em, * emultempl/xtensaelf.em: Update throughout for bfd section macro and function changes. libctf/ * ctf-open-bfd.c: Update throughout for bfd section macro changes. opcodes/ * arc-ext.c: Update throughout for bfd section macro changes. sim/ * common/sim-load.c, * common/sim-utils.c, * cris/sim-if.c, * erc32/func.c, * lm32/sim-if.c, * m32c/load.c, * m32c/trace.c, * m68hc11/interp.c, * ppc/hw_htab.c, * ppc/hw_init.c, * rl78/load.c, * rl78/trace.c, * rx/gdb-if.c, * rx/load.c, * rx/trace.c: Update throughout for bfd section macro changes. --- sim/ChangeLog | 8 ++++++++ sim/common/sim-load.c | 8 ++++---- sim/common/sim-utils.c | 6 +++--- sim/cris/sim-if.c | 18 +++++++++--------- sim/erc32/func.c | 10 +++++----- sim/lm32/sim-if.c | 15 ++++++--------- sim/m32c/load.c | 12 ++++++------ sim/m32c/trace.c | 2 +- sim/m68hc11/interp.c | 6 +++--- sim/ppc/hw_htab.c | 44 ++++++++++++++++++++++---------------------- sim/ppc/hw_init.c | 28 ++++++++++++++-------------- sim/rl78/load.c | 2 +- sim/rl78/trace.c | 2 +- sim/rx/gdb-if.c | 4 ++-- sim/rx/load.c | 2 +- sim/rx/trace.c | 2 +- 16 files changed, 87 insertions(+), 82 deletions(-) (limited to 'sim') diff --git a/sim/ChangeLog b/sim/ChangeLog index d16f2cf..191e237 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,11 @@ +2019-09-18 Alan Modra + + * common/sim-load.c, * common/sim-utils.c, * cris/sim-if.c, + * erc32/func.c, * lm32/sim-if.c, * m32c/load.c, * m32c/trace.c, + * m68hc11/interp.c, * ppc/hw_htab.c, * ppc/hw_init.c, + * rl78/load.c, * rl78/trace.c, * rx/gdb-if.c, * rx/load.c, + * rx/trace.c: Update throughout for bfd section macro changes. + 2019-06-13 Stafford Horne * or1k/cpu.c: Regenerate. diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c index c198027..ff06497 100644 --- a/sim/common/sim-load.c +++ b/sim/common/sim-load.c @@ -101,7 +101,7 @@ sim_load_file (SIM_DESC sd, const char *myname, host_callback *callback, { bfd_size_type size; - size = bfd_get_section_size (s); + size = bfd_section_size (s); if (size > 0) { unsigned char *buffer; @@ -119,13 +119,13 @@ sim_load_file (SIM_DESC sd, const char *myname, host_callback *callback, return NULL; } if (lma_p) - lma = bfd_section_lma (result_bfd, s); + lma = bfd_section_lma (s); else - lma = bfd_section_vma (result_bfd, s); + lma = bfd_section_vma (s); if (verbose_p) { xprintf (callback, "Loading section %s, size 0x%lx %s ", - bfd_get_section_name (result_bfd, s), + bfd_section_name (s), (unsigned long) size, (lma_p ? "lma" : "vma")); xprintf_bfd_vma (callback, lma); diff --git a/sim/common/sim-utils.c b/sim/common/sim-utils.c index c94b2f7..e83a2e4 100644 --- a/sim/common/sim-utils.c +++ b/sim/common/sim-utils.c @@ -263,11 +263,11 @@ sim_analyze_program (SIM_DESC sd, const char *prog_name, bfd *prog_bfd) STATE_START_ADDR (sd) = bfd_get_start_address (prog_bfd); for (s = prog_bfd->sections; s; s = s->next) - if (strcmp (bfd_get_section_name (prog_bfd, s), ".text") == 0) + if (strcmp (bfd_section_name (s), ".text") == 0) { STATE_TEXT_SECTION (sd) = s; - STATE_TEXT_START (sd) = bfd_get_section_vma (prog_bfd, s); - STATE_TEXT_END (sd) = STATE_TEXT_START (sd) + bfd_section_size (prog_bfd, s); + STATE_TEXT_START (sd) = bfd_section_vma (s); + STATE_TEXT_END (sd) = STATE_TEXT_START (sd) + bfd_section_size (s); break; } diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c index 1a5d421..ebfb0e5 100644 --- a/sim/cris/sim-if.c +++ b/sim/cris/sim-if.c @@ -315,17 +315,17 @@ cris_set_section_offset_iterator (bfd *abfd, asection *s, void *vp) SIM_DESC sd = p->sd; int offset = p->offset; - if ((bfd_get_section_flags (abfd, s) & SEC_ALLOC)) + if ((bfd_section_flags (s) & SEC_ALLOC)) { - bfd_vma vma = bfd_get_section_vma (abfd, s); + bfd_vma vma = bfd_section_vma (s); - bfd_set_section_vma (abfd, s, vma + offset); + bfd_set_section_vma (s, vma + offset); } /* This seems clumsy and inaccurate, but let's stick to doing it the same way as sim_analyze_program for consistency. */ - if (strcmp (bfd_get_section_name (abfd, s), ".text") == 0) - STATE_TEXT_START (sd) = bfd_get_section_vma (abfd, s); + if (strcmp (bfd_section_name (s), ".text") == 0) + STATE_TEXT_START (sd) = bfd_section_vma (s); } /* Adjust the start-address, LMA and VMA of a SD. Must be called @@ -360,10 +360,10 @@ get_progbounds_iterator (bfd *abfd ATTRIBUTE_UNUSED, asection *s, void *vp) { struct progbounds *pbp = (struct progbounds *) vp; - if ((bfd_get_section_flags (abfd, s) & SEC_ALLOC)) + if ((bfd_section_flags (s) & SEC_ALLOC)) { - bfd_size_type sec_size = bfd_get_section_size (s); - bfd_size_type sec_start = bfd_get_section_vma (abfd, s); + bfd_size_type sec_size = bfd_section_size (s); + bfd_size_type sec_start = bfd_section_vma (s); bfd_size_type sec_end = sec_start + sec_size; if (sec_end > pbp->endmem) @@ -372,7 +372,7 @@ get_progbounds_iterator (bfd *abfd ATTRIBUTE_UNUSED, asection *s, void *vp) if (sec_start < pbp->startmem) pbp->startmem = sec_start; - if ((bfd_get_section_flags (abfd, s) & SEC_LOAD)) + if ((bfd_section_flags (s) & SEC_LOAD)) { if (sec_end > pbp->end_loadmem) pbp->end_loadmem = sec_end; diff --git a/sim/erc32/func.c b/sim/erc32/func.c index d6a51b1..a0c85a0 100644 --- a/sim/erc32/func.c +++ b/sim/erc32/func.c @@ -1051,14 +1051,14 @@ bfd_load (const char *fname) if (sis_verbose) printf("loading %s:", fname); for (section = pbfd->sections; section; section = section->next) { - if (bfd_get_section_flags(pbfd, section) & SEC_ALLOC) { + if (bfd_section_flags (section) & SEC_ALLOC) { bfd_vma section_address; unsigned long section_size; const char *section_name; - section_name = bfd_get_section_name(pbfd, section); + section_name = bfd_section_name (section); - section_address = bfd_get_section_vma(pbfd, section); + section_address = bfd_section_vma (section); /* * Adjust sections from a.out files, since they don't carry their * addresses with. @@ -1084,14 +1084,14 @@ bfd_load (const char *fname) } } - section_size = bfd_section_size(pbfd, section); + section_size = bfd_section_size (section); if (sis_verbose) printf("\nsection %s at 0x%08lx (0x%lx bytes)", section_name, section_address, section_size); /* Text, data or lit */ - if (bfd_get_section_flags(pbfd, section) & SEC_LOAD) { + if (bfd_section_flags (section) & SEC_LOAD) { file_ptr fptr; fptr = 0; diff --git a/sim/lm32/sim-if.c b/sim/lm32/sim-if.c index 2698b2e..71312d3 100644 --- a/sim/lm32/sim-if.c +++ b/sim/lm32/sim-if.c @@ -50,21 +50,18 @@ find_base (bfd *prog_bfd) found = 0; for (s = prog_bfd->sections; s; s = s->next) { - if ((strcmp (bfd_get_section_name (prog_bfd, s), ".boot") == 0) - || (strcmp (bfd_get_section_name (prog_bfd, s), ".text") == 0) - || (strcmp (bfd_get_section_name (prog_bfd, s), ".data") == 0) - || (strcmp (bfd_get_section_name (prog_bfd, s), ".bss") == 0)) + if ((strcmp (bfd_section_name (s), ".boot") == 0) + || (strcmp (bfd_section_name (s), ".text") == 0) + || (strcmp (bfd_section_name (s), ".data") == 0) + || (strcmp (bfd_section_name (s), ".bss") == 0)) { if (!found) { - base = bfd_get_section_vma (prog_bfd, s); + base = bfd_section_vma (s); found = 1; } else - base = - bfd_get_section_vma (prog_bfd, - s) < base ? bfd_get_section_vma (prog_bfd, - s) : base; + base = bfd_section_vma (s) < base ? bfd_section_vma (s) : base; } } return base & ~(0xffffUL); diff --git a/sim/m32c/load.c b/sim/m32c/load.c index 3937fea..c6a3b2d 100644 --- a/sim/m32c/load.c +++ b/sim/m32c/load.c @@ -74,11 +74,11 @@ m32c_load (bfd * prog) remains as a reminder. */ if ((s->flags & SEC_ALLOC) && !(s->flags & SEC_READONLY)) { - if (strcmp (bfd_get_section_name (prog, s), ".stack")) + if (strcmp (bfd_section_name (s), ".stack")) { int secend = - bfd_get_section_size (s) + bfd_section_lma (prog, s); - if (heaptop < secend && bfd_section_lma (prog, s) < 0x10000) + bfd_section_size (s) + bfd_section_lma (s); + if (heaptop < secend && bfd_section_lma (s) < 0x10000) { heaptop = heapbottom = secend; } @@ -91,14 +91,14 @@ m32c_load (bfd * prog) bfd_size_type size; bfd_vma base; - size = bfd_get_section_size (s); + size = bfd_section_size (s); if (size <= 0) continue; - base = bfd_section_lma (prog, s); + base = bfd_section_lma (s); if (verbose) fprintf (stderr, "[load a=%08x s=%08x %s]\n", - (int) base, (int) size, bfd_get_section_name (prog, s)); + (int) base, (int) size, bfd_section_name (s)); buf = (char *) malloc (size); bfd_get_section_contents (prog, s, buf, 0, size); mem_put_blk (base, buf, size); diff --git a/sim/m32c/trace.c b/sim/m32c/trace.c index e507c97..bc75d15 100644 --- a/sim/m32c/trace.c +++ b/sim/m32c/trace.c @@ -231,7 +231,7 @@ sim_disasm_one (void) if (s->flags & SEC_CODE || code_section == 0) { code_section = s; - code_base = bfd_section_lma (current_bfd, s); + code_base = bfd_section_lma (s); break; } } diff --git a/sim/m68hc11/interp.c b/sim/m68hc11/interp.c index 9e8ccab..a5131d2 100644 --- a/sim/m68hc11/interp.c +++ b/sim/m68hc11/interp.c @@ -344,15 +344,15 @@ sim_prepare_for_program (SIM_DESC sd, bfd* abfd) { bfd_size_type size; - size = bfd_get_section_size (s); + size = bfd_section_size (s); if (size > 0) { bfd_vma lma; if (STATE_LOAD_AT_LMA_P (sd)) - lma = bfd_section_lma (abfd, s); + lma = bfd_section_lma (s); else - lma = bfd_section_vma (abfd, s); + lma = bfd_section_vma (s); if (lma <= 0xFFFE && lma+size >= 0x10000) cpu->cpu_use_elf_start = 0; diff --git a/sim/ppc/hw_htab.c b/sim/ppc/hw_htab.c index cf275ff..e7b6371 100644 --- a/sim/ppc/hw_htab.c +++ b/sim/ppc/hw_htab.c @@ -391,16 +391,16 @@ htab_sum_binary(bfd *abfd, PTR data) { htab_binary_sizes *sizes = (htab_binary_sizes*)data; - unsigned_word size = bfd_get_section_size (sec); - unsigned_word vma = bfd_get_section_vma (abfd, sec); - unsigned_word ra = bfd_get_section_lma (abfd, sec); + unsigned_word size = bfd_section_size (sec); + unsigned_word vma = bfd_section_vma (sec); + unsigned_word ra = bfd_section_lma (sec); /* skip the section if no memory to allocate */ - if (! (bfd_get_section_flags(abfd, sec) & SEC_ALLOC)) + if (! (bfd_section_flags (sec) & SEC_ALLOC)) return; - if ((bfd_get_section_flags (abfd, sec) & SEC_CODE) - || (bfd_get_section_flags (abfd, sec) & SEC_READONLY)) { + if ((bfd_section_flags (sec) & SEC_CODE) + || (bfd_section_flags (sec) & SEC_READONLY)) { if (sizes->text_bound < vma + size) sizes->text_bound = ALIGN_PAGE(vma + size); if (sizes->text_base > vma) @@ -408,8 +408,8 @@ htab_sum_binary(bfd *abfd, if (sizes->text_ra > ra) sizes->text_ra = FLOOR_PAGE(ra); } - else if ((bfd_get_section_flags (abfd, sec) & SEC_DATA) - || (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)) { + else if ((bfd_section_flags (sec) & SEC_DATA) + || (bfd_section_flags (sec) & SEC_ALLOC)) { if (sizes->data_bound < vma + size) sizes->data_bound = ALIGN_PAGE(vma + size); if (sizes->data_base > vma) @@ -432,41 +432,41 @@ htab_dma_binary(bfd *abfd, device *me = sizes->me; /* skip the section if no memory to allocate */ - if (! (bfd_get_section_flags(abfd, sec) & SEC_ALLOC)) + if (! (bfd_section_flags (sec) & SEC_ALLOC)) return; /* check/ignore any sections of size zero */ - section_size = bfd_get_section_size (sec); + section_size = bfd_section_size (sec); if (section_size == 0) return; /* if nothing to load, ignore this one */ - if (! (bfd_get_section_flags(abfd, sec) & SEC_LOAD)) + if (! (bfd_section_flags (sec) & SEC_LOAD)) return; /* find where it is to go */ - section_vma = bfd_get_section_vma(abfd, sec); + section_vma = bfd_section_vma (sec); section_ra = 0; - if ((bfd_get_section_flags (abfd, sec) & SEC_CODE) - || (bfd_get_section_flags (abfd, sec) & SEC_READONLY)) + if ((bfd_section_flags (sec) & SEC_CODE) + || (bfd_section_flags (sec) & SEC_READONLY)) section_ra = (section_vma - sizes->text_base + sizes->text_ra); - else if ((bfd_get_section_flags (abfd, sec) & SEC_DATA)) + else if ((bfd_section_flags (sec) & SEC_DATA)) section_ra = (section_vma - sizes->data_base + sizes->data_ra); else return; /* just ignore it */ DTRACE(htab, ("load - name=%-7s vma=0x%.8lx size=%6ld ra=0x%.8lx flags=%3lx(%s%s%s%s%s )\n", - bfd_get_section_name(abfd, sec), + bfd_section_name (sec), (long)section_vma, (long)section_size, (long)section_ra, - (long)bfd_get_section_flags(abfd, sec), - bfd_get_section_flags(abfd, sec) & SEC_LOAD ? " LOAD" : "", - bfd_get_section_flags(abfd, sec) & SEC_CODE ? " CODE" : "", - bfd_get_section_flags(abfd, sec) & SEC_DATA ? " DATA" : "", - bfd_get_section_flags(abfd, sec) & SEC_ALLOC ? " ALLOC" : "", - bfd_get_section_flags(abfd, sec) & SEC_READONLY ? " READONLY" : "" + (long)bfd_section_flags (sec), + bfd_section_flags (sec) & SEC_LOAD ? " LOAD" : "", + bfd_section_flags (sec) & SEC_CODE ? " CODE" : "", + bfd_section_flags (sec) & SEC_DATA ? " DATA" : "", + bfd_section_flags (sec) & SEC_ALLOC ? " ALLOC" : "", + bfd_section_flags (sec) & SEC_READONLY ? " READONLY" : "" )); /* dma in the sections data */ diff --git a/sim/ppc/hw_init.c b/sim/ppc/hw_init.c index 0e7403b..779c95c 100644 --- a/sim/ppc/hw_init.c +++ b/sim/ppc/hw_init.c @@ -324,39 +324,39 @@ update_for_binary_section(bfd *abfd, device *me = (device*)obj; /* skip the section if no memory to allocate */ - if (! (bfd_get_section_flags(abfd, the_section) & SEC_ALLOC)) + if (! (bfd_section_flags (the_section) & SEC_ALLOC)) return; /* check/ignore any sections of size zero */ - section_size = bfd_get_section_size (the_section); + section_size = bfd_section_size (the_section); if (section_size == 0) return; /* find where it is to go */ - section_vma = bfd_get_section_vma(abfd, the_section); + section_vma = bfd_section_vma (the_section); DTRACE(binary, ("name=%-7s, vma=0x%.8lx, size=%6ld, flags=%3lx(%s%s%s%s%s )\n", - bfd_get_section_name(abfd, the_section), + bfd_section_name (the_section), (long)section_vma, (long)section_size, - (long)bfd_get_section_flags(abfd, the_section), - bfd_get_section_flags(abfd, the_section) & SEC_LOAD ? " LOAD" : "", - bfd_get_section_flags(abfd, the_section) & SEC_CODE ? " CODE" : "", - bfd_get_section_flags(abfd, the_section) & SEC_DATA ? " DATA" : "", - bfd_get_section_flags(abfd, the_section) & SEC_ALLOC ? " ALLOC" : "", - bfd_get_section_flags(abfd, the_section) & SEC_READONLY ? " READONLY" : "" + (long)bfd_section_flags (the_section), + bfd_section_flags (the_section) & SEC_LOAD ? " LOAD" : "", + bfd_section_flags (the_section) & SEC_CODE ? " CODE" : "", + bfd_section_flags (the_section) & SEC_DATA ? " DATA" : "", + bfd_section_flags (the_section) & SEC_ALLOC ? " ALLOC" : "", + bfd_section_flags (the_section) & SEC_READONLY ? " READONLY" : "" )); /* If there is an .interp section, it means it needs a shared library interpreter. */ - if (strcmp(".interp", bfd_get_section_name(abfd, the_section)) == 0) + if (strcmp(".interp", bfd_section_name (the_section)) == 0) error("Shared libraries are not yet supported.\n"); /* determine the devices access */ access = access_read; - if (bfd_get_section_flags(abfd, the_section) & SEC_CODE) + if (bfd_section_flags (the_section) & SEC_CODE) access |= access_exec; - if (!(bfd_get_section_flags(abfd, the_section) & SEC_READONLY)) + if (!(bfd_section_flags (the_section) & SEC_READONLY)) access |= access_write; /* if claim specified, allocate region from the memory device */ @@ -386,7 +386,7 @@ update_for_binary_section(bfd *abfd, me); /* if a load dma in the required data */ - if (bfd_get_section_flags(abfd, the_section) & SEC_LOAD) { + if (bfd_section_flags (the_section) & SEC_LOAD) { void *section_init = zalloc(section_size); if (!bfd_get_section_contents(abfd, the_section, diff --git a/sim/rl78/load.c b/sim/rl78/load.c index c8c8ab8..34ae923 100644 --- a/sim/rl78/load.c +++ b/sim/rl78/load.c @@ -56,7 +56,7 @@ find_section_name_by_offset (bfd *abfd, file_ptr filepos) for (s = abfd->sections; s; s = s->next) if (s->filepos == filepos) - return bfd_get_section_name (abfd, s); + return bfd_section_name (s); return "(unknown)"; } diff --git a/sim/rl78/trace.c b/sim/rl78/trace.c index fd999a1..1a97527 100644 --- a/sim/rl78/trace.c +++ b/sim/rl78/trace.c @@ -224,7 +224,7 @@ sim_get_current_source_location (const char ** pfilename, if (s->flags & SEC_CODE || code_section == 0) { code_section = s; - code_base = bfd_section_lma (current_bfd, s); + code_base = bfd_section_lma (s); break; } } diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c index ef88146..68e4b96 100644 --- a/sim/rx/gdb-if.c +++ b/sim/rx/gdb-if.c @@ -164,14 +164,14 @@ build_swap_list (struct bfd *abfd) struct swap_list *sl; bfd_size_type size; - size = bfd_get_section_size (s); + size = bfd_section_size (s); if (size <= 0) continue; sl = malloc (sizeof (struct swap_list)); assert (sl != NULL); sl->next = swap_list; - sl->start = bfd_section_lma (abfd, s); + sl->start = bfd_section_lma (s); sl->end = sl->start + size; swap_list = sl; } diff --git a/sim/rx/load.c b/sim/rx/load.c index 65451ca..a9b596b 100644 --- a/sim/rx/load.c +++ b/sim/rx/load.c @@ -52,7 +52,7 @@ find_section_name_by_offset (bfd *abfd, file_ptr filepos) for (s = abfd->sections; s; s = s->next) if (s->filepos == filepos) - return bfd_get_section_name (abfd, s); + return bfd_section_name (s); return "(unknown)"; } diff --git a/sim/rx/trace.c b/sim/rx/trace.c index ed65d19..a4ea680 100644 --- a/sim/rx/trace.c +++ b/sim/rx/trace.c @@ -228,7 +228,7 @@ sim_get_current_source_location (const char ** pfilename, if (s->flags & SEC_CODE || code_section == 0) { code_section = s; - code_base = bfd_section_lma (current_bfd, s); + code_base = bfd_section_lma (s); break; } } -- cgit v1.1