NUMBERS_WITH_SUFFIX *doesn't* want to handle 'x', since that is valid

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

diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index bb1dca4e11e114b7ab00c66e8d240d8bc323260c..35eb32a65ff13857e001f99597ed83af88754d9f 100644 (file)
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -1,5 +1,5 @@
 /* Module support.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
@@ -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
@@ -81,12 +88,14 @@ sim_pre_argv_init (SIM_DESC sd, const char *myname)
     int i;
     for (i = 0; i < MAX_NR_PROCESSORS; ++i)
       {
-       const char *name;
+       char *name;
        asprintf (&name, "cpu%d", i);
        CPU_NAME (STATE_CPU (sd, i)) = name;
       }
   }
 
+  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;
 }
@@ -147,7 +159,7 @@ sim_module_init (SIM_DESC sd)
   MODULE_INIT_LIST *modp;
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   for (modp = modules->init_list; modp != NULL; modp = modp->next)
     {
@@ -166,7 +178,7 @@ sim_module_resume (SIM_DESC sd)
   MODULE_RESUME_LIST *modp;
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   for (modp = modules->resume_list; modp != NULL; modp = modp->next)
     {
@@ -185,7 +197,7 @@ sim_module_suspend (SIM_DESC sd)
   MODULE_SUSPEND_LIST *modp;
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   for (modp = modules->suspend_list; modp != NULL; modp = modp->next)
     {
@@ -204,7 +216,7 @@ sim_module_uninstall (SIM_DESC sd)
   MODULE_UNINSTALL_LIST *modp;
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   /* Uninstall the modules.  */
   for (modp = modules->uninstall_list; modp != NULL; modp = modp->next)
@@ -273,7 +285,7 @@ sim_module_info (SIM_DESC sd, int verbose)
   MODULE_INFO_LIST *modp;
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   for (modp = modules->info_list; modp != NULL; modp = modp->next)
     {
@@ -292,7 +304,7 @@ sim_module_add_init_fn (SIM_DESC sd, MODULE_INIT_FN fn)
   MODULE_INIT_LIST **last;
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   last = &modules->init_list;
   while (*last != NULL)
@@ -314,7 +326,7 @@ sim_module_add_resume_fn (SIM_DESC sd, MODULE_RESUME_FN fn)
   MODULE_RESUME_LIST **last;
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   last = &modules->resume_list;
   while (*last != NULL)
@@ -336,7 +348,7 @@ sim_module_add_suspend_fn (SIM_DESC sd, MODULE_SUSPEND_FN fn)
   MODULE_SUSPEND_LIST **last;
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   last = &modules->suspend_list;
   while (*last != NULL)
@@ -357,7 +369,7 @@ sim_module_add_uninstall_fn (SIM_DESC sd, MODULE_UNINSTALL_FN fn)
   MODULE_UNINSTALL_LIST *l = ZALLOC (MODULE_UNINSTALL_LIST);
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   l->fn = fn;
   l->next = modules->uninstall_list;
@@ -375,7 +387,7 @@ sim_module_add_info_fn (SIM_DESC sd, MODULE_INFO_FN fn)
   MODULE_INFO_LIST **last;
 
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  SIM_ASSERT (STATE_MODULES (sd) == NULL);
+  SIM_ASSERT (STATE_MODULES (sd) != NULL);
 
   last = &modules->info_list;
   while (*last != NULL)