projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix TCL error in gdb.python/py-format-string.exp.
[deliverable/binutils-gdb.git]
/
sim
/
common
/
sim-load.c
diff --git
a/sim/common/sim-load.c
b/sim/common/sim-load.c
index 9b26ebb9f8528a242c153a3a2813ec210b480448..4ff11c7cd52e5b3d23b6d6664ec267f9fda1710e 100644
(file)
--- a/
sim/common/sim-load.c
+++ b/
sim/common/sim-load.c
@@
-1,6
+1,5
@@
/* Utility to load a file into the simulator.
/* Utility to load a file into the simulator.
- Copyright (C) 1997, 1998, 2001, 2002, 2004, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 1997-2020 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
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
@@
-20,7
+19,7
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
to suggest that they shouldn't :-)]. */
#ifdef HAVE_CONFIG_H
to suggest that they shouldn't :-)]. */
#ifdef HAVE_CONFIG_H
-#include "c
c
onfig.h"
+#include "config.h"
#endif
#include "ansidecl.h"
#include <stdio.h> /* for NULL */
#endif
#include "ansidecl.h"
#include <stdio.h> /* for NULL */
@@
-37,11
+36,11
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "gdb/callback.h"
#include "gdb/remote-sim.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 *, ...)
);
+static void eprintf
(host_callback *, const char *, ...
);
+static void xprintf
(host_callback *, const char *, ...
);
static void report_transfer_performance
static void report_transfer_performance
-
PARAMS ((host_callback *, unsigned long, time_t, time_t)
);
-static void xprintf_bfd_vma
PARAMS ((host_callback *, bfd_vma)
);
+
(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.
/* Load program PROG into the simulator using the function DO_LOAD.
If PROG_BFD is non-NULL, the file has already been opened.
@@
-57,15
+56,9
@@
static void xprintf_bfd_vma PARAMS ((host_callback *, bfd_vma));
bfd *
bfd *
-sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
- SIM_DESC sd;
- const char *myname;
- host_callback *callback;
- char *prog;
- bfd *prog_bfd;
- int verbose_p;
- int lma_p;
- sim_write_fn do_write;
+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. */
{
asection *s;
/* Record separately as we don't want to close PROG_BFD if it was passed. */
@@
-108,7
+101,7
@@
sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
{
bfd_size_type size;
{
bfd_size_type size;
- size = bfd_
get_
section_size (s);
+ size = bfd_section_size (s);
if (size > 0)
{
unsigned char *buffer;
if (size > 0)
{
unsigned char *buffer;
@@
-126,13
+119,13
@@
sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
return NULL;
}
if (lma_p)
return NULL;
}
if (lma_p)
- lma = bfd_section_lma (
result_bfd,
s);
+ lma = bfd_section_lma (s);
else
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 ",
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);
(unsigned long) size,
(lma_p ? "lma" : "vma"));
xprintf_bfd_vma (callback, lma);
@@
-170,11
+163,11
@@
sim_load_file (sd, myname, callback, prog, prog_bfd, verbose_p, lma_p, do_write)
}
static void
}
static void
-xprintf
VPARAMS ((host_callback *callback, const char *fmt, ...)
)
+xprintf
(host_callback *callback, const char *fmt, ...
)
{
va_list ap;
{
va_list ap;
-
VA_START
(ap, fmt);
+
va_start
(ap, fmt);
(*callback->vprintf_filtered) (callback, fmt, ap);
(*callback->vprintf_filtered) (callback, fmt, ap);
@@
-182,11
+175,11
@@
xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
}
static void
}
static void
-eprintf
VPARAMS ((host_callback *callback, const char *fmt, ...)
)
+eprintf
(host_callback *callback, const char *fmt, ...
)
{
va_list ap;
{
va_list ap;
-
VA_START
(ap, fmt);
+
va_start
(ap, fmt);
(*callback->evprintf_filtered) (callback, fmt, ap);
(*callback->evprintf_filtered) (callback, fmt, ap);
@@
-196,10
+189,8
@@
eprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
/* Report how fast the transfer went. */
static void
/* Report how fast the transfer went. */
static void
-report_transfer_performance (callback, data_count, start_time, end_time)
- host_callback *callback;
- unsigned long data_count;
- time_t start_time, end_time;
+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, "Transfer rate: ");
if (end_time != start_time)
@@
-214,9
+205,7
@@
report_transfer_performance (callback, data_count, start_time, end_time)
This is intended to handle the vagaries of 32 vs 64 bits, etc. */
static void
This is intended to handle the vagaries of 32 vs 64 bits, etc. */
static void
-xprintf_bfd_vma (callback, vma)
- host_callback *callback;
- bfd_vma vma;
+xprintf_bfd_vma (host_callback *callback, bfd_vma vma)
{
/* FIXME: for now */
xprintf (callback, "0x%lx", (unsigned long) vma);
{
/* FIXME: for now */
xprintf (callback, "0x%lx", (unsigned long) vma);
This page took
0.02437 seconds
and
4
git commands to generate.