aboutsummaryrefslogtreecommitdiff
path: root/sim/iq2000
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-12-25 04:12:55 -0500
committerMike Frysinger <vapier@gentoo.org>2015-12-25 04:24:06 -0500
commit8a0ebee658862bec66191df192c1d3b09bf0c943 (patch)
tree4e714c457a1130fcbb2b2f79f26c23ebd0db77d5 /sim/iq2000
parent91d6df784db745df2b0a6827de8306246083bc94 (diff)
downloadgdb-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/iq2000')
-rw-r--r--sim/iq2000/ChangeLog7
-rw-r--r--sim/iq2000/arch.c2
-rw-r--r--sim/iq2000/cpuall.h2
-rw-r--r--sim/iq2000/model.c6
4 files changed, 12 insertions, 5 deletions
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 45f31d5..03cc023 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/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.
diff --git a/sim/iq2000/arch.c b/sim/iq2000/arch.c
index 20bade1..da1f744 100644
--- a/sim/iq2000/arch.c
+++ b/sim/iq2000/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_IQ2000BF
& iq2000_mach,
diff --git a/sim/iq2000/cpuall.h b/sim/iq2000/cpuall.h
index 2455798..0d5ae44 100644
--- a/sim/iq2000/cpuall.h
+++ b/sim/iq2000/cpuall.h
@@ -38,7 +38,7 @@ This file is part of the GNU simulators.
#include "decode.h"
#endif
-extern const MACH iq2000_mach;
+extern const SIM_MACH iq2000_mach;
#ifndef WANT_CPU
/* The ARGBUF struct. */
diff --git a/sim/iq2000/model.c b/sim/iq2000/model.c
index a759451..2255c68 100644
--- a/sim/iq2000/model.c
+++ b/sim/iq2000/model.c
@@ -2509,7 +2509,7 @@ iq2000_model_init (SIM_CPU *cpu)
#define TIMING_DATA(td) 0
#endif
-static const MODEL iq2000_models[] =
+static const SIM_MODEL iq2000_models[] =
{
{ "iq2000", & iq2000_mach, MODEL_IQ2000, TIMING_DATA (& iq2000_timing[0]), iq2000_model_init },
{ 0 }
@@ -2517,7 +2517,7 @@ static const MODEL iq2000_models[] =
/* The properties of this cpu's implementation. */
-static const MACH_IMP_PROPERTIES iq2000bf_imp_properties =
+static const SIM_MACH_IMP_PROPERTIES iq2000bf_imp_properties =
{
sizeof (SIM_CPU),
#if WITH_SCACHE
@@ -2559,7 +2559,7 @@ iq2000_init_cpu (SIM_CPU *cpu)
#endif
}
-const MACH iq2000_mach =
+const SIM_MACH iq2000_mach =
{
"iq2000", "iq2000", MACH_IQ2000,
32, 32, & iq2000_models[0], & iq2000bf_imp_properties,