From 8a0ebee658862bec66191df192c1d3b09bf0c943 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 25 Dec 2015 04:12:55 -0500 Subject: sim: move MACH/MODEL types into SIM_xxx namespace The "MACH" and "MODEL" names are a bit generic and collide with symbols used by other sections of code (like h8300's opcodes). Since these are sim-specific types, they really should have a "SIM_" prefix. --- sim/cris/modelv10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sim/cris/modelv10.c') diff --git a/sim/cris/modelv10.c b/sim/cris/modelv10.c index 87e7901..ae43c90 100644 --- a/sim/cris/modelv10.c +++ b/sim/cris/modelv10.c @@ -4113,7 +4113,7 @@ crisv10_model_init (SIM_CPU *cpu) #define TIMING_DATA(td) 0 #endif -static const MODEL crisv10_models[] = +static const SIM_MODEL crisv10_models[] = { { "crisv10", & crisv10_mach, MODEL_CRISV10, TIMING_DATA (& crisv10_timing[0]), crisv10_model_init }, { 0 } @@ -4121,7 +4121,7 @@ static const MODEL crisv10_models[] = /* The properties of this cpu's implementation. */ -static const MACH_IMP_PROPERTIES crisv10f_imp_properties = +static const SIM_MACH_IMP_PROPERTIES crisv10f_imp_properties = { sizeof (SIM_CPU), #if WITH_SCACHE @@ -4163,7 +4163,7 @@ crisv10_init_cpu (SIM_CPU *cpu) #endif } -const MACH crisv10_mach = +const SIM_MACH crisv10_mach = { "crisv10", "cris", MACH_CRISV10, 32, 32, & crisv10_models[0], & crisv10f_imp_properties, -- cgit v1.1