summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-04-18 04:38:33 -0400
committerMike Frysinger <vapier@gentoo.org>2015-04-18 04:40:27 -0400
commit3ebe2863f79e04d841e6b97594ec032d2bfad1b8 (patch)
tree063ca8ca4b1d09200b23299012846112b282b972
parente8d3a34fee495d7d44e6bf8e13d472b33f847635 (diff)
downloadbinutils-gdb-3ebe2863f79e04d841e6b97594ec032d2bfad1b8.tar.gz
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.
-rw-r--r--sim/cris/ChangeLog4
-rw-r--r--sim/cris/sim-main.h11
-rw-r--r--sim/lm32/ChangeLog4
-rw-r--r--sim/lm32/sim-main.h11
-rw-r--r--sim/m32r/ChangeLog4
-rw-r--r--sim/m32r/sim-main.h11
-rw-r--r--sim/mips/ChangeLog5
-rw-r--r--sim/mips/sim-main.h4
8 files changed, 17 insertions, 37 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index f3e0dbdf512..23c739d3758 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,5 +1,9 @@
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.
2015-04-18 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index d1a7c1e7b25..4dc04a2caa6 100644
--- 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 77f9b811562..4cb55c555b8 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,5 +1,9 @@
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.
2015-04-18 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index a25c7dd85da..4894e8d65b7 100644
--- 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 397f3a852fc..c85b181af72 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,5 +1,9 @@
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.
2015-04-18 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index 0f539a0f738..cd39e98c021 100644
--- 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 51b4b297166..1feeb83d5b1 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,5 +1,10 @@
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.
2015-04-18 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index e6bbd518c04..c87b8e67b8f 100644
--- 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