diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-12-25 04:12:55 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-12-25 04:24:06 -0500 |
| commit | 8a0ebee658862bec66191df192c1d3b09bf0c943 (patch) | |
| tree | 4e714c457a1130fcbb2b2f79f26c23ebd0db77d5 /sim/lm32 | |
| parent | 91d6df784db745df2b0a6827de8306246083bc94 (diff) | |
| download | gdb-8a0ebee658862bec66191df192c1d3b09bf0c943.zip gdb-8a0ebee658862bec66191df192c1d3b09bf0c943.tar.gz gdb-8a0ebee658862bec66191df192c1d3b09bf0c943.tar.bz2 | |
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.
Diffstat (limited to 'sim/lm32')
| -rw-r--r-- | sim/lm32/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/lm32/arch.c | 2 | ||||
| -rw-r--r-- | sim/lm32/cpuall.h | 2 | ||||
| -rw-r--r-- | sim/lm32/model.c | 6 |
4 files changed, 12 insertions, 5 deletions
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 62320b3..044ce0a 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,5 +1,12 @@ 2015-12-25 Mike Frysinger <vapier@gentoo.org> + * arch.c: Rename MACH to SIM_MACH. + * cpuall.h: Likewise. + * model.c: Rename MACH to SIM_MACH, MACH_IMP_PROPERTIES to + SIM_MACH_IMP_PROPERTIES, and MODEL to SIM_MODEL. + +2015-12-25 Mike Frysinger <vapier@gentoo.org> + * sim-main.h (WITH_SCACHE_PBB): Move from ... * tconfig.h (WITH_SCACHE_PBB): ... here. Delete file. diff --git a/sim/lm32/arch.c b/sim/lm32/arch.c index b77103b..df59bc6 100644 --- a/sim/lm32/arch.c +++ b/sim/lm32/arch.c @@ -24,7 +24,7 @@ This file is part of the GNU simulators. #include "sim-main.h" #include "bfd.h" -const MACH *sim_machs[] = +const SIM_MACH *sim_machs[] = { #ifdef HAVE_CPU_LM32BF & lm32_mach, diff --git a/sim/lm32/cpuall.h b/sim/lm32/cpuall.h index 145a8cc..94ed2f7 100644 --- a/sim/lm32/cpuall.h +++ b/sim/lm32/cpuall.h @@ -32,7 +32,7 @@ This file is part of the GNU simulators. #include "decode.h" #endif -extern const MACH lm32_mach; +extern const SIM_MACH lm32_mach; #ifndef WANT_CPU /* The ARGBUF struct. */ diff --git a/sim/lm32/model.c b/sim/lm32/model.c index 358dde6..e1fed8d 100644 --- a/sim/lm32/model.c +++ b/sim/lm32/model.c @@ -1115,7 +1115,7 @@ lm32_model_init (SIM_CPU *cpu) #define TIMING_DATA(td) 0 #endif -static const MODEL lm32_models[] = +static const SIM_MODEL lm32_models[] = { { "lm32", & lm32_mach, MODEL_LM32, TIMING_DATA (& lm32_timing[0]), lm32_model_init }, { 0 } @@ -1123,7 +1123,7 @@ static const MODEL lm32_models[] = /* The properties of this cpu's implementation. */ -static const MACH_IMP_PROPERTIES lm32bf_imp_properties = +static const SIM_MACH_IMP_PROPERTIES lm32bf_imp_properties = { sizeof (SIM_CPU), #if WITH_SCACHE @@ -1165,7 +1165,7 @@ lm32_init_cpu (SIM_CPU *cpu) #endif } -const MACH lm32_mach = +const SIM_MACH lm32_mach = { "lm32", "lm32", MACH_LM32, 32, 32, & lm32_models[0], & lm32bf_imp_properties, |