aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sim/frv/ChangeLog8
-rw-r--r--sim/frv/tconfig.h9
-rw-r--r--sim/frv/traps.c23
-rw-r--r--sim/iq2000/ChangeLog5
-rw-r--r--sim/iq2000/tconfig.h9
-rw-r--r--sim/m32r/ChangeLog8
-rw-r--r--sim/m32r/tconfig.h9
-rw-r--r--sim/m32r/traps-linux.c12
-rw-r--r--sim/m32r/traps.c12
-rw-r--r--sim/sh64/ChangeLog5
-rw-r--r--sim/sh64/tconfig.h9
11 files changed, 26 insertions, 83 deletions
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 329d6fc..5137111 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,5 +1,13 @@
2015-12-24 Mike Frysinger <vapier@gentoo.org>
+ * tconfig.h (SIM_HAVE_BREAKPOINTS, SIM_BREAKPOINT,
+ SIM_BREAKPOINT_SIZE): Delete.
+ * traps.c [SIM_HAVE_BREAKPOINTS] (frv_itrap): Delete sim breakpoint
+ code.
+ [SIM_HAVE_BREAKPOINTS] (frv_break): Likewise.
+
+2015-12-24 Mike Frysinger <vapier@gentoo.org>
+
* tconfig.h (WITH_WATCHPOINTS): Delete.
2015-12-24 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/frv/tconfig.h b/sim/frv/tconfig.h
index 06ec4a0..f0de19a 100644
--- a/sim/frv/tconfig.h
+++ b/sim/frv/tconfig.h
@@ -9,15 +9,6 @@
/* ??? Temporary hack until model support unified. */
#define SIM_HAVE_MODEL
-/* Define this to enable the intrinsic breakpoint mechanism. */
-/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially
- duplicates ifdef SIM_BREAKPOINT (right?) */
-#if 0
-#define SIM_HAVE_BREAKPOINTS
-#define SIM_BREAKPOINT { 0x10, 0xf1 }
-#define SIM_BREAKPOINT_SIZE 2
-#endif
-
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use
one of -scache/-pbb. ???? */
diff --git a/sim/frv/traps.c b/sim/frv/traps.c
index 1263683..01adf41 100644
--- a/sim/frv/traps.c
+++ b/sim/frv/traps.c
@@ -110,18 +110,6 @@ frv_itrap (SIM_CPU *current_cpu, PCADDR pc, USI base, SI offset)
host_callback *cb = STATE_CALLBACK (sd);
USI num = ((base + offset) & 0x7f) + 0x80;
-#ifdef SIM_HAVE_BREAKPOINTS
- /* Check for breakpoints "owned" by the simulator first, regardless
- of --environment. */
- if (num == TRAP_BREAKPOINT)
- {
- /* First try sim-break.c. If it's a breakpoint the simulator "owns"
- it doesn't return. Otherwise it returns and let's us try. */
- sim_handle_breakpoint (sd, current_cpu, pc);
- /* Fall through. */
- }
-#endif
-
if (STATE_ENVIRONMENT (sd) == OPERATING_ENVIRONMENT)
{
frv_queue_software_interrupt (current_cpu, num);
@@ -293,21 +281,10 @@ frv_break (SIM_CPU *current_cpu)
IADDR pc;
SIM_DESC sd = CPU_STATE (current_cpu);
-#ifdef SIM_HAVE_BREAKPOINTS
- /* First try sim-break.c. If it's a breakpoint the simulator "owns"
- it doesn't return. Otherwise it returns and let's us try. */
- pc = GET_H_PC ();
- sim_handle_breakpoint (sd, current_cpu, pc);
- /* Fall through. */
-#endif
-
if (STATE_ENVIRONMENT (sd) != OPERATING_ENVIRONMENT)
{
/* Invalidate the insn cache because the debugger will presumably
replace the breakpoint insn with the real one. */
-#ifndef SIM_HAVE_BREAKPOINTS
- pc = GET_H_PC ();
-#endif
sim_engine_halt (sd, current_cpu, NULL, pc, sim_stopped, SIM_SIGTRAP);
}
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 7a2aeb9..30f9501 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,5 +1,10 @@
2015-12-24 Mike Frysinger <vapier@gentoo.org>
+ * tconfig.h (SIM_HAVE_BREAKPOINTS, SIM_BREAKPOINT,
+ SIM_BREAKPOINT_SIZE): Delete.
+
+2015-12-24 Mike Frysinger <vapier@gentoo.org>
+
* tconfig.h (WITH_WATCHPOINTS): Delete.
2015-12-24 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/iq2000/tconfig.h b/sim/iq2000/tconfig.h
index f8635fd..ae0bf3a 100644
--- a/sim/iq2000/tconfig.h
+++ b/sim/iq2000/tconfig.h
@@ -9,15 +9,6 @@
/* ??? Temporary hack until model support unified. */
#define SIM_HAVE_MODEL
-/* Define this to enable the intrinsic breakpoint mechanism. */
-/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially
- duplicates ifdef SIM_BREAKPOINT (right?) */
-#if 1
-#define SIM_HAVE_BREAKPOINTS
-#define SIM_BREAKPOINT { 0, 0, 0, 0xD }
-#define SIM_BREAKPOINT_SIZE 4
-#endif
-
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use
one of -scache/-pbb. ???? */
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index cd821a3..616fb2a 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,5 +1,13 @@
2015-12-24 Mike Frysinger <vapier@gentoo.org>
+ * tconfig.h (SIM_HAVE_BREAKPOINTS, SIM_BREAKPOINT,
+ SIM_BREAKPOINT_SIZE): Delete.
+ * traps-linux.c [SIM_HAVE_BREAKPOINTS] (m32r_trap): Delete sim
+ breakpoint code.
+ * traps.c [SIM_HAVE_BREAKPOINTS] (m32r_trap): Likewise.
+
+2015-12-24 Mike Frysinger <vapier@gentoo.org>
+
* tconfig.h (WITH_WATCHPOINTS): Delete.
2015-12-24 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/m32r/tconfig.h b/sim/m32r/tconfig.h
index 00ca73f..72a7f68 100644
--- a/sim/m32r/tconfig.h
+++ b/sim/m32r/tconfig.h
@@ -9,15 +9,6 @@
/* For MSPR support. FIXME: revisit. */
#define WITH_DEVICES 1
-/* Define this to enable the intrinsic breakpoint mechanism. */
-/* FIXME: may be able to remove SIM_HAVE_BREAKPOINT since it essentially
- duplicates ifdef SIM_BREAKPOINT (right?) */
-#if 0
-#define SIM_HAVE_BREAKPOINTS
-#define SIM_BREAKPOINT { 0x10, 0xf1 }
-#define SIM_BREAKPOINT_SIZE 2
-#endif
-
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use
one of -scache/-pbb. */
diff --git a/sim/m32r/traps-linux.c b/sim/m32r/traps-linux.c
index 8fee2a0..203ebf4 100644
--- a/sim/m32r/traps-linux.c
+++ b/sim/m32r/traps-linux.c
@@ -197,18 +197,6 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
SIM_DESC sd = CPU_STATE (current_cpu);
host_callback *cb = STATE_CALLBACK (sd);
-#ifdef SIM_HAVE_BREAKPOINTS
- /* Check for breakpoints "owned" by the simulator first, regardless
- of --environment. */
- if (num == TRAP_BREAKPOINT)
- {
- /* First try sim-break.c. If it's a breakpoint the simulator "owns"
- it doesn't return. Otherwise it returns and let's us try. */
- sim_handle_breakpoint (sd, current_cpu, pc);
- /* Fall through. */
- }
-#endif
-
switch (num)
{
case TRAP_ELF_SYSCALL :
diff --git a/sim/m32r/traps.c b/sim/m32r/traps.c
index 225c37f..d1214a9 100644
--- a/sim/m32r/traps.c
+++ b/sim/m32r/traps.c
@@ -103,18 +103,6 @@ m32r_trap (SIM_CPU *current_cpu, PCADDR pc, int num)
SIM_DESC sd = CPU_STATE (current_cpu);
host_callback *cb = STATE_CALLBACK (sd);
-#ifdef SIM_HAVE_BREAKPOINTS
- /* Check for breakpoints "owned" by the simulator first, regardless
- of --environment. */
- if (num == TRAP_BREAKPOINT)
- {
- /* First try sim-break.c. If it's a breakpoint the simulator "owns"
- it doesn't return. Otherwise it returns and let's us try. */
- sim_handle_breakpoint (sd, current_cpu, pc);
- /* Fall through. */
- }
-#endif
-
if (STATE_ENVIRONMENT (sd) == OPERATING_ENVIRONMENT)
{
/* The new pc is the trap vector entry.
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index c56cd98..cd8f50b 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,5 +1,10 @@
2015-12-24 Mike Frysinger <vapier@gentoo.org>
+ * tconfig.h (SIM_HAVE_BREAKPOINTS, SIM_BREAKPOINT,
+ SIM_BREAKPOINT_SIZE): Delete.
+
+2015-12-24 Mike Frysinger <vapier@gentoo.org>
+
* tconfig.h (WITH_WATCHPOINTS): Delete.
2015-12-24 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/sh64/tconfig.h b/sim/sh64/tconfig.h
index 6f8d7ff..1440566 100644
--- a/sim/sh64/tconfig.h
+++ b/sim/sh64/tconfig.h
@@ -9,15 +9,6 @@
/* ??? Temporary hack until model support unified. */
#define SIM_HAVE_MODEL
-/* Define this to enable the intrinsic breakpoint mechanism. */
-/* FIXME: may be able to remove SIM_HAVE_BREAKPOINTS since it essentially
- duplicates ifdef SIM_BREAKPOINT (right?) */
-#if 1
-#define SIM_HAVE_BREAKPOINTS
-#define SIM_BREAKPOINT { 0, 0, 0, 0xD }
-#define SIM_BREAKPOINT_SIZE 4
-#endif
-
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use
one of -scache/-pbb. ???? */
generated by cgit v1.1 at 2024-11-22 02:17:34 +0000