aboutsummaryrefslogtreecommitdiff
path: root/sim/bfin/machs.c
diff options
context:
space:
mode:
Diffstat (limited to 'sim/bfin/machs.c')
-rw-r--r--sim/bfin/machs.c14
1 files changed, 7 insertions, 7 deletions
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