aboutsummaryrefslogtreecommitdiff
path: root/sim/bfin
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/bfin
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/bfin')
-rw-r--r--sim/bfin/ChangeLog5
-rw-r--r--sim/bfin/machs.c14
2 files changed, 12 insertions, 7 deletions
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 427cdd8..5599af6 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,5 +1,10 @@
2015-12-25 Mike Frysinger <vapier@gentoo.org>
+ * machs.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>
+
* devices.c (device_error): Delete.
2015-12-24 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/bfin/machs.c b/sim/bfin/machs.c
index 65c434d..ab68aa0 100644
--- a/sim/bfin/machs.c
+++ b/sim/bfin/machs.c
@@ -29,7 +29,7 @@
#include "dv-bfin_cec.h"
#include "dv-bfin_dmac.h"
-static const MACH bfin_mach;
+static const SIM_MACH bfin_mach;
struct bfin_memory_layout {
address_word addr, len;
@@ -1451,7 +1451,7 @@ dv_bfin_hw_port_parse (SIM_DESC sd, const struct bfin_model_data *mdata,
static void
bfin_model_hw_tree_init (SIM_DESC sd, SIM_CPU *cpu)
{
- const MODEL *model = CPU_MODEL (cpu);
+ const SIM_MODEL *model = CPU_MODEL (cpu);
const struct bfin_model_data *mdata = CPU_MODEL_DATA (cpu);
const struct bfin_board_data *board = STATE_BOARD_DATA (sd);
int mnum = MODEL_NUM (model);
@@ -1693,7 +1693,7 @@ bfin_model_map_bfrom (SIM_DESC sd, SIM_CPU *cpu)
void
bfin_model_cpu_init (SIM_DESC sd, SIM_CPU *cpu)
{
- const MODEL *model = CPU_MODEL (cpu);
+ const SIM_MODEL *model = CPU_MODEL (cpu);
const struct bfin_model_data *mdata = CPU_MODEL_DATA (cpu);
int mnum = MODEL_NUM (model);
size_t idx;
@@ -1937,7 +1937,7 @@ bfin_prepare_run (SIM_CPU *cpu)
{
}
-static const MODEL bfin_models[] =
+static const SIM_MODEL bfin_models[] =
{
#define P(n) { "bf"#n, & bfin_mach, MODEL_BF##n, NULL, bfin_model_init },
#include "proc_list.def"
@@ -1945,13 +1945,13 @@ static const MODEL bfin_models[] =
{ 0, NULL, 0, NULL, NULL, }
};
-static const MACH_IMP_PROPERTIES bfin_imp_properties =
+static const SIM_MACH_IMP_PROPERTIES bfin_imp_properties =
{
sizeof (SIM_CPU),
0,
};
-static const MACH bfin_mach =
+static const SIM_MACH bfin_mach =
{
"bfin", "bfin", MACH_BFIN,
32, 32, & bfin_models[0], & bfin_imp_properties,
@@ -1959,7 +1959,7 @@ static const MACH bfin_mach =
bfin_prepare_run
};
-const MACH *sim_machs[] =
+const SIM_MACH *sim_machs[] =
{
& bfin_mach,
NULL