Re: [preliminary patch] sim/h8300/compile.c: abort when abort is called.

[Michael Snyder <msnyder@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

Andrew Cagney wrote:
>> Hi,
>>
>> Attached is a patch to teach the h8300 simulator to abort when abort
>> is called.  Without this, I get spurious XPASS when testing gcc.
>> Although the patched simulator works, my gut feeling is telling me
>> that there should be a better way to do this.  Any thought?
> 
> 
> Yes.  Generally speaking, the simulators should not call abort.  Instead 
> they should, some how, stop the simulation and return to the caller. 
> That statement looks to be trying to do just that.  I think MichaelS 
> recently changed sim/common to, for the h8300 do a correct exit.

Yeah, and I didn't think about the stop signal, but it seems
like we're ready to do that too.  Kazu, try this, and with your
approval I'll check it in.


[-- Attachment #2: signals --]
[-- Type: text/plain, Size: 1826 bytes --]

2003-06-24  Michael Snyder  <msnyder@redhat.com>

	* sim-main.h (SIM_WIFSTOPPED, SIM_WSTOPSIG): Define.
	* compile.c (sim_resume): Use the above to return stop signal.

Index: sim-main.h
===================================================================
RCS file: /cvs/cvsfiles/devo/sim/h8sx/sim-main.h,v
retrieving revision 1.13
diff -p -r1.13 sim-main.h
*** sim-main.h	2003/06/18 11:51:39	1.13
--- sim-main.h	2003/06/24 22:13:22
*************** struct sim_state {
*** 164,170 ****
  /* Local version of macros for decoding exit status.  
     (included here rather than try to find target version of wait.h)
  */
! #define SIM_WIFEXITED(V) (((V) & 0xff) == 0)
! #define SIM_WEXITSTATUS(V) ((V) >> 8)
  
  #endif /* SIM_MAIN_H */
--- 164,172 ----
  /* Local version of macros for decoding exit status.  
     (included here rather than try to find target version of wait.h)
  */
! #define SIM_WIFEXITED(V)	(((V) & 0xff) == 0)
! #define SIM_WIFSTOPPED(V)	(!SIM_WIFEXITED (V))
! #define SIM_WEXITSTATUS(V)	(((V) >> 8) & 0xff)
! #define SIM_WSTOPSIG(V)		((V) & 0x7f)
  
  #endif /* SIM_MAIN_H */
Index: compile.c
===================================================================
RCS file: /cvs/cvsfiles/devo/sim/h8sx/compile.c,v
retrieving revision 1.84
diff -p -r1.84 compile.c
*** compile.c	2003/06/19 04:18:52	1.84
--- compile.c	2003/06/24 22:13:22
*************** sim_resume (SIM_DESC sd, int step, int s
*** 3575,3580 ****
--- 3575,3586 ----
  	      sim_engine_set_run_state (sd, sim_exited, 
  					SIM_WEXITSTATUS (h8_get_reg (sd, 0)));
  	    }
+ 	  else if (SIM_WIFSTOPPED (h8_get_reg (sd, 0)))
+ 	    {
+ 	      /* Pass the stop signal up to gdb.  */
+ 	      sim_engine_set_run_state (sd, sim_stopped, 
+ 					SIM_WSTOPSIG (h8_get_reg (sd, 0)));
+ 	    }
  	  else
  	    {
  	      /* Treat it as a sigtrap.  */