/* Utility to load a file into the simulator.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2001, 2002, 2004, 2007
+ 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 2, or (at your option)
-any later version.
+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
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, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "config.h"
-#ifdef __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
+/* 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 "cconfig.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 "ansidecl.h"
+
+#include "sim-basics.h"
#include "bfd.h"
-#include "callback.h"
-#include "remote-sim.h"
+#include "sim-utils.h"
+
+#include "gdb/callback.h"
+#include "gdb/remote-sim.h"
static void eprintf PARAMS ((host_callback *, const char *, ...));
static void xprintf PARAMS ((host_callback *, const char *, ...));
PARAMS ((host_callback *, unsigned long, time_t, time_t));
static void xprintf_bfd_vma PARAMS ((host_callback *, bfd_vma));
-/* Load program PROG into the simulator.
+/* 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. */
+ 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. */
-/* FIXME: Where can we put a prototype for this? */
bfd *
-sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p)
+sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
SIM_DESC sd;
- char *myname;
+ const char *myname;
host_callback *callback;
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, end_time; /* Start and end times of download */
+ 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;
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_get_section_size_before_reloc (s);
+ size = bfd_get_section_size (s);
if (size > 0)
{
char *buffer;
bfd_close (result_bfd);
return NULL;
}
- /* Before you change this to bfd_section_lma, make sure
- the arm-pe simulator still works. */
- lma = bfd_section_vma (result_bfd, s);
+ if (lma_p)
+ lma = bfd_section_lma (result_bfd, s);
+ else
+ lma = bfd_section_vma (result_bfd, s);
if (verbose_p)
{
- xprintf (callback, "Loading section %s, size 0x%lx lma ",
+ xprintf (callback, "Loading section %s, size 0x%lx %s ",
bfd_get_section_name (result_bfd, s),
- (unsigned long) size);
+ (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);
- sim_write (sd, lma, buffer, 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);
report_transfer_performance (callback, data_count, start_time, end_time);
}
+ bfd_cache_close (result_bfd);
+
return result_bfd;
}
static void
xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
{
-#ifndef __STDC__
- host_callback *callback;
- char *fmt;
-#endif
va_list ap;
VA_START (ap, fmt);
-#ifndef __STDC__
- callback = va_arg (ap, host_callback *);
- fmt = va_arg (ap, char *);
-#endif
(*callback->vprintf_filtered) (callback, fmt, ap);
static void
eprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
{
-#ifndef __STDC__
- host_callback *callback;
- char *fmt;
-#endif
va_list ap;
VA_START (ap, fmt);
-#ifndef __STDC__
- callback = va_arg (ap, host_callback *);
- fmt = va_arg (ap, char *);
-#endif
(*callback->evprintf_filtered) (callback, fmt, ap);
projects / deliverable / binutils-gdb.git / blobdiff