diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-12-24 17:37:01 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-12-24 20:19:13 -0500 |
| commit | cec19744887931294e9d4a1dfa4fa8bd42e57ae5 (patch) | |
| tree | 43defb41553140eb190a86597cc01cd99cfc347e /sim/frv | |
| parent | bd3fb5b8fb33adb751407a128e1f2240dfb215d9 (diff) | |
| download | gdb-cec19744887931294e9d4a1dfa4fa8bd42e57ae5.zip gdb-cec19744887931294e9d4a1dfa4fa8bd42e57ae5.tar.gz gdb-cec19744887931294e9d4a1dfa4fa8bd42e57ae5.tar.bz2 | |
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.
Diffstat (limited to 'sim/frv')
| -rw-r--r-- | sim/frv/ChangeLog | 8 | ||||
| -rw-r--r-- | sim/frv/tconfig.h | 9 | ||||
| -rw-r--r-- | sim/frv/traps.c | 23 |
3 files changed, 8 insertions, 32 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); } |