mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
fd3619828e
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_<field> macros, replacing their use with bfd_section_<field>, 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.
213 lines
5.7 KiB
C
213 lines
5.7 KiB
C
/* Utility to load a file into the simulator.
|
|
Copyright (C) 1997-2019 Free Software Foundation, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* This is a standalone loader, independent of the sim-basic.h machinery,
|
|
as it is used by simulators that don't use it [though that doesn't mean
|
|
to suggest that they shouldn't :-)]. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
#include "ansidecl.h"
|
|
#include <stdio.h> /* for NULL */
|
|
#include <stdarg.h>
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
#include <time.h>
|
|
|
|
#include "sim-basics.h"
|
|
#include "bfd.h"
|
|
#include "sim-utils.h"
|
|
|
|
#include "gdb/callback.h"
|
|
#include "gdb/remote-sim.h"
|
|
|
|
static void eprintf (host_callback *, const char *, ...);
|
|
static void xprintf (host_callback *, const char *, ...);
|
|
static void report_transfer_performance
|
|
(host_callback *, unsigned long, time_t, time_t);
|
|
static void xprintf_bfd_vma (host_callback *, bfd_vma);
|
|
|
|
/* Load program PROG into the simulator using the function DO_LOAD.
|
|
If PROG_BFD is non-NULL, the file has already been opened.
|
|
If VERBOSE_P is non-zero statistics are printed of each loaded section
|
|
and the transfer rate (for consistency with gdb).
|
|
If LMA_P is non-zero the program sections are loaded at the LMA
|
|
rather than the VMA
|
|
If this fails an error message is printed and NULL is returned.
|
|
If it succeeds the bfd is returned.
|
|
NOTE: For historical reasons, older hardware simulators incorrectly
|
|
write the program sections at LMA interpreted as a virtual address.
|
|
This is still accommodated for backward compatibility reasons. */
|
|
|
|
|
|
bfd *
|
|
sim_load_file (SIM_DESC sd, const char *myname, host_callback *callback,
|
|
const char *prog, bfd *prog_bfd, int verbose_p, int lma_p,
|
|
sim_write_fn do_write)
|
|
{
|
|
asection *s;
|
|
/* Record separately as we don't want to close PROG_BFD if it was passed. */
|
|
bfd *result_bfd;
|
|
time_t start_time = 0; /* Start and end times of download */
|
|
time_t end_time = 0;
|
|
unsigned long data_count = 0; /* Number of bytes transferred to memory */
|
|
int found_loadable_section;
|
|
|
|
if (prog_bfd != NULL)
|
|
result_bfd = prog_bfd;
|
|
else
|
|
{
|
|
result_bfd = bfd_openr (prog, 0);
|
|
if (result_bfd == NULL)
|
|
{
|
|
eprintf (callback, "%s: can't open \"%s\": %s\n",
|
|
myname, prog, bfd_errmsg (bfd_get_error ()));
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
if (!bfd_check_format (result_bfd, bfd_object))
|
|
{
|
|
eprintf (callback, "%s: \"%s\" is not an object file: %s\n",
|
|
myname, prog, bfd_errmsg (bfd_get_error ()));
|
|
/* Only close if we opened it. */
|
|
if (prog_bfd == NULL)
|
|
bfd_close (result_bfd);
|
|
return NULL;
|
|
}
|
|
|
|
if (verbose_p)
|
|
start_time = time (NULL);
|
|
|
|
found_loadable_section = 0;
|
|
for (s = result_bfd->sections; s; s = s->next)
|
|
{
|
|
if (s->flags & SEC_LOAD)
|
|
{
|
|
bfd_size_type size;
|
|
|
|
size = bfd_section_size (s);
|
|
if (size > 0)
|
|
{
|
|
unsigned char *buffer;
|
|
bfd_vma lma;
|
|
|
|
buffer = malloc (size);
|
|
if (buffer == NULL)
|
|
{
|
|
eprintf (callback,
|
|
"%s: insufficient memory to load \"%s\"\n",
|
|
myname, prog);
|
|
/* Only close if we opened it. */
|
|
if (prog_bfd == NULL)
|
|
bfd_close (result_bfd);
|
|
return NULL;
|
|
}
|
|
if (lma_p)
|
|
lma = bfd_section_lma (s);
|
|
else
|
|
lma = bfd_section_vma (s);
|
|
if (verbose_p)
|
|
{
|
|
xprintf (callback, "Loading section %s, size 0x%lx %s ",
|
|
bfd_section_name (s),
|
|
(unsigned long) size,
|
|
(lma_p ? "lma" : "vma"));
|
|
xprintf_bfd_vma (callback, lma);
|
|
xprintf (callback, "\n");
|
|
}
|
|
data_count += size;
|
|
bfd_get_section_contents (result_bfd, s, buffer, 0, size);
|
|
do_write (sd, lma, buffer, size);
|
|
found_loadable_section = 1;
|
|
free (buffer);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!found_loadable_section)
|
|
{
|
|
eprintf (callback,
|
|
"%s: no loadable sections \"%s\"\n",
|
|
myname, prog);
|
|
return NULL;
|
|
}
|
|
|
|
if (verbose_p)
|
|
{
|
|
end_time = time (NULL);
|
|
xprintf (callback, "Start address ");
|
|
xprintf_bfd_vma (callback, bfd_get_start_address (result_bfd));
|
|
xprintf (callback, "\n");
|
|
report_transfer_performance (callback, data_count, start_time, end_time);
|
|
}
|
|
|
|
bfd_cache_close (result_bfd);
|
|
|
|
return result_bfd;
|
|
}
|
|
|
|
static void
|
|
xprintf (host_callback *callback, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
va_start (ap, fmt);
|
|
|
|
(*callback->vprintf_filtered) (callback, fmt, ap);
|
|
|
|
va_end (ap);
|
|
}
|
|
|
|
static void
|
|
eprintf (host_callback *callback, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
va_start (ap, fmt);
|
|
|
|
(*callback->evprintf_filtered) (callback, fmt, ap);
|
|
|
|
va_end (ap);
|
|
}
|
|
|
|
/* Report how fast the transfer went. */
|
|
|
|
static void
|
|
report_transfer_performance (host_callback *callback, unsigned long data_count,
|
|
time_t start_time, time_t end_time)
|
|
{
|
|
xprintf (callback, "Transfer rate: ");
|
|
if (end_time != start_time)
|
|
xprintf (callback, "%ld bits/sec",
|
|
(data_count * 8) / (end_time - start_time));
|
|
else
|
|
xprintf (callback, "%ld bits in <1 sec", (data_count * 8));
|
|
xprintf (callback, ".\n");
|
|
}
|
|
|
|
/* Print a bfd_vma.
|
|
This is intended to handle the vagaries of 32 vs 64 bits, etc. */
|
|
|
|
static void
|
|
xprintf_bfd_vma (host_callback *callback, bfd_vma vma)
|
|
{
|
|
/* FIXME: for now */
|
|
xprintf (callback, "0x%lx", (unsigned long) vma);
|
|
}
|