From 737d27aa6e31450324e5b9082a9f467843963a40 Mon Sep 17 00:00:00 2001 From: Don Lee Date: Mon, 19 Oct 2009 09:02:18 +0000 Subject: [PATCH] * gdb/score-tdep.c: Delete some simulator dependent codes. * gdb/score-tdep.h: Delete some simulator dependent macro definitions. --- gdb/ChangeLog | 5 ++++ gdb/score-tdep.c | 52 --------------------------------------- gdb/score-tdep.h | 64 ------------------------------------------------ 3 files changed, 5 insertions(+), 116 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 78e9bbddc9d..bb5afad0d8f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2009-10-19 Don Lee + + * score-tdep.c: Delete some simulator dependent codes. + * score-tdep.h: Delete some simulator dependent macro definitions. + 2008-10-16 Steven G. Kargl (tiny patch) * amd64fbsd-nat.c (amd64fbsd_supply_pcb): Conditionally compile in diff --git a/gdb/score-tdep.c b/gdb/score-tdep.c index 47da1c81d7d..89fbeaf4e52 100644 --- a/gdb/score-tdep.c +++ b/gdb/score-tdep.c @@ -56,58 +56,6 @@ struct score_frame_cache static int target_mach = bfd_mach_score7; -#if WITH_SIM -int -score_target_can_use_watch (int type, int cnt, int othertype) -{ - if (strcmp (current_target.to_shortname, "sim") == 0) - return soc_gh_can_use_watch (type, cnt); - return (*current_target.to_can_use_hw_breakpoint) (type, cnt, othertype); -} - -int -score_stopped_by_watch (void) -{ - if (strcmp (current_target.to_shortname, "sim") == 0) - return soc_gh_stopped_by_watch (); - return (*current_target.to_stopped_by_watchpoint) (); -} - -int -score_target_insert_watchpoint (CORE_ADDR addr, int len, int type) -{ - if (strcmp (current_target.to_shortname, "sim") == 0) - return soc_gh_add_watch (addr, len, type); - return (*current_target.to_insert_watchpoint) (addr, len, type); -} - -int -score_target_remove_watchpoint (CORE_ADDR addr, int len, int type) -{ - if (strcmp (current_target.to_shortname, "sim") == 0) - return soc_gh_del_watch (addr, len, type); - return (*current_target.to_remove_watchpoint) (addr, len, type); -} - -int -score_target_insert_hw_breakpoint (struct gdbarch *gdbarch, - struct bp_target_info * bp_tgt) -{ - if (strcmp (current_target.to_shortname, "sim") == 0) - return soc_gh_add_hardbp (bp_tgt->placed_address); - return (*current_target.to_insert_hw_breakpoint) (gdbarch, bp_tgt); -} - -int -score_target_remove_hw_breakpoint (struct gdbarch *gdbarch, - struct bp_target_info * bp_tgt) -{ - if (strcmp (current_target.to_shortname, "sim") == 0) - return soc_gh_del_hardbp (bp_tgt->placed_address); - return (*current_target.to_remove_hw_breakpoint) (gdbarch, bp_tgt); -} -#endif - static struct type * score_register_type (struct gdbarch *gdbarch, int regnum) { diff --git a/gdb/score-tdep.h b/gdb/score-tdep.h index 792f277f864..24347224e9a 100644 --- a/gdb/score-tdep.h +++ b/gdb/score-tdep.h @@ -85,68 +85,4 @@ struct pt_regs { typedef struct pt_regs elf_gregset_t; -#ifdef WITH_SIM - -#include - -int soc_gh_can_use_watch(int type, int cnt); -int soc_gh_add_watch(unsigned int addr, int len, int type); -int soc_gh_del_watch(unsigned int addr, int len, int type); -int soc_gh_stopped_by_watch(void); -int soc_gh_add_hardbp(unsigned int addr); -int soc_gh_del_hardbp(unsigned int addr); - -int score_target_can_use_watch(int type, int cnt, int ot); -int score_stopped_by_watch(void); -int score_target_insert_watchpoint (CORE_ADDR addr, int len, int type); -int score_target_remove_watchpoint (CORE_ADDR addr, int len, int type); -int score_target_insert_hw_breakpoint (struct gdbarch *gdbarch, struct bp_target_info * bp_tgt); -int score_target_remove_hw_breakpoint (struct gdbarch *gdbarch, struct bp_target_info * bp_tgt); - -#define TARGET_HAS_HARDWARE_WATCHPOINTS - -#ifdef TARGET_CAN_USE_HARDWARE_WATCHPOINT -#undef TARGET_CAN_USE_HARDWARE_WATCHPOINT - -#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \ - score_target_can_use_watch(type, cnt, ot) -#endif - -#ifdef STOPPED_BY_WATCHPOINT -#undef STOPPED_BY_WATCHPOINT - -#define STOPPED_BY_WATCHPOINT(w) \ - score_stopped_by_watch() -#endif - -#ifdef target_insert_watchpoint -#undef target_insert_watchpoint - -#define target_insert_watchpoint(addr, len, type) \ - score_target_insert_watchpoint (addr, len, type) -#endif - -#ifdef target_remove_watchpoint -#undef target_remove_watchpoint - -#define target_remove_watchpoint(addr, len, type) \ - score_target_remove_watchpoint (addr, len, type) -#endif - -#ifdef target_insert_hw_breakpoint -#undef target_insert_hw_breakpoint - -#define target_insert_hw_breakpoint(gdbarch, bp_tgt) \ - score_target_insert_hw_breakpoint (gdbarch, bp_tgt) -#endif - -#ifdef target_remove_hw_breakpoint -#undef target_remove_hw_breakpoint - -#define target_remove_hw_breakpoint(gdbarch, bp_tgt) \ - score_target_remove_hw_breakpoint (gdbarch, bp_tgt) -#endif - -#endif /* WITH_SIM */ - #endif /* SCORE_TDEP_H */ -- 2.47.3