OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: msp430: drop duplicate sim_load_file call

Browse Source 
There's no need, or desire, to call sim_load_file from sim_open.  The
higher levels (gdb/run) take care of calling sim_load for us already.
This commit is contained in:
Mike Frysinger 2016-01-04 00:25:46 -05:00
parent 1a846c6262
commit 402cf05346
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sim/msp430/ChangeLog
View File

@ -1,3 +1,10 @@
2016-01-05 Mike Frysinger <vapier@gentoo.org>
* msp430-sim.c (loader_write_mem): Delete.
(lookup_symbol): Return -1 when abfd is NULL.
(sim_open): Delete prog_bfd variable. Delete call to sim_load_file.
Delete prog_bfd check.
2016-01-05 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete trace.o.

33
sim/msp430/msp430-sim.c
View File

@ -32,16 +32,6 @@
#include "sim-syscall.h"
#include "targ-vals.h"
static int
loader_write_mem (SIM_DESC sd,
SIM_ADDR taddr,
const unsigned char *buf,
int bytes)
{
SIM_CPU *cpu = MSP430_CPU (sd);
return sim_core_write_buffer (sd, cpu, write_map, buf, taddr, bytes);
}
static sim_cia
msp430_pc_fetch (SIM_CPU *cpu)
{
@ -62,6 +52,9 @@ lookup_symbol (SIM_DESC sd, const char *name)
long number_of_symbols = STATE_NUM_SYMBOLS (sd);
long i;
if (abfd == NULL)
return -1;
if (symbol_table == NULL)
{
long storage_needed;
@ -148,7 +141,6 @@ sim_open (SIM_OPEN_KIND kind,
{
SIM_DESC sd = sim_state_alloc (kind, callback);
char c;
struct bfd *prog_bfd;
/* Initialise the simulator. */
@ -198,14 +190,6 @@ sim_open (SIM_OPEN_KIND kind,
return 0;
}
prog_bfd = sim_load_file (sd, argv[0], callback,
"the program",
STATE_PROG_BFD (sd),
0 /* verbose */,
1 /* use LMA instead of VMA */,
loader_write_mem);
/* Allow prog_bfd to be NULL - this is needed by the GDB testsuite. */
/* Establish any remaining configuration options. */
if (sim_config (sd) != SIM_RC_OK)
{
@ -223,13 +207,10 @@ sim_open (SIM_OPEN_KIND kind,
assert (MAX_NR_PROCESSORS == 1);
msp430_initialize_cpu (sd, MSP430_CPU (sd));
if (prog_bfd != NULL)
{
MSP430_CPU (sd)->state.cio_breakpoint = lookup_symbol (sd, "C$$IO$$");
MSP430_CPU (sd)->state.cio_buffer = lookup_symbol (sd, "__CIOBUF__");
if (MSP430_CPU (sd)->state.cio_buffer == -1)
MSP430_CPU (sd)->state.cio_buffer = lookup_symbol (sd, "_CIOBUF_");
}
MSP430_CPU (sd)->state.cio_breakpoint = lookup_symbol (sd, "C$$IO$$");
MSP430_CPU (sd)->state.cio_buffer = lookup_symbol (sd, "__CIOBUF__");
if (MSP430_CPU (sd)->state.cio_buffer == -1)
MSP430_CPU (sd)->state.cio_buffer = lookup_symbol (sd, "_CIOBUF_");
return sd;
}