sim: mn10300: delete unused exception/exited/debug state

The syscall path was the only code checking the custom exception state
after recent cleanups.  Once we change that to the common engine halt
function, we can delete that state entirely.

This also helps highlight some other dead code that we can cull.

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 1facba7c63b12cac4506a7e3b8dc6d9661a0a07b..c32c69e5dd4ce27ffa746e0129f459680dd7ed2d 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,12 @@
+2015-06-11  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c (mn10300_debug): Delete.
+       * mn10300_sim.h (DEBUG_TRACE, DEBUG_VALUES, mn10300_debug): Delete.
+       (struct _state): Delete exception and exited members.
+       [_WIN32] (SIGTRAP, SIGQUIT): Delete.
+       * op_utils.c (do_syscall): Call sim_engine_halt instead of setting
+       State.exception.
+
 2015-06-11  Mike Frysinger  <vapier@gentoo.org>
 
        * mn10300_sim.h (uint8, int8, uint16, int16, uint32, int32): Typedef

diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c
index e5a90b546a0631d9df36daf2bae7d8a54a889669..f6f093d6a8c5300a86a440ffef7e957ed2282ceb 100644 (file)
--- a/sim/mn10300/interp.c
+++ b/sim/mn10300/interp.c
@@ -25,7 +25,6 @@
 
 
 host_callback *mn10300_callback;
-int mn10300_debug;
 struct _state State;
 
 

diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h
index 5f5d5d16a11c11d8b5ba246618c34cf5b18b08b8..23b8cc2fb0fb840c7527b29f56a57f7c691844e5 100644 (file)
--- a/sim/mn10300/mn10300_sim.h
+++ b/sim/mn10300/mn10300_sim.h
@@ -11,11 +11,6 @@
 extern host_callback *mn10300_callback;
 extern SIM_DESC simulator;
 
-#define DEBUG_TRACE            0x00000001
-#define DEBUG_VALUES           0x00000002
-
-extern int mn10300_debug;
-
 typedef unsigned8 uint8;
 typedef signed8 int8;
 typedef unsigned16 uint16;
@@ -53,8 +48,6 @@ struct _state
     dword fd[16]; /* FD0,2,...,30 */
   } fpregs;
   uint8 *mem;                  /* main memory */
-  int exception;
-  int exited;
 
   /* All internal state modified by signal_exception() that may need to be
      rolled back for passing moment-of-exception image back to gdb. */
@@ -148,11 +141,6 @@ extern struct simops Simops[];
 #define FPU2FS(F,FS) sim_fpu_to32 (&(FS), &(F))
 #define FPU2FD(F,FD) sim_fpu_to232 (&((FD).high), &((FD).low), &(F))
 
-#ifdef _WIN32
-#define SIGTRAP 5
-#define SIGQUIT 3
-#endif
-
 #define FETCH32(a,b,c,d) \
  ((a)+((b)<<8)+((c)<<16)+((d)<<24))
 

diff --git a/sim/mn10300/op_utils.c b/sim/mn10300/op_utils.c
index 36f387c9bd3cb0d9eea3a5af7c3072947ca8462f..518df9b7e084f359c69b280ab67332c7f4fffc29 100644 (file)
--- a/sim/mn10300/op_utils.c
+++ b/sim/mn10300/op_utils.c
@@ -194,15 +194,8 @@ do_syscall (void)
   if ( FUNC == TARGET_SYS_exit )
     {
       /* EXIT - caller can look in PARM1 to work out the reason */
-      if (PARM1 == 0xdead)
-       State.exception = SIGABRT;
-      else
-       {
-         sim_engine_halt (simulator, STATE_CPU (simulator, 0), NULL, PC,
-                          sim_exited, PARM1);
-         State.exception = SIGQUIT;
-       }
-      State.exited = 1;
+      sim_engine_halt (simulator, STATE_CPU (simulator, 0), NULL, PC,
+                      (PARM1 == 0xdead ? SIM_SIGABRT : sim_exited), PARM1);
     }
   else
     {