sim: delete old breakpoint code

This code relies on the old sim-break module, but that was deleted in 2003.
The module only existed for gdb to tell the sim to set breakpoints on its
behalf, but then that logic was abandoned in favor of gdb knowing all about
proper breakpoints (since it does already for non-sim targets).  Some dead
code lived on in the older ports though -- clean it up now.

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 329d6fc8b40192f39cc52c8102b55432d0c750a7..513711122fa762179f87dcdbccf6a0f1d8da7924 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/sim/frv/tconfig.h b/sim/frv/tconfig.h
index 06ec4a04f52024947ff16d7971a4a79646576b7c..f0de19afb75f79cb475b6701ab11196ec9cf0bbd 100644 (file)
--- 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 12636835a42911368564fb0dee4b9cec3fbffda6..01adf4181744ea23175cfc1e6131b4d10f461bb4 100644 (file)
--- 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 7a2aeb9794ff4c5651204b9485349c5ae90962a8..30f950154aaba870043323e4bb97968610dfcdf1 100644 (file)
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/sim/iq2000/tconfig.h b/sim/iq2000/tconfig.h
index f8635fd4b238d867ba1b294f165f3b8290352fa7..ae0bf3ae71ce42af6a75205e090a4ffc83819441 100644 (file)
--- 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 cd821a3b07ac6aa38aadddbe28f34307400620c1..616fb2ad9565b4df7bded7e8df503a2e9c6af4da 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/sim/m32r/tconfig.h b/sim/m32r/tconfig.h
index 00ca73f731e4b389301ddaf371cc70d1b459c07f..72a7f6833835a551493129239e8d0cdc1c09ed6a 100644 (file)
--- 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 8fee2a04b54a48d57e2b309ee2d6b5ac262b19a2..203ebf47d03d2eaecceffc502bc1630252ca651e 100644 (file)
--- 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 225c37fb2fc0c8e340edc89bf2bfa476366c8d47..d1214a9dbb000c5c96bf9ca2c9d464ac0574d641 100644 (file)
--- 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 c56cd987b9ccae77b8ce2ee950c8039a2254fc93..cd8f50bd9b06940247d96a955d5617900ddf2548 100644 (file)
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/sim/sh64/tconfig.h b/sim/sh64/tconfig.h
index 6f8d7ffc49e2eac341e3ea180aa31ec068e328ab..1440566626b7a7f53342cb8becc7693d3a8ba7fc 100644 (file)
--- 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. ???? */