diff options
| -rw-r--r-- | sim/common/ChangeLog | 4 | ||||
| -rw-r--r-- | sim/common/cgen-run.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 91e254c..8472b2b 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,9 @@ 2021-06-27 Mike Frysinger <vapier@gentoo.org> + * cgen-run.c (engine_run_n): Assert cpu arguments are valid. + +2021-06-27 Mike Frysinger <vapier@gentoo.org> + * cgen-trace.h (cgen_trace_printf): Add ATTRIBUTE_PRINTF_2. (sim_disasm_sprintf): Likewise. diff --git a/sim/common/cgen-run.c b/sim/common/cgen-run.c index 1b097e1..0951c92 100644 --- a/sim/common/cgen-run.c +++ b/sim/common/cgen-run.c @@ -231,6 +231,9 @@ engine_run_n (SIM_DESC sd, int next_cpu_nr, int nr_cpus, int max_insns, int fast int i; ENGINE_FN *engine_fns[MAX_NR_PROCESSORS]; + SIM_ASSERT (nr_cpus <= MAX_NR_PROCESSORS); + SIM_ASSERT (next_cpu_nr >= 0 && next_cpu_nr < nr_cpus); + for (i = 0; i < nr_cpus; ++i) { SIM_CPU *cpu = STATE_CPU (sd, i); @@ -244,7 +247,7 @@ engine_run_n (SIM_DESC sd, int next_cpu_nr, int nr_cpus, int max_insns, int fast SIM_ENGINE_PREFIX_HOOK (sd); /* FIXME: proper cycling of all of them, blah blah blah. */ - while (next_cpu_nr != nr_cpus) + while (next_cpu_nr < nr_cpus) { SIM_CPU *cpu = STATE_CPU (sd, next_cpu_nr); |