sim: move default model to the runtime sim state

[binutils-gdb.git] / sim / common / sim-cpu.h

diff --git a/sim/common/sim-cpu.h b/sim/common/sim-cpu.h
index 3c63054290fb5dd3c7e4a093046588596c0c8e47..7648ba50e9f92c538844d2bbd5a4c30bc4f3a8fb 100644 (file)
--- a/sim/common/sim-cpu.h
+++ b/sim/common/sim-cpu.h
@@ -1,5 +1,5 @@
 /* CPU support.
-   Copyright (C) 1998, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1998-2021 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
 This file is part of GDB, the GNU debugger.
@@ -100,17 +100,15 @@ typedef struct {
   PROFILE_DATA profile_data;
 #define CPU_PROFILE_DATA(cpu) (& (cpu)->base.profile_data)
 
-#ifdef SIM_HAVE_MODEL
   /* Machine tables for this cpu.  See sim-model.h.  */
-  const MACH *mach;
+  const SIM_MACH *mach;
 #define CPU_MACH(cpu) ((cpu)->base.mach)
   /* The selected model.  */
-  const MODEL *model;
+  const SIM_MODEL *model;
 #define CPU_MODEL(cpu) ((cpu)->base.model)
   /* Model data (profiling state, etc.).  */
   void *model_data;
 #define CPU_MODEL_DATA(cpu) ((cpu)->base.model_data)
-#endif
 
   /* Routines to fetch/store registers.  */
   CPUREG_FETCH_FN *reg_fetch;
@@ -125,9 +123,9 @@ typedef struct {
 } sim_cpu_base;
 
 /* Create all cpus.  */
-extern SIM_RC sim_cpu_alloc_all (SIM_DESC, int, int);
+extern SIM_RC sim_cpu_alloc_all (SIM_DESC, int);
 /* Create a cpu.  */
-extern sim_cpu *sim_cpu_alloc (SIM_DESC, int);
+extern sim_cpu *sim_cpu_alloc (SIM_DESC);
 /* Release resources held by all cpus.  */
 extern void sim_cpu_free_all (SIM_DESC);
 /* Release resources held by a cpu.  */