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.

57 files changed, 156 insertions, 35 deletions

diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index d328fcd..be8cafb 100644
--- 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 25c3f2e..fae2b7a 100644
--- 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 c4f87e3..1d0d528 100644
--- 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 5fc753a..c89efe4 100644
--- 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 8e9a27d..60c54fa 100644
--- 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 cce84a9..c806f4c 100644
--- 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 2f36317..2a48fe1 100644
--- 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 ceb5939..747898c 100644
--- 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 89db85d..79b6692 100644
--- 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 ad75ac4..c2c01fc 100644
--- 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 ca0829c..dd4391e 100644
--- 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 a00846c..552e48c 100644
--- 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 f195a61..7648ba5 100644
--- 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 4ab5fb4..274d89f 100644
--- 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 cff7b88..f0e0f76 100644
--- 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 4590798..1efd0a5 100644
--- 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 787896c..9914912 100644
--- 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 835c1a9..e05746f 100644
--- 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 276c76b..4fa2069 100644
--- 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 801175b..4e664e2 100644
--- 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 a422fbd..d2080b6 100644
--- 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 a067ff8..1ec0597 100644
--- 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 9351f79..65e2937 100644
--- 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 236d0e6..6d6ef90 100644
--- 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 1b3db9b..ba2297f 100644
--- 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 2b2c6a7..806f053 100644
--- 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 c8060b2..fb0e51b 100644
--- 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 95ad2a8..4cace11 100644
--- 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 158c6e7..4db2e4d 100644
--- 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 92e86af..32766f0 100644
--- 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 398eb60..c97a451 100644
--- 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 3252bde..123bcf4 100644
--- 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 42cf728..8d9f432 100644
--- 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 1ec27ec..8a35a0c 100644
--- 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 7dc8e25..91d4d25 100644
--- 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 20a75d6..00da881 100644
--- 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 9981517..09e005f 100644
--- 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 122b064..48b264c 100644
--- 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 8a9dbc3..2bd067c 100644
--- 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 6d515f8..b158074 100644
--- 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 55b089d..64259cc 100644
--- 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 9b3a9c5..5638b86 100644
--- 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 1c9c690..55e9e21 100644
--- 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 95ddb4f..7814bcf 100644
--- 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 da97397..5da13f7 100644
--- 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 69faefd..80bd1b2 100644
--- 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 ea7a157..4e213f9 100644
--- 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 934a9d6..710bb22 100644
--- 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 b5258a8..41dbaae 100644
--- 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 a22bf17..d00bf5f 100644
--- 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 2933075..8d247f3 100644
--- 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 40e6d94..f69e4e9 100644
--- 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 1bf60a4..6192b6d 100644
--- 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 cbf84a9..8a62318 100644
--- 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 872bfe2..7b9dd52 100644
--- 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 4488b2e..4607063 100644
--- 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 76ecab7..e72dab6 100644
--- 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 */