sim: cgen: move cgen_cpu_max_extra_bytes logic into the common code

Every arch handles this the same way, so move it to the common code.
This will also make unifying the sim_cpu structure easier.

diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index d328fcddf6e4856132767990d8787da03d5a95c3..be8cafb5b38c93b38ff02b7fa697204ee678fe7b 100644 (file)
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-07  Jim Wilson  <jimw@sifive.com>
 
        PR sim/27483

diff --git a/sim/aarch64/interp.c b/sim/aarch64/interp.c
index 25c3f2e8570a47b9ee9628d6e9baab31752480b5..fae2b7a06bbd953bacf2aeade9ecdb8ff00aa036 100644 (file)
--- a/sim/aarch64/interp.c
+++ b/sim/aarch64/interp.c
@@ -329,7 +329,7 @@ sim_open (SIM_OPEN_KIND                  kind,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* Perform the initialization steps one by one.  */
-  if (sim_cpu_alloc_all (sd, 1, 0) != SIM_RC_OK
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK
       || sim_pre_argv_init (sd, argv[0]) != SIM_RC_OK
       || sim_parse_args (sd, argv) != SIM_RC_OK
       || sim_analyze_program (sd,

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index c4f87e374b488bae1150839748284a98de5e482c..1d0d52872ceb7a0318e90255758087faf5a109ad 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * wrapper.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 5fc753a71af2940fcb6a32676c96b2c47fa2f965..c89efe4ee971dd69424e164cb70679ea72125507 100644 (file)
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -800,7 +800,7 @@ sim_open (SIM_OPEN_KIND kind,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 8e9a27d2129470e51832c832ae31ac70cb96b839..60c54faea2cfd381732c5d6ae6a5ca56076258d6 100644 (file)
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/avr/interp.c b/sim/avr/interp.c
index cce84a97f220fb23cd5bc86cef64b39ba7f34623..c806f4c46eba330e58f2d538c2b759f068f30c9b 100644 (file)
--- a/sim/avr/interp.c
+++ b/sim/avr/interp.c
@@ -1684,7 +1684,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 2f363175c64836bfa57ae22428ff7a545f44060f..2a48fe102a35d438e0bab23090c8802586a50b97 100644 (file)
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c
index ceb5939f4e6b10281a6c426d8020d1ad294f3545..747898ceff5d791d24edba80af3a59acd9bd7905 100644 (file)
--- a/sim/bfin/interp.c
+++ b/sim/bfin/interp.c
@@ -723,7 +723,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback,
   SIM_DESC sd = sim_state_alloc (kind, callback);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index 89db85dd7c48f59ba7d7c2b04372c5a845f14b5c..79b6692086091b54ded8800d877708c06ed5ab0f 100644 (file)
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-if.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Tom Tromey  <tom@tromey.com>
 
        * bpf.c (bpf_def_model_init): Use new-style declaration.

diff --git a/sim/bpf/sim-if.c b/sim/bpf/sim-if.c
index ad75ac4affa6e35faaaf2c5faf658f7613e5b004..c2c01fc547a0d3c73d10b9b32025f8ff70e3d987 100644 (file)
--- a/sim/bpf/sim-if.c
+++ b/sim/bpf/sim-if.c
@@ -122,8 +122,7 @@ sim_open (SIM_OPEN_KIND kind,
 
   SIM_DESC sd = sim_state_alloc (kind, callback);
 
-  if (sim_cpu_alloc_all (sd, 1, cgen_cpu_max_extra_bytes ())
-      != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     goto error;
 
   if (sim_pre_argv_init (sd, argv[0]) != SIM_RC_OK)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index ca0829cd63183d500d47a0c7b89c383d1c7ca100..dd4391e36d911465e61b345ed1a279bb0c70a0f1 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,12 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-cpu.c (sim_cpu_alloc_all): Delete 3rd arg.  Delete 2nd arg to
+       sim_cpu_alloc.
+       (sim_cpu_alloc): Move extra_bytes to local var.  Add result of
+       cgen_cpu_max_extra_bytes.
+       * sim-cpu.h (sim_cpu_alloc_all): Delete 3rd arg.
+       (sim_cpu_alloc): Delete 2nd arg.
+
 2021-04-08  Tom Tromey  <tom@tromey.com>
 
        * cgen-utils.c (RORQI, ROLQI, RORHI, ROLHI, RORSI, ROLSI): Use

diff --git a/sim/common/sim-cpu.c b/sim/common/sim-cpu.c
index a00846cd4c6a62b0a1869eccec58b4b06e7e3b97..552e48c197073f9e98276120a32115f0c8599537 100644 (file)
--- a/sim/common/sim-cpu.c
+++ b/sim/common/sim-cpu.c
@@ -23,17 +23,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "bfd.h"
 
 /* Allocate space for all cpus in the simulator.
-   Space for the cpu must currently exist prior to parsing ARGV.
-   EXTRA_BYTES is additional space to allocate for the sim_cpu struct.  */
+   Space for the cpu must currently exist prior to parsing ARGV.  */
 /* ??? wip.  better solution must wait.  */
 
 SIM_RC
-sim_cpu_alloc_all (SIM_DESC sd, int ncpus, int extra_bytes)
+sim_cpu_alloc_all (SIM_DESC sd, int ncpus)
 {
   int c;
 
   for (c = 0; c < ncpus; ++c)
-    STATE_CPU (sd, c) = sim_cpu_alloc (sd, extra_bytes);
+    STATE_CPU (sd, c) = sim_cpu_alloc (sd);
   return SIM_RC_OK;
 }
 
@@ -41,8 +40,14 @@ sim_cpu_alloc_all (SIM_DESC sd, int ncpus, int extra_bytes)
    EXTRA_BYTES is additional space to allocate for the sim_cpu struct.  */
 
 sim_cpu *
-sim_cpu_alloc (SIM_DESC sd, int extra_bytes)
+sim_cpu_alloc (SIM_DESC sd)
 {
+  int extra_bytes = 0;
+
+#ifdef CGEN_ARCH
+  extra_bytes += cgen_cpu_max_extra_bytes ();
+#endif
+
   return zalloc (sizeof (sim_cpu) + extra_bytes);
 }
 

diff --git a/sim/common/sim-cpu.h b/sim/common/sim-cpu.h
index f195a6144c69a691f1e4a34c9766b37c66cf512c..7648ba50e9f92c538844d2bbd5a4c30bc4f3a8fb 100644 (file)
--- a/sim/common/sim-cpu.h
+++ b/sim/common/sim-cpu.h
@@ -123,9 +123,9 @@ typedef struct {
 } sim_cpu_base;
 
 /* Create all cpus.  */
-extern SIM_RC sim_cpu_alloc_all (SIM_DESC, int, int);
+extern SIM_RC sim_cpu_alloc_all (SIM_DESC, int);
 /* Create a cpu.  */
-extern sim_cpu *sim_cpu_alloc (SIM_DESC, int);
+extern sim_cpu *sim_cpu_alloc (SIM_DESC);
 /* Release resources held by all cpus.  */
 extern void sim_cpu_free_all (SIM_DESC);
 /* Release resources held by a cpu.  */

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 4ab5fb4019d0b702a152044246a54d2d497b4a73..274d89fdb7d92f916b4332c3e133098116147b8d 100644 (file)
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index cff7b8857189e34a49a4ccfa36e653d90b4b5a4c..f0e0f76224adb802bc26a80d7b0708be831b5a69 100644 (file)
--- a/sim/cr16/interp.c
+++ b/sim/cr16/interp.c
@@ -397,7 +397,7 @@ sim_open (SIM_OPEN_KIND kind, struct host_callback_struct *cb,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 45907986303d2a07db2edc788585bc5fd86d490b..1efd0a549321368c83a357fdf9ee7105e009d77e 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-if.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Tom Tromey  <tom@tromey.com>
 
        * traps.c: Include stdlib.h.

diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c
index 787896cae23364e24ea814a7ab50217a8c41b410..9914912b156b32373c006d1690a64a736d48eaf4 100644 (file)
--- a/sim/cris/sim-if.c
+++ b/sim/cris/sim-if.c
@@ -659,7 +659,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
   bfd_byte sp_init[4] = {0, 0, 0, 0};
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, cgen_cpu_max_extra_bytes ()) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 835c1a9f8b2c13500d80a78631a9567a94b455d7..e05746f6f15d0ff33773e4b5a6253a243cff48b0 100644 (file)
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 276c76beab0930a8f14f3271a4889f703df01a5a..4fa2069fda14326c72b09e2fe028a01ba4347de5 100644 (file)
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -751,7 +751,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog
index 801175b888e96aa15419bbee19ad5a811513e5f9..4e664e2a14ad9e1f8b4c45564f20544fd6cdaff2 100644 (file)
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-03  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac, interp.c, Makefile.in, README, README.arch-spec,

diff --git a/sim/example-synacor/interp.c b/sim/example-synacor/interp.c
index a422fbde9b48ed8a34b5f176585c9df384a641a3..d2080b6f7f22fa059d830ee5515e6df5182d2903 100644 (file)
--- a/sim/example-synacor/interp.c
+++ b/sim/example-synacor/interp.c
@@ -82,7 +82,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback,
   SIM_DESC sd = sim_state_alloc (kind, callback);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index a067ff80c3e3c74a204a1d84bfb537b8a133ad1b..1ec05977f695de6feee86ff917d9a5ab3070fca2 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-if.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Tom Tromey  <tom@tromey.com>
 
        * traps.c: Include stdlib.h.

diff --git a/sim/frv/sim-if.c b/sim/frv/sim-if.c
index 9351f79e053f46e497c716054514379a1c8ad3bf..65e293753691988e4b1641adbb13e3ae569e7895 100644 (file)
--- a/sim/frv/sim-if.c
+++ b/sim/frv/sim-if.c
@@ -52,7 +52,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, bfd *abfd,
   SIM_DESC sd = sim_state_alloc (kind, callback);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, cgen_cpu_max_extra_bytes ()) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index 236d0e61fbc3f8eecc033cbdc032c60c60695013..6d6ef90c14f114a99fd948f89001d680425116a2 100644 (file)
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/ft32/interp.c b/sim/ft32/interp.c
index 1b3db9bc00825fa07c506bdcd56660e5f467ff2c..ba2297f4078e53862b0f0b4b8520b3055088fb49 100644 (file)
--- a/sim/ft32/interp.c
+++ b/sim/ft32/interp.c
@@ -807,7 +807,7 @@ sim_open (SIM_OPEN_KIND kind,
   SIM_DESC sd = sim_state_alloc (kind, cb);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 2b2c6a73fc06fdc2a5637b279d27d1be05f3b74e..806f05332d8d694c02315bac7768d8c6897bbc59 100644 (file)
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * compile.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Tom Tromey  <tom@tromey.com>
 
        * compile.c (init_pointers): Fix sequence point warning.

diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c
index c8060b27ab75333b80334438916a09d1a232a04b..fb0e51b2e58d381c26296fae805dff3fca1bed7a 100644 (file)
--- a/sim/h8300/compile.c
+++ b/sim/h8300/compile.c
@@ -4659,7 +4659,7 @@ sim_open (SIM_OPEN_KIND kind,
   sd = sim_state_alloc (kind, callback);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 95ad2a8ce6e32f77db989b1d260c5d6f2efff8e0..4cace111f636f6794561cc222c73aedddc0547a1 100644 (file)
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-if.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Tom Tromey  <tom@tromey.com>
 
        * iq2000.c: Include stdlib.h.

diff --git a/sim/iq2000/sim-if.c b/sim/iq2000/sim-if.c
index 158c6e7574a81005cd69916455c454c95e976d63..4db2e4d9b06033349ab85c1b8843402ca651039d 100644 (file)
--- a/sim/iq2000/sim-if.c
+++ b/sim/iq2000/sim-if.c
@@ -58,7 +58,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
   SIM_DESC sd = sim_state_alloc (kind, callback);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, cgen_cpu_max_extra_bytes ()) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 92e86af34a69aeb39b04aa453057e3656cfd08b8..32766f07950d9770985f77336ebf270ef58b6d8c 100644 (file)
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-if.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Tom Tromey  <tom@tromey.com>
 
        * sim-if.c (sim_open, sim_create_inferior): Use new-style

diff --git a/sim/lm32/sim-if.c b/sim/lm32/sim-if.c
index 398eb60c67ad417ade313b262b2b22ad636b1609..c97a45129dc8ee0ea16109f59452861721567a0e 100644 (file)
--- a/sim/lm32/sim-if.c
+++ b/sim/lm32/sim-if.c
@@ -89,7 +89,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
   unsigned long base, limit;
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, cgen_cpu_max_extra_bytes ()) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 3252bdea457e7480f739c23d4624141080d6b668..123bcf4fb1965130e88b2c61e9d2cd389e5ef588 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-if.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Tom Tromey  <tom@tromey.com>
 
        * traps.c: Include stdlib.h.

diff --git a/sim/m32r/sim-if.c b/sim/m32r/sim-if.c
index 42cf728e79e53c86fc6c1aaac0d88658151dbe57..8d9f4324c9cd85a3d6b7352647afa4b5d0d4b14a 100644 (file)
--- a/sim/m32r/sim-if.c
+++ b/sim/m32r/sim-if.c
@@ -52,7 +52,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
   int i;
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, cgen_cpu_max_extra_bytes ()) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 1ec27ec1b68f9b1f1759bf661b6a9ad18599ede1..8a35a0cb5bf6f8a7a45f74ed457d718b4e958a90 100644 (file)
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/m68hc11/interp.c b/sim/m68hc11/interp.c
index 7dc8e25c0462f465d69e2a82c8707fe57aab0b7e..91d4d25b322a7abc9acccda84e229dd8831d2489 100644 (file)
--- a/sim/m68hc11/interp.c
+++ b/sim/m68hc11/interp.c
@@ -404,7 +404,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 20a75d6000c83f061850dd7ce0551c59eeec2a6e..00da8817104337e9c48ac76d8af8563fef1ce3d2 100644 (file)
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c
index 9981517e1e696566239e7bb5810450d90dc02c9d..09e005f1d394b72ff5a91605594fc3a43082320c 100644 (file)
--- a/sim/mcore/interp.c
+++ b/sim/mcore/interp.c
@@ -1349,7 +1349,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 122b064e315bcb888bf324fb41f9bf11cdf1eb3a..48b264c713db61058fa7b11acc520be021f12f85 100644 (file)
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c
index 8a9dbc3245aea52b698c9f6437c381838f0b3c48..2bd067c6dc51f61d035b27cc492d27d94bd76fe4 100644 (file)
--- a/sim/microblaze/interp.c
+++ b/sim/microblaze/interp.c
@@ -393,7 +393,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 6d515f80486c4af2daaf67459dc3a6cc9c36cbc1..b1580749668d1744a4dd10ae33ffc503c5d996b6 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * Makefile.in: Set ASAN_OPTIONS when running igen.

diff --git a/sim/mips/interp.c b/sim/mips/interp.c
index 55b089dbee935cd9eedb1cbe8094b67292b39463..64259cc3fed433731da95ccf6a096cc268a8591f 100644 (file)
--- a/sim/mips/interp.c
+++ b/sim/mips/interp.c
@@ -350,7 +350,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     return 0;
 
   cpu = STATE_CPU (sd, 0); /* FIXME */

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 9b3a9c581342c5f26c54e096cfa6b37be22ea355..5638b8621ef2014094edb0f0d72cfaaf3fd412b0 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * Makefile.in: Set ASAN_OPTIONS when running igen.

diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c
index 1c9c6905afcb54ce5aa7bd8cc464f6f708ceec29..55e9e212fe7a68f711c36c03f59f45cedf49ab2c 100644 (file)
--- a/sim/mn10300/interp.c
+++ b/sim/mn10300/interp.c
@@ -93,7 +93,7 @@ sim_open (SIM_OPEN_KIND kind,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     return 0;
 
   /* for compatibility */

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 95ddb4fa3b381ed18b0efb9e20eff2d01cce45d0..7814bcfd73549798eacc7a5e2f9c3b6b52f9f3e3 100644 (file)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Luis Machado  <luis.machado@linaro.org>
 
        * Makefile.in (moxie-gdb.dtb): Add maintainer mode dependency.

diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index da97397c506020928a78489de88f36cb0bde64c8..5da13f7808cb0c2b34256b12986d1123a852492b 100644 (file)
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -1197,7 +1197,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 69faefd411541dbd11d53b07465b9e9245e1d31a..80bd1b2a23193a304838c104f6116ca4b310c078 100644 (file)
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * msp430-sim.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/msp430/msp430-sim.c b/sim/msp430/msp430-sim.c
index ea7a157231cf95d26f4ea88fddd93bc04f0a9515..4e213f978c6b28375a21a2624b074fd963833d4e 100644 (file)
--- a/sim/msp430/msp430-sim.c
+++ b/sim/msp430/msp430-sim.c
@@ -110,7 +110,7 @@ sim_open (SIM_OPEN_KIND kind,
 
   /* Initialise the simulator.  */
 
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       sim_state_free (sd);
       return 0;

diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index 934a9d6e926abc2f578cdb39de97fb8ad8472e2d..710bb223f7b0279b6e4af8701eef347825c46f94 100644 (file)
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-if.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/or1k/sim-if.c b/sim/or1k/sim-if.c
index b5258a828a5fc32d721c614f5f25d33babb931f9..41dbaaebf1ddaa57a80acaaf44d9e5ecba63c792 100644 (file)
--- a/sim/or1k/sim-if.c
+++ b/sim/or1k/sim-if.c
@@ -158,7 +158,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
   int i;
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, cgen_cpu_max_extra_bytes ()) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog
index a22bf17ce9adcc9c7510cc719b1ef645de130044..d00bf5fc47fff2b036ac9849da6d367e32be04a9 100644 (file)
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/pru/interp.c b/sim/pru/interp.c
index 2933075bd08f2c75788e68be2e6aa207f3021937..8d247f3795f289d0712be123666d2af60c3d67b7 100644 (file)
--- a/sim/pru/interp.c
+++ b/sim/pru/interp.c
@@ -744,7 +744,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index 40e6d94b29f928cf8ccfd3e50b67da0348d690be..f69e4e9567692c10730746124af2daf32676a0b9 100644 (file)
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/riscv/interp.c b/sim/riscv/interp.c
index 1bf60a43aec40579184a4673cbe48f269d6968d4..6192b6dc5b23ad1189ce0821f9466c2a00a255ef 100644 (file)
--- a/sim/riscv/interp.c
+++ b/sim/riscv/interp.c
@@ -61,7 +61,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback,
   SIM_DESC sd = sim_state_alloc (kind, callback);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index cbf84a9f1989fa7c5dd0049ede660b22d10db90d..8a62318bbf06f03f1a867cf22019ca55dac291d8 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-02  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, configure: Regenerate.

diff --git a/sim/sh/interp.c b/sim/sh/interp.c
index 872bfe28893697e05789608f6709bcab9167dcbd..7b9dd521c87094fab7fd31d06238ef37dc470e8e 100644 (file)
--- a/sim/sh/interp.c
+++ b/sim/sh/interp.c
@@ -2361,7 +2361,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     {
       free_state (sd);
       return 0;

diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 4488b2eb7723b8a88e9db5e9c188d2ec8d8156ab..460706312c0890fdd18a8e0f724ac96d3e1b7354 100644 (file)
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
+
 2021-04-08  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * Makefile.in: Set ASAN_OPTIONS when running igen.

diff --git a/sim/v850/interp.c b/sim/v850/interp.c
index 76ecab7f7bfddfe91d4c46676f535d60216ef00c..e72dab645dd94cf4024c864a82a5955b8840cc97 100644 (file)
--- a/sim/v850/interp.c
+++ b/sim/v850/interp.c
@@ -195,7 +195,7 @@ sim_open (SIM_OPEN_KIND    kind,
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1, /*cgen_cpu_max_extra_bytes ()*/0) != SIM_RC_OK)
+  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
     return 0;
 
   /* for compatibility */