[PATCH] sim: d10v: fix signal updates

[PATCH] sim: d10v: fix signal updates

[Mike Frysinger]

Way back in aba6488e0b73756f31f154d12a228baa82a68d8a, a bunch of signal
defines were changed to TARGET_SIGNAL_xxx.  For d10v, the transition was
incomplete which lead to sim_stop_reason using the new set but sim_resume
still using the old set.  Which meant in some cases, the sim would never
actually stop.

Convert all the remaining SIGxxx defines in here to TARGET_SIGNAL_xxx.
This has the nice side effect of fixing the testsuite.

Committed.
---
 sim/d10v/ChangeLog |  6 ++++++
 sim/d10v/interp.c  | 13 +++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index e34b918..e09a14f 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-02  Mike Frysinger  <vapier@gentoo.org>
+
+	* interp.c (lookup_hash): Change SIGILL to GDB_SIGNAL_ILL.
+	(sim_resume): Change SIGBUS/SIGSEGV to GDB_SIGNAL_BUS, SIGILL to
+	GDB_SIGNAL_ILL, and SIGTRAP to GDB_SIGNAL_TRAP.
+
 2015-04-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_set_profile, sim_set_profile_size): Delete.
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 1aae3e4..7fc0745 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -80,7 +80,7 @@ lookup_hash (uint32 ins, int size)
     {
       if (h->next == NULL)
 	{
-	  State.exception = SIGILL;
+	  State.exception = GDB_SIGNAL_ILL;
 	  State.pc_changed = 1; /* Don't increment the PC. */
 	  return NULL;
 	}
@@ -936,17 +936,14 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
     {
     case 0:
       break;
-#ifdef SIGBUS
-    case SIGBUS:
-#endif
-    case SIGSEGV:
+    case GDB_SIGNAL_BUS:
       SET_BPC (PC);
       SET_BPSW (PSW);
       SET_HW_PSW ((PSW & (PSW_F0_BIT | PSW_F1_BIT | PSW_C_BIT)));
       JMP (AE_VECTOR_START);
       SLOT_FLUSH ();
       break;
-    case SIGILL:
+    case GDB_SIGNAL_ILL:
       SET_BPC (PC);
       SET_BPSW (PSW);
       SET_HW_PSW ((PSW & (PSW_F0_BIT | PSW_F1_BIT | PSW_C_BIT)));
@@ -963,7 +960,7 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
       iaddr = imem_addr ((uint32)PC << 2);
       if (iaddr == State.mem.fault)
  	{
- 	  State.exception = SIGBUS;
+	  State.exception = GDB_SIGNAL_BUS;
  	  break;
  	}
  
@@ -1035,7 +1032,7 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
   while ( !State.exception && !stop_simulator);
   
   if (step && !State.exception)
-    State.exception = SIGTRAP;
+    State.exception = GDB_SIGNAL_TRAP;
 }
 
 void
-- 
2.3.4

Re: [PATCH] sim: d10v: fix signal updates

[Pedro Alves]

On 04/03/2015 01:40 AM, Mike Frysinger wrote:
> @@ -936,17 +936,14 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
>      {
>      case 0:
>        break;
> -#ifdef SIGBUS
> -    case SIGBUS:
> -#endif
> -    case SIGSEGV:
> +    case GDB_SIGNAL_BUS:

OOC, why no SIGSEGV -> GDB_SIGNAL_SEGV ?

Thanks,
Pedro Alves

Re: [PATCH] sim: d10v: fix signal updates

[Mike Frysinger]

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

On 06 Apr 2015 13:00, Pedro Alves wrote:
> On 04/03/2015 01:40 AM, Mike Frysinger wrote:
> > @@ -936,17 +936,14 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
> >      {
> >      case 0:
> >        break;
> > -#ifdef SIGBUS
> > -    case SIGBUS:
> > -#endif
> > -    case SIGSEGV:
> > +    case GDB_SIGNAL_BUS:
> 
> OOC, why no SIGSEGV -> GDB_SIGNAL_SEGV ?

there probably is no good reason.  this particular update matches what the other 
signal handling point update did (it normalized BUS & SEGV into BUS).  i can see 
about updating both to handle SEGV & BUS independently.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]