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

sim: cris: move option install to sim_open 

We've moved custom option install for other targets to sim_open, so update
cris too.  It's the last one using MODULE_LIST, so we can drop that from
the common code too.
This commit is contained in:
Mike Frysinger 2015-12-24 15:49:31 -05:00
parent cec1974488
commit 9db2b71908
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sim/common/ChangeLog
View File

@ -1,3 +1,7 @@
2015-12-24 Mike Frysinger <vapier@gentoo.org>
* sim-module.c (MODULE_LIST): Delete.
2015-12-24 Mike Frysinger <vapier@gentoo.org>
* sim-options.c (OPTION_H8300H, OPTION_H8300S, OPTION_H8300SX):

4
sim/common/sim-module.c
View File

@ -64,10 +64,6 @@ static MODULE_INSTALL_FN * const modules[] = {
#ifdef HAVE_DV_SOCKSER
/* TODO: Shouldn't have device models here. */
dv_sockser_install,
#endif
/* Configured in [simulator specific] additional modules. */
#ifdef MODULE_LIST
MODULE_LIST
#endif
0
};

7
sim/cr16/ChangeLog
View File

@ -1,3 +1,10 @@
2015-12-24 Mike Frysinger <vapier@gentoo.org>
* sim-if.c (cris_option_install): Delete.
(sim_open): Call sim_add_option_table.
* tconfig.h: Delete sim-module.h include.
(MODULE_INSTALL_FN, MODULE_LIST): Delete.
2015-11-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete sim-reason.o, sim-reg.o, and

18
sim/cris/sim-if.c
View File

@ -127,17 +127,6 @@ static const OPTION cris_options[] =
{ {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL, NULL }
};
/* Add the CRIS-specific option list to the simulator. */
SIM_RC
cris_option_install (SIM_DESC sd)
{
SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
if (sim_add_option_table (sd, NULL, cris_options) != SIM_RC_OK)
return SIM_RC_FAIL;
return SIM_RC_OK;
}
/* Handle CRIS-specific options. */
static SIM_RC
@ -761,6 +750,13 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
return 0;
}
/* Add the CRIS-specific option list to the simulator. */
if (sim_add_option_table (sd, NULL, cris_options) != SIM_RC_OK)
{
free_state (sd);
return 0;
}
/* getopt will print the error message so we just have to exit if this fails.
FIXME: Hmmm... in the case of gdb we need getopt to call
print_filtered. */

4
sim/cris/tconfig.h
View File

@ -30,10 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* For MSPR support. FIXME: revisit. */
#define WITH_DEVICES 1
#include "sim-module.h"
extern MODULE_INSTALL_FN cris_option_install;
#define MODULE_LIST cris_option_install,
#define SIM_HAVE_MODEL
/* This is a global setting. Different cpu families can't mix-n-match -scache