/* Module support.
- Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+
+ Copyright 1996, 1997, 1998, 2003 Free Software Foundation, Inc.
+
Contributed by Cygnus Support.
This file is part of GDB, the GNU debugger.
#include "sim-options.h"
#include "sim-assert.h"
+#if WITH_HW
+#include "sim-hw.h"
+#endif
+
#include "libiberty.h"
/* List of all modules. */
static MODULE_INSTALL_FN * const modules[] = {
standard_install,
sim_events_install,
+#ifdef SIM_HAVE_MODEL
+ sim_model_install,
+#endif
#if WITH_ENGINE
sim_engine_install,
#endif
#if WITH_SCACHE
scache_install,
#endif
-#ifdef SIM_HAVE_MODEL
- model_install,
-#endif
-#ifdef SIM_HAVE_BREAKPOINTS
- sim_break_install,
+#if WITH_HW
+ sim_hw_install,
#endif
/* Configured in [simulator specific] additional modules. */
#ifdef MODULE_LIST
}
}
+ sim_config_default (sd);
+
/* Install all configured in modules. */
if (sim_module_install (sd) != SIM_RC_OK)
return SIM_RC_FAIL;
SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
SIM_ASSERT (STATE_MODULES (sd) != NULL);
- if (sim_module_init (sd) != SIM_RC_OK)
- return SIM_RC_FAIL;
-
/* Set the cpu->state backlinks for each cpu. */
for (i = 0; i < MAX_NR_PROCESSORS; ++i)
- CPU_STATE (STATE_CPU (sd, i)) = sd;
+ {
+ CPU_STATE (STATE_CPU (sd, i)) = sd;
+ CPU_INDEX (STATE_CPU (sd, i)) = i;
+ }
+
+ if (sim_module_init (sd) != SIM_RC_OK)
+ return SIM_RC_FAIL;
return SIM_RC_OK;
}