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.
This commit is contained in:
Mike Frysinger
2015-12-25 04:12:55 -05:00
parent 91d6df784d
commit 8a0ebee658
33 changed files with 172 additions and 116 deletions

View File

@@ -1,3 +1,10 @@
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 ...

View File

@@ -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,

View File

@@ -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. */

View File

@@ -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,