diff options
Diffstat (limited to 'sim/common/sim-model.c')
| -rw-r--r-- | sim/common/sim-model.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sim/common/sim-model.c b/sim/common/sim-model.c index db5f323..0d0c28d 100644 --- a/sim/common/sim-model.c +++ b/sim/common/sim-model.c @@ -25,7 +25,7 @@ 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); @@ -59,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); @@ -71,8 +71,8 @@ model_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt, case OPTION_MODEL_INFO : { - const MACH **machp; - const MODEL *model; + 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", @@ -103,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; @@ -115,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) { @@ -134,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) { @@ -154,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) { @@ -170,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) { @@ -203,7 +203,7 @@ 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); } @@ -224,7 +224,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) { |