FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sim: namespace sim_machs

Browse source 
We want to do a single build with all arches in one binary which means
we need to namespace sim_machs on a per-arch basis.  Move it from a
global variable to the sim description structure so it can be setup at
runtime.

Changing the SIM_MODEL->num from an enum to an int is unfortunate, but
we specifically don't want to maintain a centralized list anymore, and
this was never used directly in common code, just passed to per-arch
callbacks.
This commit is contained in:
Mike Frysinger 2021-06-28 21:42:56 -04:00
parent f8261de1b2
commit 1c636da093
35 changed files with 167 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sim/bfin/ChangeLog
View file

@ -1,3 +1,10 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* interp.c (sim_open): Set STATE_MACHS.
* machs.c (sim_machs): Rename to ...
(bfin_sim_machs): ... this.
* machs.h (bfin_sim_machs): New decl.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* machs.c (sim_machs): Mark const.

1
sim/bfin/interp.c
View file

@ -703,6 +703,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback,
sizeof (struct bfin_board_data));
/* Set default options before parsing user options. */
STATE_MACHS (sd) = bfin_sim_machs;
current_alignment = STRICT_ALIGNMENT;
current_target_byte_order = BFD_ENDIAN_LITTLE;

2
sim/bfin/machs.c
View file

@ -1962,7 +1962,7 @@ static const SIM_MACH bfin_mach =
bfin_prepare_run
};
const SIM_MACH * const sim_machs[] =
const SIM_MACH * const bfin_sim_machs[] =
{
& bfin_mach,
NULL

1
sim/bfin/machs.h
View file

@ -32,6 +32,7 @@ struct bfin_board_data {
void bfin_model_cpu_init (SIM_DESC, SIM_CPU *);
bu32 bfin_model_get_chipid (SIM_DESC);
bu32 bfin_model_get_dspid (SIM_DESC);
extern const SIM_MACH * const bfin_sim_machs[];
#define BFIN_COREMMR_CEC_BASE 0xFFE02100
#define BFIN_COREMMR_CEC_SIZE (4 * 5)

7
sim/bpf/ChangeLog
View file

@ -1,3 +1,10 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Rename to ...
(bpf_sim_machs): ... this.
* sim-if.c (bpf_sim_machs): New decl.
(sim_open): Set STATE_MACH.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Mark const.

2
sim/bpf/arch.c
View file

@ -25,7 +25,7 @@ This file is part of the GNU simulators.
#include "sim-main.h"
#include "bfd.h"
const SIM_MACH * const sim_machs[] =
const SIM_MACH * const bpf_sim_machs[] =
{
#ifdef HAVE_CPU_BPFBF
& bpf_mach,

5
sim/bpf/sim-if.c
View file

@ -111,6 +111,8 @@ bpf_free_state (SIM_DESC sd)
sim_state_free (sd);
}
extern const SIM_MACH * const bpf_sim_machs[];
/* Create an instance of the simulator. */
SIM_DESC
@ -125,6 +127,9 @@ sim_open (SIM_OPEN_KIND kind,
SIM_DESC sd = sim_state_alloc (kind, callback);
/* Set default options before parsing user options. */
STATE_MACHS (sd) = bpf_sim_machs;
if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
goto error;

24
sim/common/ChangeLog
View file

@ -1,3 +1,27 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* cgen-defs.h (cgen_cpu_max_extra_bytes): Add SIM_DESC arg.
* cgen-utils.c (cgen_cpu_max_extra_bytes): Likewise. Change sim_machs
to STATE_MACHS.
* sim-base.h (struct sim_state): Add machs.
(STATE_MACHS): New define.
* sim-cpu.c (sim_cpu_alloc): Pass sd to cgen_cpu_max_extra_bytes.
* sim-model.c (model_option_handler): Pass sd to sim_model_lookup.
Change sim_machs to STATE_MACHS.
(sim_model_lookup): Add SIM_DESC arg. Change sim_machs to
STATE_MACHS.
(sim_mach_lookup): Likewiwse.
(sim_mach_lookup_bfd_name): Likewise.
(sim_model_init): Pass sd to sim_model_lookup and
sim_mach_lookup_bfd_name.
(sim_machs): Delete.
* sim-model.h (enum mach_attr): Delete.
(SIM_MODEL): Change num to int.
(sim_machs): Delete.
(sim_model_lookup): Add SIM_DESC arg.
(sim_mach_lookup): Likewise.
(sim_mach_lookup_bfd_name): Likewise.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (Makefile): Replace $(arch) and pass more files to

2
sim/common/cgen-defs.h
View file

@ -146,7 +146,7 @@ extern CPU_INSN_NAME_FN cgen_insn_name;
/* Return the maximum number of extra bytes required for a sim_cpu struct. */
/* ??? Ok, yes, this is less pretty than it should be. Give me a better
language [or suggest a better way]. */
extern int cgen_cpu_max_extra_bytes (void);
extern int cgen_cpu_max_extra_bytes (SIM_DESC);
/* Target supplied routine to process an invalid instruction. */
extern SEM_PC sim_engine_invalid_insn (SIM_CPU *, IADDR, SEM_PC);

10
sim/common/cgen-utils.c
View file

@ -101,14 +101,16 @@ cgen_insn_name (SIM_CPU *cpu, int i)
/* Return the maximum number of extra bytes required for a SIM_CPU struct. */
int
cgen_cpu_max_extra_bytes (void)
cgen_cpu_max_extra_bytes (SIM_DESC sd)
{
int i;
const SIM_MACH * const *machp;
int extra = 0;
for (i = 0; sim_machs[i] != 0; ++i)
SIM_ASSERT (STATE_MACHS (sd) != NULL);
for (machp = STATE_MACHS (sd); *machp != NULL; ++machp)
{
int size = IMP_PROPS_SIM_CPU_SIZE (MACH_IMP_PROPS (sim_machs[i]));
int size = IMP_PROPS_SIM_CPU_SIZE (MACH_IMP_PROPS (*machp));
if (size > extra)
extra = size;
}

4
sim/common/sim-base.h
View file

@ -143,6 +143,10 @@ struct sim_state {
const char *target;
#define STATE_TARGET(sd) ((sd)->target)
/* List of machs available. */
const SIM_MACH * const *machs;
#define STATE_MACHS(sd) ((sd)->machs)
/* In standalone simulator, this is the program's arguments passed
on the command line. */
char **prog_argv;

2
sim/common/sim-cpu.c
View file

@ -48,7 +48,7 @@ sim_cpu_alloc (SIM_DESC sd)
int extra_bytes = 0;
#ifdef CGEN_ARCH
extra_bytes += cgen_cpu_max_extra_bytes ();
extra_bytes += cgen_cpu_max_extra_bytes (sd);
#endif
return zalloc (sizeof (sim_cpu) + extra_bytes);

46
sim/common/sim-model.c
View file

@ -62,7 +62,7 @@ model_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
{
case OPTION_MODEL :
{
const SIM_MODEL *model = sim_model_lookup (arg);
const SIM_MODEL *model = sim_model_lookup (sd, arg);
if (! model)
{
sim_io_eprintf (sd, "unknown model `%s'\n", arg);
@ -76,7 +76,14 @@ model_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
{
const SIM_MACH * const *machp;
const SIM_MODEL *model;
for (machp = & sim_machs[0]; *machp != NULL; ++machp)
if (STATE_MACHS (sd) == NULL)
{
sim_io_printf (sd, "This target does not support any models\n");
return SIM_RC_FAIL;
}
for (machp = STATE_MACHS(sd); *machp != NULL; ++machp)
{
sim_io_printf (sd, "Models for architecture `%s':\n",
MACH_NAME (*machp));
@ -138,12 +145,15 @@ sim_model_set (SIM_DESC sd, sim_cpu *cpu, const SIM_MODEL *model)
Result is pointer to MODEL entry or NULL if not found. */
const SIM_MODEL *
sim_model_lookup (const char *name)
sim_model_lookup (SIM_DESC sd, const char *name)
{
const SIM_MACH * const *machp;
const SIM_MODEL *model;
for (machp = & sim_machs[0]; *machp != NULL; ++machp)
if (STATE_MACHS (sd) == NULL)
return NULL;
for (machp = STATE_MACHS (sd); *machp != NULL; ++machp)
{
for (model = MACH_MODELS (*machp); MODEL_NAME (model) != NULL; ++model)
{
@ -158,11 +168,14 @@ sim_model_lookup (const char *name)
Result is pointer to MACH entry or NULL if not found. */
const SIM_MACH *
sim_mach_lookup (const char *name)
sim_mach_lookup (SIM_DESC sd, const char *name)
{
const SIM_MACH * const *machp;
for (machp = & sim_machs[0]; *machp != NULL; ++machp)
if (STATE_MACHS (sd) == NULL)
return NULL;
for (machp = STATE_MACHS (sd); *machp != NULL; ++machp)
{
if (strcmp (MACH_NAME (*machp), name) == 0)
return *machp;
@ -174,11 +187,14 @@ sim_mach_lookup (const char *name)
Result is pointer to MACH entry or NULL if not found. */
const SIM_MACH *
sim_mach_lookup_bfd_name (const char *name)
sim_mach_lookup_bfd_name (SIM_DESC sd, const char *name)
{
const SIM_MACH * const *machp;
for (machp = & sim_machs[0]; *machp != NULL; ++machp)
if (STATE_MACHS (sd) == NULL)
return NULL;
for (machp = STATE_MACHS (sd); *machp != NULL; ++machp)
{
if (strcmp (MACH_BFD_NAME (*machp), name) == 0)
return *machp;
@ -209,7 +225,7 @@ sim_model_init (SIM_DESC sd)
&& ! CPU_MACH (cpu))
{
/* Set the default model. */
const SIM_MODEL *model = sim_model_lookup (WITH_DEFAULT_MODEL);
const SIM_MODEL *model = sim_model_lookup (sd, WITH_DEFAULT_MODEL);
SIM_ASSERT (model != NULL);
sim_model_set (sd, NULL, model);
}
@ -230,7 +246,8 @@ sim_model_init (SIM_DESC sd)
{
/* Use the default model for the selected machine.
The default model is the first one in the list. */
const SIM_MACH *mach = sim_mach_lookup_bfd_name (STATE_ARCHITECTURE (sd)->printable_name);
const SIM_MACH *mach =
sim_mach_lookup_bfd_name (sd, STATE_ARCHITECTURE (sd)->printable_name);
if (mach == NULL)
{
@ -247,12 +264,3 @@ sim_model_init (SIM_DESC sd)
return SIM_RC_OK;
}
#if !WITH_MODEL_P
/* Set up basic model support. This is a stub for ports that do not define
models. See sim-model.h for more details. */
const SIM_MACH * const sim_machs[] =
{
NULL
};
#endif

16
sim/common/sim-model.h
View file

@ -48,8 +48,6 @@ typedef struct {
#endif
#ifndef WITH_DEFAULT_MODEL
/* Just a stub for ports that do not define models. */
enum mach_attr { _MACH_NONE };
# define WITH_DEFAULT_MODEL NULL
# define WITH_MODEL_P 0
#else
@ -92,7 +90,7 @@ typedef struct {
/* This is the argument to bfd_scan_arch. */
const char *bfd_name;
#define MACH_BFD_NAME(m) ((m)->bfd_name)
enum mach_attr num;
int num;
#define MACH_NUM(m) ((m)->num)
int word_bitsize;
@ -136,19 +134,13 @@ typedef struct model {
#define MODEL_INIT(m) ((m)->init)
} SIM_MODEL;
/* Tables of supported machines. */
/* ??? In a simulator of multiple architectures, will need multiple copies of
this. Have an `archs' array that contains a pointer to the machs array
for each (which in turn has a pointer to the models array for each). */
extern const SIM_MACH * const sim_machs[];
/* Model module handlers. */
extern MODULE_INSTALL_FN sim_model_install;
/* Support routines. */
extern void sim_model_set (SIM_DESC sd_, sim_cpu *cpu_, const SIM_MODEL *model_);
extern const SIM_MODEL *sim_model_lookup (const char *name_);
extern const SIM_MACH *sim_mach_lookup (const char *name_);
extern const SIM_MACH *sim_mach_lookup_bfd_name (const char *bfd_name_);
extern const SIM_MODEL *sim_model_lookup (SIM_DESC, const char *name_);
extern const SIM_MACH *sim_mach_lookup (SIM_DESC, const char *name_);
extern const SIM_MACH *sim_mach_lookup_bfd_name (SIM_DESC, const char *bfd_name_);
#endif /* SIM_MODEL_H */

7
sim/cris/ChangeLog
View file

@ -1,3 +1,10 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Rename to ...
(cris_sim_machs): ... this.
* sim-if.c (cris_sim_machs): New decl.
(sim_open): Set STATE_MACH.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (stamp-v10fcpu): Do not insert cgen-ops.h include.

2
sim/cris/arch.c
View file

@ -24,7 +24,7 @@ This file is part of the GNU simulators.
#include "sim-main.h"
#include "bfd.h"
const SIM_MACH * const sim_machs[] =
const SIM_MACH * const cris_sim_machs[] =
{
#ifdef HAVE_CPU_CRISV10F
& crisv10_mach,

3
sim/cris/sim-if.c
View file

@ -608,6 +608,8 @@ cris_handle_interpreter (SIM_DESC sd, struct bfd *abfd)
return ok;
}
extern const SIM_MACH * const cris_sim_machs[];
/* Create an instance of the simulator. */
SIM_DESC
@ -656,6 +658,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
bfd_byte sp_init[4] = {0, 0, 0, 0};
/* Set default options before parsing user options. */
STATE_MACHS (sd) = cris_sim_machs;
current_target_byte_order = BFD_ENDIAN_LITTLE;
/* The cpu data is kept in a separately allocated chunk of memory. */

7
sim/frv/ChangeLog
View file

@ -1,3 +1,10 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Rename to ...
(frv_sim_machs): ... this.
* sim-if.c (frv_sim_machs): New decl.
(sim_open): Set STATE_MACH.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Mark const.

2
sim/frv/arch.c
View file

@ -24,7 +24,7 @@ This file is part of the GNU simulators.
#include "sim-main.h"
#include "bfd.h"
const SIM_MACH * const sim_machs[] =
const SIM_MACH * const frv_sim_machs[] =
{
#ifdef HAVE_CPU_FRVBF
& frv_mach,

3
sim/frv/sim-if.c
View file

@ -42,6 +42,8 @@ free_state (SIM_DESC sd)
sim_state_free (sd);
}
extern const SIM_MACH * const frv_sim_machs[];
/* Create an instance of the simulator. */
SIM_DESC
@ -54,6 +56,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, bfd *abfd,
SIM_DESC sd = sim_state_alloc (kind, callback);
/* Set default options before parsing user options. */
STATE_MACHS (sd) = frv_sim_machs;
current_alignment = STRICT_ALIGNMENT;
current_target_byte_order = BFD_ENDIAN_BIG;

7
sim/iq2000/ChangeLog
View file

@ -1,3 +1,10 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Rename to ...
(iq2000_sim_machs): ... this.
* sim-if.c (iq2000_sim_machs): New decl.
(sim_open): Set STATE_MACH.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Mark const.

2
sim/iq2000/arch.c
View file

@ -24,7 +24,7 @@ This file is part of the GNU simulators.
#include "sim-main.h"
#include "bfd.h"
const SIM_MACH * const sim_machs[] =
const SIM_MACH * const iq2000_sim_machs[] =
{
#ifdef HAVE_CPU_IQ2000BF
& iq2000_mach,

3
sim/iq2000/sim-if.c
View file

@ -50,6 +50,8 @@ free_state (SIM_DESC sd)
sim_state_free (sd);
}
extern const SIM_MACH * const iq2000_sim_machs[];
/* Create an instance of the simulator. */
SIM_DESC
@ -61,6 +63,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
SIM_DESC sd = sim_state_alloc (kind, callback);
/* Set default options before parsing user options. */
STATE_MACHS (sd) = iq2000_sim_machs;
current_alignment = STRICT_ALIGNMENT;
current_target_byte_order = BFD_ENDIAN_BIG;

7
sim/lm32/ChangeLog
View file

@ -1,3 +1,10 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Rename to ...
(lm32_sim_machs): ... this.
* sim-if.c (lm32_sim_machs): New decl.
(sim_open): Set STATE_MACH.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Mark const.

2
sim/lm32/arch.c
View file

@ -24,7 +24,7 @@ This file is part of the GNU simulators.
#include "sim-main.h"
#include "bfd.h"
const SIM_MACH * const sim_machs[] =
const SIM_MACH * const lm32_sim_machs[] =
{
#ifdef HAVE_CPU_LM32BF
& lm32_mach,

3
sim/lm32/sim-if.c
View file

@ -80,6 +80,8 @@ find_limit (SIM_DESC sd)
return (addr + 65536) & ~(0xffffUL);
}
extern const SIM_MACH * const lm32_sim_machs[];
/* Create an instance of the simulator. */
SIM_DESC
@ -92,6 +94,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
unsigned long base, limit;
/* Set default options before parsing user options. */
STATE_MACHS (sd) = lm32_sim_machs;
current_alignment = STRICT_ALIGNMENT;
current_target_byte_order = BFD_ENDIAN_BIG;

7
sim/m32r/ChangeLog
View file

@ -1,3 +1,10 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Rename to ...
(m32r_sim_machs): ... this.
* sim-if.c (m32r_sim_machs): New decl.
(sim_open): Set STATE_MACH.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Mark const.

2
sim/m32r/arch.c
View file

@ -24,7 +24,7 @@ This file is part of the GNU simulators.
#include "sim-main.h"
#include "bfd.h"
const SIM_MACH * const sim_machs[] =
const SIM_MACH * const m32r_sim_machs[] =
{
#ifdef HAVE_CPU_M32RBF
& m32r_mach,

3
sim/m32r/sim-if.c
View file

@ -44,6 +44,8 @@ free_state (SIM_DESC sd)
sim_state_free (sd);
}
extern const SIM_MACH * const m32r_sim_machs[];
/* Create an instance of the simulator. */
SIM_DESC
@ -55,6 +57,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
int i;
/* Set default options before parsing user options. */
STATE_MACHS (sd) = m32r_sim_machs;
current_alignment = STRICT_ALIGNMENT;
current_target_byte_order = BFD_ENDIAN_BIG;

7
sim/or1k/ChangeLog
View file

@ -1,3 +1,10 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Rename to ...
(or1k_sim_machs): ... this.
* sim-if.c (or1k_sim_machs): New decl.
(sim_open): Set STATE_MACH.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* arch.c (sim_machs): Mark const.

2
sim/or1k/arch.c
View file

@ -25,7 +25,7 @@ This file is part of the GNU simulators.
#include "sim-main.h"
#include "bfd.h"
const SIM_MACH * const sim_machs[] =
const SIM_MACH * const or1k_sim_machs[] =
{
#ifdef HAVE_CPU_OR1K32BF
& or32_mach,

3
sim/or1k/sim-if.c
View file

@ -150,6 +150,8 @@ or1k_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt, char *arg,
return SIM_RC_FAIL;
}
extern const SIM_MACH * const or1k_sim_machs[];
/* Create an instance of the simulator. */
SIM_DESC
@ -161,6 +163,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
int i;
/* Set default options before parsing user options. */
STATE_MACHS (sd) = or1k_sim_machs;
current_target_byte_order = BFD_ENDIAN_BIG;
/* The cpu data is kept in a separately allocated chunk of memory. */

7
sim/riscv/ChangeLog
View file

@ -1,3 +1,10 @@
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* interp.c (sim_open): Set STATE_MACHS.
(riscv_sim_machs): New decl.
* machs.c (sim_machs): Rename to ...
(riscv_sim_machs): ... this.
2021-06-29 Mike Frysinger <vapier@gentoo.org>
* machs.c (sim_machs): Mark const.

3
sim/riscv/interp.c
View file

@ -53,6 +53,8 @@ free_state (SIM_DESC sd)
sim_state_free (sd);
}
extern const SIM_MACH * const riscv_sim_machs[];
SIM_DESC
sim_open (SIM_OPEN_KIND kind, host_callback *callback,
struct bfd *abfd, char * const *argv)
@ -63,6 +65,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback,
sizeof (struct riscv_sim_state));
/* Set default options before parsing user options. */
STATE_MACHS (sd) = riscv_sim_machs;
current_target_byte_order = BFD_ENDIAN_LITTLE;
/* The cpu data is kept in a separately allocated chunk of memory. */

2
sim/riscv/machs.c
View file

@ -111,7 +111,7 @@ static const SIM_MACH rv128i_mach =
#endif
/* Order matters here. */
const SIM_MACH * const sim_machs[] =
const SIM_MACH * const riscv_sim_machs[] =
{
#if WITH_TARGET_WORD_BITSIZE >= 128
&rv128i_mach,