aboutsummaryrefslogtreecommitdiff
path: root/sim/common
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-05-01 23:37:35 -0400
committerMike Frysinger <vapier@gentoo.org>2021-05-04 21:52:38 -0400
commit2849d28d96718c6d2c0c9513745a45a02404bc91 (patch)
tree42de25aa35ccf16716a4e7562a9051c5a35b4b50 /sim/common
parent4d47dcfcf1cf8fa34df057b0d5accf7ab91b6b47 (diff)
downloadgdb-2849d28d96718c6d2c0c9513745a45a02404bc91.zip
gdb-2849d28d96718c6d2c0c9513745a45a02404bc91.tar.gz
gdb-2849d28d96718c6d2c0c9513745a45a02404bc91.tar.bz2
sim: hw: localize init callback
Now that we don't need to hardcode the module init list in a single place, move the hw init logic out to the sim-hw file.
Diffstat (limited to 'sim/common')
-rw-r--r--sim/common/ChangeLog8
-rw-r--r--sim/common/sim-hw.c6
-rw-r--r--sim/common/sim-hw.h6
-rw-r--r--sim/common/sim-module.c7
4 files changed, 13 insertions, 14 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index b2466c2..d96faee 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,11 @@
+2021-05-04 Mike Frysinger <vapier@gentoo.org>
+
+ * sim-hw.c (sim_hw_install): Rename to ...
+ (sim_install_hw): ... this. New prototype.
+ * sim-hw.h (sim_hw_install): Delete.
+ * sim-module.c: Delete sim-hw.h include.
+ (early_modules): Delete sim_hw_install.
+
2021-05-04 Tom Tromey <tromey@adacore.com>
* Make-common.in (generated_files): Add config.h.
diff --git a/sim/common/sim-hw.c b/sim/common/sim-hw.c
index 11d3abd..984817f 100644
--- a/sim/common/sim-hw.c
+++ b/sim/common/sim-hw.c
@@ -288,8 +288,12 @@ hw_option_handler (struct sim_state *sd, sim_cpu *cpu, int opt,
static MODULE_INIT_FN sim_hw_init;
static MODULE_UNINSTALL_FN sim_hw_uninstall;
+/* Provide a prototype to silence -Wmissing-prototypes. */
+SIM_RC sim_install_hw (struct sim_state *sd);
+
+/* Establish this object. */
SIM_RC
-sim_hw_install (struct sim_state *sd)
+sim_install_hw (struct sim_state *sd)
{
SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
sim_add_option_table (sd, NULL, hw_options);
diff --git a/sim/common/sim-hw.h b/sim/common/sim-hw.h
index 976a220..82c404a 100644
--- a/sim/common/sim-hw.h
+++ b/sim/common/sim-hw.h
@@ -21,12 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define SIM_HW_H
-/* Establish this object */
-
-SIM_RC sim_hw_install
-(struct sim_state *sd);
-
-
/* Parse a hardware definition */
struct hw *sim_hw_parse
diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index 2557697..3bb7db0 100644
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -25,10 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "sim-options.h"
#include "sim-assert.h"
-#if WITH_HW
-#include "sim-hw.h"
-#endif
-
#include "libiberty.h"
#include <stdlib.h>
@@ -52,9 +48,6 @@ static MODULE_INSTALL_FN * const early_modules[] = {
#if WITH_SCACHE
scache_install,
#endif
-#if WITH_HW
- sim_hw_install,
-#endif
};
static int early_modules_len = ARRAY_SIZE (early_modules);