Switch the inferior too in switch_to_program_space_and_thread

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

diff --git a/sim/common/sim-model.c b/sim/common/sim-model.c
index ddcb2de2be0d303a96a78d0c9f2290841cfd7ba3..1bf122baf988103f3cf4ffb9c180d40d90f49889 100644 (file)
--- a/sim/common/sim-model.c
+++ b/sim/common/sim-model.c
@@ -1,6 +1,5 @@
 /* Model support.
-   Copyright (C) 1996, 1997, 1998, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1996-2020 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
@@ -26,18 +25,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-assert.h"
 #include "bfd.h"
 
-static void model_set (sim_cpu *, const MODEL *);
+static void model_set (sim_cpu *, const SIM_MODEL *);
 
 static DECLARE_OPTION_HANDLER (model_option_handler);
 
 static MODULE_INIT_FN sim_model_init;
 
-#define OPTION_MODEL (OPTION_START + 0)
+enum {
+  OPTION_MODEL = OPTION_START,
+  OPTION_MODEL_INFO,
+};
 
 static const OPTION model_options[] = {
   { {"model", required_argument, NULL, OPTION_MODEL},
       '\0', "MODEL", "Specify model to simulate",
       model_option_handler, NULL },
+
+  { {"model-info", no_argument, NULL, OPTION_MODEL_INFO},
+      '\0', NULL, "List selectable models",
+      model_option_handler, NULL },
+  { {"info-model", no_argument, NULL, OPTION_MODEL_INFO},
+      '\0', NULL, NULL,
+      model_option_handler, NULL },
+
   { {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL, NULL }
 };
 
@@ -49,7 +59,7 @@ model_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
     {
     case OPTION_MODEL :
       {
-       const MODEL *model = sim_model_lookup (arg);
+       const SIM_MODEL *model = sim_model_lookup (arg);
        if (! model)
          {
            sim_io_eprintf (sd, "unknown model `%s'\n", arg);
@@ -58,6 +68,22 @@ model_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
        sim_model_set (sd, cpu, model);
        break;
       }
+
+    case OPTION_MODEL_INFO :
+      {
+       const SIM_MACH **machp;
+       const SIM_MODEL *model;
+       for (machp = & sim_machs[0]; *machp != NULL; ++machp)
+         {
+           sim_io_printf (sd, "Models for architecture `%s':\n",
+                          MACH_NAME (*machp));
+           for (model = MACH_MODELS (*machp); MODEL_NAME (model) != NULL;
+                ++model)
+             sim_io_printf (sd, " %s", MODEL_NAME (model));
+           sim_io_printf (sd, "\n");
+         }
+       break;
+      }
     }
 
   return SIM_RC_OK;
@@ -77,7 +103,7 @@ sim_model_install (SIM_DESC sd)
 /* Subroutine of sim_model_set to set the model for one cpu.  */
 
 static void
-model_set (sim_cpu *cpu, const MODEL *model)
+model_set (sim_cpu *cpu, const SIM_MODEL *model)
 {
   CPU_MACH (cpu) = MODEL_MACH (model);
   CPU_MODEL (cpu) = model;
@@ -89,7 +115,7 @@ model_set (sim_cpu *cpu, const MODEL *model)
    If CPU is NULL, all cpus are set to MODEL.  */
 
 void
-sim_model_set (SIM_DESC sd, sim_cpu *cpu, const MODEL *model)
+sim_model_set (SIM_DESC sd, sim_cpu *cpu, const SIM_MODEL *model)
 {
   if (! cpu)
     {
@@ -108,11 +134,11 @@ sim_model_set (SIM_DESC sd, sim_cpu *cpu, const MODEL *model)
 /* Look up model named NAME.
    Result is pointer to MODEL entry or NULL if not found.  */
 
-const MODEL *
+const SIM_MODEL *
 sim_model_lookup (const char *name)
 {
-  const MACH **machp;
-  const MODEL *model;
+  const SIM_MACH **machp;
+  const SIM_MODEL *model;
 
   for (machp = & sim_machs[0]; *machp != NULL; ++machp)
     {
@@ -128,10 +154,10 @@ sim_model_lookup (const char *name)
 /* Look up machine named NAME.
    Result is pointer to MACH entry or NULL if not found.  */
 
-const MACH *
+const SIM_MACH *
 sim_mach_lookup (const char *name)
 {
-  const MACH **machp;
+  const SIM_MACH **machp;
 
   for (machp = & sim_machs[0]; *machp != NULL; ++machp)
     {
@@ -144,10 +170,10 @@ sim_mach_lookup (const char *name)
 /* Look up a machine via its bfd name.
    Result is pointer to MACH entry or NULL if not found.  */
 
-const MACH *
+const SIM_MACH *
 sim_mach_lookup_bfd_name (const char *name)
 {
-  const MACH **machp;
+  const SIM_MACH **machp;
 
   for (machp = & sim_machs[0]; *machp != NULL; ++machp)
     {
@@ -164,6 +190,9 @@ sim_model_init (SIM_DESC sd)
 {
   SIM_CPU *cpu;
 
+  if (!WITH_MODEL_P)
+    return SIM_RC_OK;
+
   /* If both cpu model and state architecture are set, ensure they're
      compatible.  If only one is set, set the other.  If neither are set,
      use the default model.  STATE_ARCHITECTURE is the bfd_arch_info data
@@ -177,7 +206,8 @@ sim_model_init (SIM_DESC sd)
       && ! CPU_MACH (cpu))
     {
       /* Set the default model.  */
-      const MODEL *model = sim_model_lookup (WITH_DEFAULT_MODEL);
+      const SIM_MODEL *model = sim_model_lookup (WITH_DEFAULT_MODEL);
+      SIM_ASSERT (model != NULL);
       sim_model_set (sd, NULL, model);
     }
 
@@ -197,7 +227,7 @@ sim_model_init (SIM_DESC sd)
     {
       /* Use the default model for the selected machine.
         The default model is the first one in the list.  */
-      const MACH *mach = sim_mach_lookup_bfd_name (STATE_ARCHITECTURE (sd)->printable_name);
+      const SIM_MACH *mach = sim_mach_lookup_bfd_name (STATE_ARCHITECTURE (sd)->printable_name);
 
       if (mach == NULL)
        {
@@ -214,3 +244,12 @@ sim_model_init (SIM_DESC sd)
 
   return SIM_RC_OK;
 }
+\f
+#if !WITH_MODEL_P
+/* Set up basic model support.  This is a stub for ports that do not define
+   models.  See sim-model.h for more details.  */
+const SIM_MACH *sim_machs[] =
+{
+  NULL
+};
+#endif