2000-08-15 Dave Brolley <brolley@redhat.com>

[deliverable/binutils-gdb.git] / sim / common / sim-resume.c

diff --git a/sim/common/sim-resume.c b/sim/common/sim-resume.c
index ebc9ce6740a4cf9abc8395c2afbc64f44136da94..8cf75d5d80f96613c49fa6bfaf948868cee6ba0d 100644 (file)
--- a/sim/common/sim-resume.c
+++ b/sim/common/sim-resume.c
@@ -18,8 +18,6 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include <signal.h>
-
 #include "sim-main.h"
 #include "sim-assert.h"
 
@@ -30,7 +28,7 @@ has_stepped (SIM_DESC sd,
             void *data)
 {
   ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
-  sim_engine_halt (sd, NULL, NULL, NULL_CIA, sim_stopped, SIGTRAP);
+  sim_engine_halt (sd, NULL, NULL, NULL_CIA, sim_stopped, SIM_SIGTRAP);
 }
 
 
@@ -56,23 +54,37 @@ sim_resume (SIM_DESC sd,
   if (step)
     engine->stepper = sim_events_schedule (sd, 1, has_stepped, sd);
 
-  /* run/resume the simulator */
-  /*   jmpval: 0 (initial use) start simulator
-               1               halt simulator
-               2               restart simulator
-             */
+  sim_module_resume (sd);
 
+  /* run/resume the simulator */
   engine->jmpbuf = &buf;
   jmpval = setjmp (buf);
-  if (jmpval == 0 || jmpval == 2)
+  if (jmpval == sim_engine_start_jmpval
+      || jmpval == sim_engine_restart_jmpval)
     {
       int last_cpu_nr = sim_engine_last_cpu_nr (sd);
       int next_cpu_nr = sim_engine_next_cpu_nr (sd);
-      int nr_cpus = MAX_NR_PROCESSORS; /* FIXME */
+      int nr_cpus = sim_engine_nr_cpus (sd);
+
       sim_events_preprocess (sd, last_cpu_nr >= nr_cpus, next_cpu_nr >= nr_cpus);
       if (next_cpu_nr >= nr_cpus)
        next_cpu_nr = 0;
-      sim_engine_run (sd, next_cpu_nr, siggnal);
+
+      /* Only deliver the siggnal ]sic] the first time through - don't
+         re-deliver any siggnal during a restart. */
+      if (jmpval == sim_engine_restart_jmpval)
+       siggnal = 0;
+
+#ifdef SIM_CPU_EXCEPTION_RESUME
+      {
+       sim_cpu* cpu = STATE_CPU (sd, next_cpu_nr);
+       SIM_CPU_EXCEPTION_RESUME(sd, cpu, siggnal);
+      }
+#endif
+
+      sim_engine_run (sd, next_cpu_nr, nr_cpus, siggnal);
     }
   engine->jmpbuf = NULL;
+
+  sim_module_suspend (sd);
 }