Use updated MSMASK, MSMASKED macros.

Fix sat problem in d30v.

diff --git a/sim/tic80/ChangeLog b/sim/tic80/ChangeLog
index 7f9decb91828bb705e1c888bc748fa90b8468952..862a8d9fe64bc41eee6421fec0b841447d96f2e2 100644 (file)
--- a/sim/tic80/ChangeLog
+++ b/sim/tic80/ChangeLog
@@ -1,3 +1,11 @@
+Mon Sep  8 20:10:43 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       * cpu.h (CPU_CIA): Define.
+
+       * sim-main.h (struct sim_state): Delete halt_ok, path_to_halt,
+       restart_ok, path_to_restart members.
+       (struct sim_state): Delete reason, siggnal members.
+       
 Thu Sep  4 17:21:23 1997  Doug Evans  <dje@seba>
 
        * configure: Regenerated to track ../common/aclocal.m4 changes.

diff --git a/sim/tic80/cpu.h b/sim/tic80/cpu.h
index ca2d3275dc8dbd3c617ac63f5774c23a50d4d08b..e710364d0d1410bfb855549c0ea73f2896861b89 100644 (file)
--- a/sim/tic80/cpu.h
+++ b/sim/tic80/cpu.h
@@ -151,6 +151,8 @@ struct _sim_cpu {
   sim_cpu_base base;
 };
 
+#define CPU_CIA(CPU) ((CPU)->cia)
+
 #define GPR(N) ((CPU)->reg[N])
 #define GPR_SET(N, VAL) ((CPU)->reg[N] = (VAL))
 #define ACC(N) ((CPU)->acc[N])

diff --git a/sim/tic80/sim-main.h b/sim/tic80/sim-main.h
index 87aef80f1ee2731c2b1767ae3424daa423b861b1..43872273fdfa73974e2f1b0fec3073fa6e39d59e 100644 (file)
--- a/sim/tic80/sim-main.h
+++ b/sim/tic80/sim-main.h
@@ -51,16 +51,6 @@ static const sim_cia null_cia = {0}; /* Dummy */
 
 struct sim_state {
 
-  /* escape route for inner functions */
-  int halt_ok;
-  jmp_buf path_to_halt;
-  int restart_ok;
-  jmp_buf path_to_restart;
-
-  /* status from last halt */
-  enum sim_stop reason;
-  int siggnal;
-
   /* the processors proper */
   sim_cpu cpu;
 #define STATE_CPU(sd, n) (&(sd)->cpu)