Commit: c3a6afca56427ce606cdc8e8e9f0ffbc1e9fd6cd - binutils_gdb (git)

Commit MetaInfo

• Revision: c3a6afca56427ce606cdc8e8e9f0ffbc1e9fd6cd (tree)
• Time: 2015-11-21 03:06:53
• Author: Yoshinori Sato <ysato@sa76...>
• Commiter: Yoshinori Sato

Log Message

Use generic sim functions

Change Summary

• modified: sim/h8300/compile.c

Incremental Difference

--- a/sim/h8300/compile.c
+++ b/sim/h8300/compile.c
@@ -2029,6 +2029,8 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
   enum sim_stop reason;
   int sigrc;
   int vector;
+  sim_engine *engine = STATE_ENGINE (sd);
+  jmp_buf buf;
 
   init_pointers (sd);
 
@@ -2062,6 +2064,10 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
   oldmask = h8_get_mask (sd);
   if (!h8300hmode || h8300_normal_mode)
     h8_set_mask (sd, 0xffff);
+  sim_module_resume (sd);
+  engine->jmpbuf = &buf;
+  if (setjmp (buf) == sim_engine_halt_jmpval)
+    goto quit;
   do
     {
       unsigned short cidx;
@@ -4690,12 +4696,13 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
       if (--poll_count < 0)
 	{
 	  poll_count = POLL_QUIT_INTERVAL;
-	  if ((*sim_callback->poll_quit) != NULL
-	      && (*sim_callback->poll_quit) (sim_callback))
-	    sim_engine_set_run_state (sd, sim_stopped, SIGINT);
+	  if (sim_events_tick(sd))
+	    sim_events_process (sd);
 	}
       sim_engine_get_run_state (sd, &reason, &sigrc);
     } while (reason == sim_running);
+ quit:
+  sim_module_suspend (sd);
 
   h8_set_ticks (sd, h8_get_ticks (sd) + get_now () - tick_start);
   h8_set_cycles (sd, h8_get_cycles (sd) + cycles);