aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/common/ChangeLog4
-rw-r--r--sim/common/sim-module.c4
-rw-r--r--sim/cr16/ChangeLog7
-rw-r--r--sim/cris/sim-if.c18
-rw-r--r--sim/cris/tconfig.h4
5 files changed, 18 insertions, 19 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index cb1a9a6..8340928 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,9 @@
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):
Move to h8300/compile.c.
[SIM_H8300] (standard_options): Likewise.
diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index 8498f80..4f23882 100644
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -65,10 +65,6 @@ static MODULE_INSTALL_FN * const modules[] = {
/* TODO: Shouldn't have device models here. */
dv_sockser_install,
#endif
- /* Configured in [simulator specific] additional modules. */
-#ifdef MODULE_LIST
- MODULE_LIST
-#endif
0
};
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index c63586a..b23e0cb 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -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
diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c
index 9fb1e13..115ff21 100644
--- a/sim/cris/sim-if.c
+++ b/sim/cris/sim-if.c
@@ -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. */
diff --git a/sim/cris/tconfig.h b/sim/cris/tconfig.h
index 8f82ac7..e512c3d 100644
--- a/sim/cris/tconfig.h
+++ b/sim/cris/tconfig.h
@@ -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