This commit was generated by cvs2svn to track changes on a CVS vendor

[deliverable/binutils-gdb.git] / sim / common / sim-module.c

diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index 297b13335089688917bf1bd77d035db2e920ba61..35eb32a65ff13857e001f99597ed83af88754d9f 100644 (file)
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -23,12 +23,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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
@@ -49,11 +56,11 @@ static MODULE_INSTALL_FN * const modules[] = {
 #if WITH_SCACHE
   scache_install,
 #endif
-#ifdef SIM_HAVE_MODEL
-  model_install,
-#endif
 #ifdef SIM_HAVE_BREAKPOINTS
   sim_break_install,
+#endif
+#if WITH_HW
+  sim_hw_install,
 #endif
   /* Configured in [simulator specific] additional modules.  */
 #ifdef MODULE_LIST
@@ -87,6 +94,8 @@ sim_pre_argv_init (SIM_DESC sd, const char *myname)
       }
   }
 
+  sim_config_default (sd);
+
   /* Install all configured in modules.  */
   if (sim_module_install (sd) != SIM_RC_OK)
     return SIM_RC_FAIL;
@@ -103,12 +112,15 @@ sim_post_argv_init (SIM_DESC sd)
   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;
 }