Unify target macros.

* target.h (STOPPED_BY_WATCHPOINT): Delete, replaced by ...
	(target_stoppped_by_watchpoint): New macro.
	(HAVE_STEPPABLE_WATCHPOINT): Delete, replaced by ...
	(target_have_steppable_watchpoint): New macro.
	(HAVE_CONTINUABLE_WATCHPOINT): Delete, replace by ...
	(target_have_continuable_watchpoint): New macro.
	(TARGET_CAN_USE_HARDWARE_WATCHPOINT):Delete, replaced by ...
	(target_can_use_hardware_watchpoint): New macro.
	(TARGET_REGION_OK_FOR_HW_WATCHPOINT):Delete, replaced by ...
	(target_region_ok_for_hw_watchpoint): New macro.

	* breakpoint.c (update_watchpoint): Use new macros.
	(bpstat_alloc): Likewise.
	(create_breakpoint): Likewise.
	(watch_command_1): Likewise.
	(can_use_hardware_watchpoint): Likewise.
	(do_enable_breakpoint): Likewise.
	* infrun.c (handle_inferior_event): Adapt to new macros.
	* mips-tdep.c (mips_gdbarch_init): Update comments.
	* procfs.c (procfs_set_watchpoint): Update comment.
	(procfs_insert_watchpoint): Adapt to new macros.
	* remote-m32r-sdi.c (m32r_stop):
	* remote-mips.c (mips_remove_breakpoint):
	* target.c (debug_to_region_ok_for_hw_watchpoint): Update to new macros.
	(debug_to_stopped_by_watchpoint): Likewise.
This commit is contained in:
Pierre Muller
2009-05-11 11:13:09 +00:00
parent 77ae44b0d3
commit d92524f1ee
9 changed files with 57 additions and 26 deletions

View File

@@ -1053,17 +1053,17 @@ extern char *normal_pid_to_str (ptid_t ptid);
/* Returns non-zero if we were stopped by a hardware watchpoint (memory read or
write). */
#define STOPPED_BY_WATCHPOINT(w) \
(*current_target.to_stopped_by_watchpoint) ()
#define target_stopped_by_watchpoint \
(*current_target.to_stopped_by_watchpoint)
/* Non-zero if we have steppable watchpoints */
#define HAVE_STEPPABLE_WATCHPOINT \
#define target_have_steppable_watchpoint \
(current_target.to_have_steppable_watchpoint)
/* Non-zero if we have continuable watchpoints */
#define HAVE_CONTINUABLE_WATCHPOINT \
#define target_have_continuable_watchpoint \
(current_target.to_have_continuable_watchpoint)
/* Provide defaults for hardware watchpoint functions. */
@@ -1076,10 +1076,10 @@ extern char *normal_pid_to_str (ptid_t ptid);
bp_hardware_breakpoint. CNT is the number of such watchpoints used so far
(including this one?). OTHERTYPE is who knows what... */
#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(TYPE,CNT,OTHERTYPE) \
#define target_can_use_hardware_watchpoint(TYPE,CNT,OTHERTYPE) \
(*current_target.to_can_use_hw_breakpoint) (TYPE, CNT, OTHERTYPE);
#define TARGET_REGION_OK_FOR_HW_WATCHPOINT(addr, len) \
#define target_region_ok_for_hw_watchpoint(addr, len) \
(*current_target.to_region_ok_for_hw_watchpoint) (addr, len)