diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-28 21:42:56 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-30 01:52:51 -0400 |
| commit | 1c636da093f335cd57e7fca0fc25ae9f9e849264 (patch) | |
| tree | e33d33c678ae988d2ad31027bb2b23c8f009e34e /sim/bpf | |
| parent | f8261de1b22cc1a72ae18a2300df8b2cf7f027db (diff) | |
| download | gdb-1c636da093f335cd57e7fca0fc25ae9f9e849264.zip gdb-1c636da093f335cd57e7fca0fc25ae9f9e849264.tar.gz gdb-1c636da093f335cd57e7fca0fc25ae9f9e849264.tar.bz2 | |
sim: namespace sim_machs
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.
Diffstat (limited to 'sim/bpf')
| -rw-r--r-- | sim/bpf/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/bpf/arch.c | 2 | ||||
| -rw-r--r-- | sim/bpf/sim-if.c | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog index 2d847bb..959c63f 100644 --- a/sim/bpf/ChangeLog +++ b/sim/bpf/ChangeLog @@ -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. diff --git a/sim/bpf/arch.c b/sim/bpf/arch.c index 8ceaa34..c9f98c5 100644 --- a/sim/bpf/arch.c +++ b/sim/bpf/arch.c @@ -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, diff --git a/sim/bpf/sim-if.c b/sim/bpf/sim-if.c index 436cc86..150f5cd 100644 --- a/sim/bpf/sim-if.c +++ b/sim/bpf/sim-if.c @@ -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; |