sim: clean up duplicate sim-engine hooks

Now that we've unified sim-cpu, we can delete the duplicate sim-engine
hooks -- these targets defined these only because they didn't fully
implement the sim-cpu callbacks.

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index f3e0dbdf512d4adc02a0d0b00a4fda52079788b3..23c739d3758fe2e981ea694b5af1ed08beb25ece 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (USING_SIM_BASE_H): Delete.

diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index d1a7c1e7b25fbbbbab83b3902ea403a94db54a1f..4dc04a2caa605971716735db1d942b84fe3bf6cf 100644 (file)
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -30,17 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "cris-desc.h"
 #include "cris-opc.h"
 #include "arch.h"
-
-#define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
-do { \
-  if (cpu) /* Null if ctrl-c.  */ \
-    sim_pc_set ((cpu), (cia)); \
-} while (0)
-#define SIM_ENGINE_RESTART_HOOK(sd, cpu, cia) \
-do { \
-  sim_pc_set ((cpu), (cia)); \
-} while (0)
-
 #include "sim-base.h"
 #include "cgen-sim.h"
 #include "cris-sim.h"

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 77f9b811562feef1534bf6efa90e5f36e8d2924d..4cb55c555b8663bba8285bd05dc4951d5f57daa0 100644 (file)
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (USING_SIM_BASE_H): Delete.

diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index a25c7dd85daf46d3d0f49090fb67099e523f96be..4894e8d65b7f336956cd50a70db4eb35b83a135d 100644 (file)
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@@ -29,17 +29,6 @@
 #include "lm32-desc.h"
 #include "lm32-opc.h"
 #include "arch.h"
-
-#define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
-do { \
-  if (cpu) /* null if ctrl-c */ \
-    sim_pc_set ((cpu), (cia)); \
-} while (0)
-#define SIM_ENGINE_RESTART_HOOK(sd, cpu, cia) \
-do { \
-  sim_pc_set ((cpu), (cia)); \
-} while (0)
-
 #include "sim-base.h"
 #include "cgen-sim.h"
 #include "lm32-sim.h"

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 397f3a852fc3878e6a3788bf83a141080870b265..c85b181af728d109e0866ba4f5e92686890e1b93 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (USING_SIM_BASE_H): Delete.

diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index 0f539a0f7387780eac76b70a92cf2755b43870fa..cd39e98c021d0896d3ac809a12675eeeee18e203 100644 (file)
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -9,17 +9,6 @@
 #include "m32r-desc.h"
 #include "m32r-opc.h"
 #include "arch.h"
-
-#define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \
-do { \
-  if (cpu) /* null if ctrl-c */ \
-    sim_pc_set ((cpu), (cia)); \
-} while (0)
-#define SIM_ENGINE_RESTART_HOOK(sd, cpu, cia) \
-do { \
-  sim_pc_set ((cpu), (cia)); \
-} while (0)
-
 #include "sim-base.h"
 #include "cgen-sim.h"
 #include "m32r-sim.h"

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 51b4b297166db18560cb5be046fe02ca472a289d..1feeb83d5b1a24510decd469ba56db31af91d761 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-18  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete
+       comments.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-main.h (SIM_CPU): Delete.

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index e6bbd518c04d8c2141e7bdf19210982fa00621a5..c87b8e67b8ff3bcb84c0c07e6e45aed4c808cf90 100644 (file)
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
-/* This simulator doesn't cache the Current Instruction Address */
-/* #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) */
-/* #define SIM_ENGINE_RESUME_HOOK(SD, LAST_CPU, CIA) */
-
 /* hobble some common features for moment */
 #define WITH_WATCHPOINTS 1
 #define WITH_MODULO_MEMORY 1