sim: cr16: improve trap handling

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 094d54c723237ba988998090c08a92bcf2f9f7af..f0c62c352571c1aae7a5bf5a157ace836de0ad39 100644 (file)
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,6 +1,8 @@
 2012-08-28  Kaushik Phatak  <kaushik.phatak@kpitcummins.com>
 
+       * cr16_sim.h: Add defines for TRAP handling.
        * interp.c (sim_complete_command): New stub function.
+       * simops.c: Breakpoint handling code.
 
 2012-06-17  Mike Frysinger  <vapier@gentoo.org>
 

diff --git a/sim/cr16/cr16_sim.h b/sim/cr16/cr16_sim.h
index c7783ba1714e835894ce65081887bb353e7b50fa..7252b143c0686a745424e79f9e63d0cb2a8eb68e 100644 (file)
--- a/sim/cr16/cr16_sim.h
+++ b/sim/cr16/cr16_sim.h
@@ -472,3 +472,9 @@ extern void write_longlong PARAMS ((uint8 *addr, int64 data));
    PSR is masked for zero bits. */
 
 extern creg_t move_to_cr (int cr, creg_t mask, creg_t val, int psw_hw_p);
+
+#ifndef SIGTRAP
+#define SIGTRAP 5
+#endif
+/* Special purpose trap  */
+#define TRAP_BREAKPOINT 8

diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index 1207906b4108342d3faaae030c61a4ace5032e5b..36f848ef8709881681472be61d9d236a6992268a 100644 (file)
--- a/sim/cr16/interp.c
+++ b/sim/cr16/interp.c
@@ -1192,7 +1192,11 @@ sim_resume (SIM_DESC sd, int step, int siggnal)
       iaddr = imem_addr ((uint32)PC);
       if (iaddr == State.mem.fault)
         {
+#ifdef SIGBUS
           State.exception = SIGBUS;
+#else
+          State.exception = SIGSEGV;
+#endif
           break;
         }
  

diff --git a/sim/cr16/simops.c b/sim/cr16/simops.c
index f8fee8a0d234ed6c281a7e37f98e4f4b95732148..2e5e9eb3f9032b20fa302f021835db6baa811707 100644 (file)
--- a/sim/cr16/simops.c
+++ b/sim/cr16/simops.c
@@ -5059,6 +5059,8 @@ OP_14C_14 ()
 void
 OP_C_C ()
 {
+  uint32 tmp;
+  uint16 a;
   trace_input ("excp", OP_CONSTANT4, OP_VOID, OP_VOID);
   switch (OP[0])
     {
@@ -5465,9 +5467,24 @@ OP_C_C ()
 #endif
            
          default:
-           cr16_callback->error (cr16_callback, "Unknown syscall %d", FUNC);
+           a = OP[0];
+           switch (a)
+           {
+             case TRAP_BREAKPOINT:
+               State.exception = SIGTRAP;
+               tmp = (PC);
+               JMP(tmp);
+               trace_output_void ();
+               break;
+             case SIGTRAP:  /* supervisor call ?  */
+               State.exception = SIG_CR16_EXIT;
+               trace_output_void ();
+               break;
+             default:
+               cr16_callback->error (cr16_callback, "Unknown syscall %d", FUNC);
+               break;
+           }
          }
-
        if ((uint16) result == (uint16) -1)
          RETERR (cr16_callback->get_errno(cr16_callback));
        else