sim: fully merge sim_state_base into sim_state

Now that all ports have migrated to the new framework, drop support
for the old sim_state_base layout.

diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index c02019fc3757fe117d78a8ff977aacd5ba5426a4..9555a524946af0f8345c7723992f184d423d2a25 100644 (file)
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/aarch64/sim-main.h b/sim/aarch64/sim-main.h
index f1f9e5cf681fd4d1e3d9e41e00c80ffc19679d46..14d54cff9dc4c9b0d9ebed80e4e1c241b005fceb 100644 (file)
--- a/sim/aarch64/sim-main.h
+++ b/sim/aarch64/sim-main.h
@@ -22,8 +22,6 @@
 #ifndef _SIM_MAIN_H
 #define _SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "sim-types.h"
 #include "sim-base.h"

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index f8aa04223c4e658bf0ac5997167a96502fc1edfc..5725c3b9289705bd1dfec2eaab3cbbc48cdc3cbd 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
index b47149441339a404210c227c9af31823c032b1b0..05135aed480f366b1eff4a80a39f82a2f65f2f2a 100644 (file)
--- a/sim/arm/sim-main.h
+++ b/sim/arm/sim-main.h
@@ -19,8 +19,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "sim-base.h"
 #include "bfd.h"

diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index a93bd599db026f9d07277a7aa390352e14179796..e7fbc5d4fa5cd3365b5f3711f6dd098d829a3cfa 100644 (file)
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (do_call): Change sd to avr_sim_state.

diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h
index 4f18882ae466fd95c69f47fb516a74a3540f4c42..42c36197bb9fabc95388ba2451f1f27954c3941a 100644 (file)
--- a/sim/avr/sim-main.h
+++ b/sim/avr/sim-main.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 
 #include "sim-base.h"

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index d5c55e07f453b71a7d2fd7cb21f53be56fc0182d..c4c38436ef1e8e61fd6d6e9f540be96376ad67a8 100644 (file)
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (sim_open): Call sim_state_alloc_extra.

diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
index 855a178bc4b43514d9e5cedb70ef3e3806e3af3a..18d0a00e0d64552da3475d9fa48de74249217715 100644 (file)
--- a/sim/bfin/sim-main.h
+++ b/sim/bfin/sim-main.h
@@ -21,8 +21,6 @@
 #ifndef _BFIN_MAIN_SIM_H_
 #define _BFIN_MAIN_SIM_H_
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "sim-signal.h"
 #include "arch.h"

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 3a6c31a07c045c548dbb68c3e271507715d1f40a..76bf134fa378e1178d96e939ecec86a5af19b053 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,40 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-base.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+       (struct sim_state_base): Merge into ...
+       (struct sim_state): ... this.
+       (STATE_MY_NAME): Delete base.
+       (STATE_OPEN_KIND): Likewise.
+       (STATE_CALLBACK): Likewise.
+       (STATE_ENVIRONMENT): Likewise.
+       (STATE_CONFIG): Likewise.
+       (STATE_MODULES): Likewise.
+       (STATE_OPTIONS): Likewise.
+       (STATE_VERBOSE_P): Likewise.
+       (STATE_TRACE_DATA): Likewise.
+       (STATE_ARCHITECTURE): Likewise.
+       (STATE_TARGET): Likewise.
+       (STATE_PROG_ARGV): Likewise.
+       (STATE_PROG_BFD): Likewise.
+       (STATE_PROG_SYMS): Likewise.
+       (STATE_PROG_SYMS_COUNT): Likewise.
+       (STATE_TEXT_SECTION): Likewise.
+       (STATE_TEXT_START): Likewise.
+       (STATE_TEXT_END): Likewise.
+       (STATE_START_ADDR): Likewise.
+       (STATE_SCACHE_SIZE): Likewise.
+       (STATE_CORE): Likewise.
+       (STATE_MEMOPT): Likewise.
+       (STATE_EVENTS): Likewise.
+       (STATE_ENGINE): Likewise.
+       (STATE_WATCHPOINTS): Likewise.
+       (STATE_HW): Likewise.
+       (STATE_LOAD_AT_LMA_P): Likewise.
+       (SIM_MAGIC_NUMBER): Likewise.
+       (STATE_MAGIC): Likewise.
+       * sim-utils.c (sim_state_alloc_extra): Delete check for
+       SIM_HAVE_COMMON_SIM_STATE.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * cgen-defs.h (STATE_RUN_FAST_P): Call STATE_CGEN_STATE.

diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index e552d94d02c54305b8e816af04a3ba8b9c5a47a0..7dbf2943385a3dc77a35973b7bd5d879b9030616 100644 (file)
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -90,147 +90,127 @@ typedef struct _sim_cpu sim_cpu;
 
 #ifdef CGEN_ARCH
 # include "cgen-sim.h"
-# define SIM_HAVE_COMMON_SIM_STATE
 #endif
 
-/* We require all sims to dynamically allocate cpus.  See comment up top about
-   struct sim_state.  */
+struct sim_state {
+  /* All the cpus for this instance.  */
+  sim_cpu *cpu[MAX_NR_PROCESSORS];
 #if (WITH_SMP)
 # define STATE_CPU(sd, n) ((sd)->cpu[n])
 #else
 # define STATE_CPU(sd, n) ((sd)->cpu[0])
 #endif
 
-
-typedef struct {
-
   /* Simulator's argv[0].  */
   const char *my_name;
-#define STATE_MY_NAME(sd) ((sd)->base.my_name)
+#define STATE_MY_NAME(sd) ((sd)->my_name)
 
   /* Who opened the simulator.  */
   SIM_OPEN_KIND open_kind;
-#define STATE_OPEN_KIND(sd) ((sd)->base.open_kind)
+#define STATE_OPEN_KIND(sd) ((sd)->open_kind)
 
   /* The host callbacks.  */
   struct host_callback_struct *callback;
-#define STATE_CALLBACK(sd) ((sd)->base.callback)
+#define STATE_CALLBACK(sd) ((sd)->callback)
 
   /* The type of simulation environment (user/operating).  */
   enum sim_environment environment;
-#define STATE_ENVIRONMENT(sd) ((sd)->base.environment)
+#define STATE_ENVIRONMENT(sd) ((sd)->environment)
 
 #if 0 /* FIXME: Not ready yet.  */
   /* Stuff defined in sim-config.h.  */
   struct sim_config config;
-#define STATE_CONFIG(sd) ((sd)->base.config)
+#define STATE_CONFIG(sd) ((sd)->config)
 #endif
 
   /* List of installed module `init' handlers.  */
   struct module_list *modules;
-#define STATE_MODULES(sd) ((sd)->base.modules)
+#define STATE_MODULES(sd) ((sd)->modules)
 
   /* Supported options.  */
   struct option_list *options;
-#define STATE_OPTIONS(sd) ((sd)->base.options)
+#define STATE_OPTIONS(sd) ((sd)->options)
 
   /* Non-zero if -v specified.  */
   int verbose_p;
-#define STATE_VERBOSE_P(sd) ((sd)->base.verbose_p)
+#define STATE_VERBOSE_P(sd) ((sd)->verbose_p)
 
   /* Non cpu-specific trace data.  See sim-trace.h.  */
   TRACE_DATA trace_data;
-#define STATE_TRACE_DATA(sd) (& (sd)->base.trace_data)
+#define STATE_TRACE_DATA(sd) (& (sd)->trace_data)
 
   /* If non NULL, the BFD architecture specified on the command line */
   const struct bfd_arch_info *architecture;
-#define STATE_ARCHITECTURE(sd) ((sd)->base.architecture)
+#define STATE_ARCHITECTURE(sd) ((sd)->architecture)
 
   /* If non NULL, the bfd target specified on the command line */
   const char *target;
-#define STATE_TARGET(sd) ((sd)->base.target)
+#define STATE_TARGET(sd) ((sd)->target)
 
   /* In standalone simulator, this is the program's arguments passed
      on the command line.  */
   char **prog_argv;
-#define STATE_PROG_ARGV(sd) ((sd)->base.prog_argv)
+#define STATE_PROG_ARGV(sd) ((sd)->prog_argv)
 
   /* The program's bfd.  */
   struct bfd *prog_bfd;
-#define STATE_PROG_BFD(sd) ((sd)->base.prog_bfd)
+#define STATE_PROG_BFD(sd) ((sd)->prog_bfd)
 
   /* Symbol table for prog_bfd */
   struct bfd_symbol **prog_syms;
-#define STATE_PROG_SYMS(sd) ((sd)->base.prog_syms)
+#define STATE_PROG_SYMS(sd) ((sd)->prog_syms)
 
   /* Number of prog_syms symbols.  */
   long prog_syms_count;
-#define STATE_PROG_SYMS_COUNT(sd) ((sd)->base.prog_syms_count)
+#define STATE_PROG_SYMS_COUNT(sd) ((sd)->prog_syms_count)
 
   /* The program's text section.  */
   struct bfd_section *text_section;
   /* Starting and ending text section addresses from the bfd.  */
   bfd_vma text_start, text_end;
-#define STATE_TEXT_SECTION(sd) ((sd)->base.text_section)
-#define STATE_TEXT_START(sd) ((sd)->base.text_start)
-#define STATE_TEXT_END(sd) ((sd)->base.text_end)
+#define STATE_TEXT_SECTION(sd) ((sd)->text_section)
+#define STATE_TEXT_START(sd) ((sd)->text_start)
+#define STATE_TEXT_END(sd) ((sd)->text_end)
 
   /* Start address, set when the program is loaded from the bfd.  */
   bfd_vma start_addr;
-#define STATE_START_ADDR(sd) ((sd)->base.start_addr)
+#define STATE_START_ADDR(sd) ((sd)->start_addr)
 
   /* Size of the simulator's cache, if any.
      This is not the target's cache.  It is the cache the simulator uses
      to process instructions.  */
   unsigned int scache_size;
-#define STATE_SCACHE_SIZE(sd) ((sd)->base.scache_size)
+#define STATE_SCACHE_SIZE(sd) ((sd)->scache_size)
 
   /* core memory bus */
-#define STATE_CORE(sd) (&(sd)->base.core)
+#define STATE_CORE(sd) (&(sd)->core)
   sim_core core;
 
   /* Record of memory sections added via the memory-options interface.  */
-#define STATE_MEMOPT(sd) ((sd)->base.memopt)
+#define STATE_MEMOPT(sd) ((sd)->memopt)
   sim_memopt *memopt;
 
   /* event handler */
-#define STATE_EVENTS(sd) (&(sd)->base.events)
+#define STATE_EVENTS(sd) (&(sd)->events)
   sim_events events;
 
   /* generic halt/resume engine */
   sim_engine engine;
-#define STATE_ENGINE(sd) (&(sd)->base.engine)
+#define STATE_ENGINE(sd) (&(sd)->engine)
 
   /* generic watchpoint support */
   sim_watchpoints watchpoints;
-#define STATE_WATCHPOINTS(sd) (&(sd)->base.watchpoints)
+#define STATE_WATCHPOINTS(sd) (&(sd)->watchpoints)
 
 #if WITH_HW
   struct sim_hw *hw;
-#define STATE_HW(sd) ((sd)->base.hw)
+#define STATE_HW(sd) ((sd)->hw)
 #endif
 
   /* Should image loads be performed using the LMA or VMA?  Older
      simulators use the VMA while newer simulators prefer the LMA. */
   int load_at_lma_p;
-#define STATE_LOAD_AT_LMA_P(SD) ((SD)->base.load_at_lma_p)
-
-  /* Marker for those wanting to do sanity checks.
-     This should remain the last member of this struct to help catch
-     miscompilation errors.  */
-  int magic;
-#define SIM_MAGIC_NUMBER 0x4242
-#define STATE_MAGIC(sd) ((sd)->base.magic)
-} sim_state_base;
-
-#ifdef SIM_HAVE_COMMON_SIM_STATE
-/* TODO: Merge sim_state & sim_state_base.  */
-struct sim_state {
-  /* All the cpus for this instance.  */
-  sim_cpu *cpu[MAX_NR_PROCESSORS];
-
-  /* All the common state.  */
-  sim_state_base base;
+#define STATE_LOAD_AT_LMA_P(SD) ((SD)->load_at_lma_p)
 
   /* Pointer for sim target to store arbitrary state data.  Normally the
      target should define a struct and use it here.  */
@@ -242,8 +222,14 @@ struct sim_state {
   CGEN_STATE cgen_state;
 #endif
 #define STATE_CGEN_STATE(sd) ((sd)->cgen_state)
+
+  /* Marker for those wanting to do sanity checks.
+     This should remain the last member of this struct to help catch
+     miscompilation errors.  */
+  int magic;
+#define SIM_MAGIC_NUMBER 0x4242
+#define STATE_MAGIC(sd) ((sd)->magic)
 };
-#endif
 
 /* Functions for allocating/freeing a sim_state.  */
 SIM_DESC sim_state_alloc_extra (SIM_OPEN_KIND kind, host_callback *callback,

diff --git a/sim/common/sim-utils.c b/sim/common/sim-utils.c
index 7a943756daf9fdee2abb53184adfe627f1257186..380afd0493fc9d34870a4cfa07e4d891e4d94484 100644 (file)
--- a/sim/common/sim-utils.c
+++ b/sim/common/sim-utils.c
@@ -57,10 +57,8 @@ sim_state_alloc_extra (SIM_OPEN_KIND kind, host_callback *callback,
   STATE_CALLBACK (sd) = callback;
   STATE_OPEN_KIND (sd) = kind;
 
-#ifdef SIM_HAVE_COMMON_SIM_STATE
   if (extra_bytes)
     STATE_ARCH_DATA (sd) = zalloc (extra_bytes);
-#endif
 
 #if 0
   {

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 84e0f8fed21b8777e1eb6f8421e0b5d2bef615ee..0a0fdcb150707b20c904a79f10c95d216a14b3c1 100644 (file)
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
index 7ea5b1d32802e9c872db3d4d17bf0744108e7a69..8765b779a4b8d486d345429762a9acbf515fed79 100644 (file)
--- a/sim/cr16/sim-main.h
+++ b/sim/cr16/sim-main.h
@@ -19,8 +19,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 
 typedef long int           word;

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 421faeb08965e18a012531ac307253ddf18786bc..e45bd3833b09ba38df0b1c8d11b93e516556e8ad 100644 (file)
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
index 83b34b06454d09b1940ff47ab21decd8ba7b54cb..6b5e668348af09b2cfb507962a79ddf6f85162ba 100644 (file)
--- a/sim/d10v/sim-main.h
+++ b/sim/d10v/sim-main.h
@@ -19,8 +19,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 
 typedef long int           word;

diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog
index e65ec6568c4410373f73ec80c79ae3f694082ec4..d8c1704d98ff68cd4f74d3e08c84149b3bff19e4 100644 (file)
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/example-synacor/sim-main.h b/sim/example-synacor/sim-main.h
index 32b33b4e90bf59522396c1e4478793120a2de326..121d62130b0d8eb129b61af238bc79e2b2e6a550 100644 (file)
--- a/sim/example-synacor/sim-main.h
+++ b/sim/example-synacor/sim-main.h
@@ -21,8 +21,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "sim-base.h"
 

diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index 256058ac89124d2a2beac305ae06b3377bbb5d51..ad8c8ae95b05f150fa551f61186d818b0ac20f19 100644 (file)
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h
index 8cf384ceb8b127b2b2b402526d962d671cba2381..6eb257110b21648c5fa06a7c2021a3beb9e5332f 100644 (file)
--- a/sim/ft32/sim-main.h
+++ b/sim/ft32/sim-main.h
@@ -21,8 +21,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "sim-base.h"
 #include "bfd.h"

diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 8ddbb548a41bf8ef747d56b8d016cb24ae97ee54..b6d91c84be82c26675abfeae23281da0eb789aae 100644 (file)
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * compile.c (h8_get_state): Change sd to H8300_SIM_STATE.

diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
index 57ff3071460202a8f1e60cc3cbba52140c2694c3..a0aa9ef1929a1f5c1cf9d097db269ffcd136b396 100644 (file)
--- a/sim/h8300/sim-main.h
+++ b/sim/h8300/sim-main.h
@@ -5,8 +5,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #define DEBUG
 
 /* These define the size of main memory for the simulator.

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index c8d117717ac053f89b2ea6a9d72c23fd1d4ebeca..e6db2c335c4ef2ec4c4a639d3cb241113f1690cf 100644 (file)
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index d72ede1aefa1e8268bd39557a64e3f069fafc636..955c69fb38d4cf9028b771b122d00d87121bb433 100644 (file)
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef _SIM_MAIN_H
 #define _SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "sim-signal.h"
 #include "sim-base.h"

diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 7a5453f61f1d4501baa8aa47b9c7a33f45c8657e..5680fc80e18cb64365b783a3622be9ca816320da 100644 (file)
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
index bfa28d045cea02792c29b1c44568b2beb136644a..2b5269a5f23e54514c0512817e776a82d02dff3d 100644 (file)
--- a/sim/mcore/sim-main.h
+++ b/sim/mcore/sim-main.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 
 typedef long int           word;

diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index f583623a43d69c71c5148cafef6311d92b47e9ab..5cd004d2fd78b9c26dd39639048fbbdff2170cd2 100644 (file)
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h
index d69d814252a44ea04368a0483b478e45f74f45bb..1b63746c524de0709f269a31e0b31e7f7a878b47 100644 (file)
--- a/sim/microblaze/sim-main.h
+++ b/sim/microblaze/sim-main.h
@@ -18,8 +18,6 @@
 #ifndef MICROBLAZE_SIM_MAIN
 #define MICROBLAZE_SIM_MAIN
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "microblaze.h"
 #include "sim-basics.h"
 #include "sim-base.h"

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index ca8a1fb68b19960f3813d6624d5df46d90c8c808..85ce1ac8c4f6564e1e1245882d965684f1ff2f83 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (sim_open): Switch to sim_state_alloc_extra.

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index 3c7ba271619efe7b2d6f4f9870027fcf244f9aa3..8c9abfa0b0b32cce691c08510edc5379104c5330 100644 (file)
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 /* MIPS uses an unusual format for floating point quiet NaNs.  */
 #define SIM_QUIET_NAN_NEGATED
 

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 75a447dedf1f5db8fbebf203a3eb3258865fe974..dbb5b6d5ac7eb31db447cae0fa7c1cb09cb6f91c 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 5bf068b51fa626864afa7c6d0b1fdb336be2d5ca..e184613860b5fb382e17e5bb1d3a1e05ea0ca05d 100644 (file)
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -22,8 +22,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #define SIM_ENGINE_HALT_HOOK(SD,LAST_CPU,CIA) 0 /* disable this hook */
 
 #include "sim-basics.h"

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index a8a46a6ab6e985dd124c8c7b9cb9dec5ee74a7e5..d2e07c57d303de56ff88484fb666c04117bd6b17 100644 (file)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
index 19b9475e98566260df7d30e189b305945ebc0a91..9a5d33a99433e041982d4f1a451a7df4ab6df4c9 100644 (file)
--- a/sim/moxie/sim-main.h
+++ b/sim/moxie/sim-main.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "sim-base.h"
 #include "bfd.h"

diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 1ea283ca052663efd6b0e4c183ce494afee60869..d20698104c2d2b3acc6abddad89964813ec36926 100644 (file)
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
index f98712c12e5c5e1bb61aa7333c4895a58fd869df..fdfa5d094560b32bff951ec758f15f0f55fe99c2 100644 (file)
--- a/sim/msp430/sim-main.h
+++ b/sim/msp430/sim-main.h
@@ -21,8 +21,6 @@
 #ifndef _MSP430_MAIN_SIM_H_
 #define _MSP430_MAIN_SIM_H_
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "sim-signal.h"
 #include "msp430-sim.h"

diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog
index 27a0f9e900844dc7f2ee32ab3000b4ca6ede8691..946ce04030b3dace774c725dc03e240579f53075 100644 (file)
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/pru/sim-main.h b/sim/pru/sim-main.h
index 49c54f4f467799308eb6104d13dd69e4ec1c6ca1..b7af230288002e9a74b07eed8c94c420ca134dc6 100644 (file)
--- a/sim/pru/sim-main.h
+++ b/sim/pru/sim-main.h
@@ -19,8 +19,6 @@
 #ifndef PRU_SIM_MAIN
 #define PRU_SIM_MAIN
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include <stdint.h>
 #include <stddef.h>
 #include "pru.h"

diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index e7cd0a36f51cabb56b720595ec2d4e108d7e1f3d..55fd61e47b5722c4f26de945bf8af1355e9b58c5 100644 (file)
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (sim_open): Call sim_state_alloc_extra.

diff --git a/sim/riscv/sim-main.h b/sim/riscv/sim-main.h
index fd095397df0354e05aea724369db8a907cc5c6bc..1088e5bd44f7b257abd0353bac8bf750a9cda872 100644 (file)
--- a/sim/riscv/sim-main.h
+++ b/sim/riscv/sim-main.h
@@ -21,8 +21,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "machs.h"
 #include "sim-base.h"

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index b031cd3d0dbc806ff84627398d564e140268894d..de3cdef726173c2f108ff4adda8894776bd70c26 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h
index 58c1436531f1bdb9e175fe0ed9bc2175ed491bb2..9453e62f6d2752cd268103281b0deffa9dae90be 100644 (file)
--- a/sim/sh/sim-main.h
+++ b/sim/sh/sim-main.h
@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 #include "sim-basics.h"
 #include "sim-base.h"
 

diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 82491e7a2d2fc525eec17ee1dd22ab5000a23d69..02e6bbdc2158153e77c58e43ac36a9dcf2738075 100644 (file)
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-17  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Delete.
+
 2021-05-17  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_HAVE_COMMON_SIM_STATE): Define.

diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
index 6dc5c44582b5b7adbd5d8c6a15a4cd152bbfb8e9..792af5602199717668ba9a62dd86daca5325c1a2 100644 (file)
--- a/sim/v850/sim-main.h
+++ b/sim/v850/sim-main.h
@@ -1,8 +1,6 @@
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-#define SIM_HAVE_COMMON_SIM_STATE
-
 /* The v850 has 32bit words, numbered 31 (MSB) to 0 (LSB) */
 
 #define WITH_TARGET_WORD_MSB 31